From 95f0a8b4d82a859f2018c9d77e1a8a3a38b2d523 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 七月 2024 17:06:50 +0800
Subject: [PATCH] 报备记录、编号工具方法
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
index 6adf720..9b9ebef 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
@@ -47,19 +47,7 @@
*/
@Override
public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
- return new LambdaQueryChainWrapper<>(contractScoreMapper)
- .eq(ObjectUtils.isNotEmpty(contractScore.getUnitId()), ContractScore::getUnitId, contractScore.getUnitId())
- .between(ObjectUtils.isNotEmpty(contractScore.getCreateStartTime()), ContractScore::getCreateTime, contractScore.getCreateStartTime(), contractScore.getCreateEndTime())
- .between(ObjectUtils.isNotEmpty(contractScore.getAuditingStartTime()), ContractScore::getAuditingTime, contractScore.getAuditingStartTime(), contractScore.getAuditingEndTime())
- .eq(ObjectUtils.isNotEmpty(contractScore.getAuditingStatus()), ContractScore::getAuditingStatus, contractScore.getAuditingStatus())
- .orderByDesc(ContractScore::getCreateTime)
- .list()
- .stream().peek(
- item -> {
- item.setUnitName(ywunitMapper.selectById(item.getUnitId()).getUnitName());
- item.setContractName(contractMapper.selectById(item.getContractId()).getName());
- }
- ).toList();
+ return contractScoreMapper.selectDefaultScoreList(contractScore);
}
@Override
@@ -75,7 +63,6 @@
contractScore.setCreateUserId(user.getUserId());
contractScore.setCreateUser(user.getNickName());
contractScore.setAuditingStatus(AuditingStatus.WAIT);
- contractScore.setDeleted("0");
contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
contractScore.setRuleIdsArray(Arrays.stream(contractScore.getRuleIds().split(",")).map(Long::parseLong).toArray(Long[]::new));
List<CalculateRule> list = new LambdaQueryChainWrapper<>(calculateRuleMapper).in(CalculateRule::getId, contractScore.getRuleIdsArray()).list();
--
Gitblit v1.8.0