From d268f82d25c25ebdc7a1ea30614f6cda6d3a9ae3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 10 十月 2024 16:31:41 +0800
Subject: [PATCH] win库+大屏考核指标查询bug
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 4010d38..f23b814 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
@@ -16,9 +16,7 @@
import org.springframework.stereotype.Service;
import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -44,14 +42,23 @@
*/
@Override
public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
- contractScore.setUnitId(Long.valueOf(SecurityUtils.getUnitId()));
+ Integer unitId = SecurityUtils.getUnitId();
+ Long uid = null;
+ if (Objects.nonNull(unitId)) {
+ uid = Long.valueOf(unitId);
+ }
+ contractScore.setUnitId(uid);
return contractScoreMapper.selectDefaultScoreList(contractScore);
}
@Override
public ContractScore getById(Serializable id) {
+ //TODO:鍥炴樉浼樺寲
ContractScore contractScore = super.getById(id);
- contractScore.setRuleIdsArray(Arrays.stream(contractScore.getRuleIds().split(",")).map(Long::parseLong).toArray(Long[]::new));
+ List<String> ruleIds = new ArrayList<>();
+ ruleIds.add(contractScore.getRuleName().split("/")[0].trim());
+ ruleIds.add(contractScore.getRuleId()+"");
+ contractScore.setRuleIdsArray(ruleIds);
return contractScore;
}
@@ -61,16 +68,17 @@
contractScore.setCreateUserId(user.getUserId());
contractScore.setCreateUser(user.getNickName());
contractScore.setAuditingStatus(AuditingStatus.WAIT);
- 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));
+// 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));
contractScore.setUpdateTime(new Date());
return super.save(contractScore);
}
@Override
public boolean updateById(ContractScore contractScore) {
- contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
+ contractScore.setRuleId(Long.parseLong(contractScore.getRuleIdsArray().get(1)));
contractScore.setUpdateTime(new Date());
+ contractScore.setAuditingStatus(AuditingStatus.WAIT);
return super.updateById(contractScore);
}
--
Gitblit v1.8.0