From 4a645468b9245d4ad62ce87a7cf7e8f8247495e1 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 04 九月 2024 03:45:06 +0800 Subject: [PATCH] 大屏工单查询调整、点位搜索调整 --- ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 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 7e46a9c..4010d38 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 @@ -11,13 +11,14 @@ import com.ycl.system.entity.SysUser; import com.ycl.utils.SecurityUtils; import enumeration.general.AuditingStatus; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.Arrays; +import java.util.Date; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** @@ -27,15 +28,13 @@ * @date 2024-04-01 */ @Service +@RequiredArgsConstructor public class ContractScoreServiceImpl extends ServiceImpl<ContractScoreMapper, ContractScore> implements IContractScoreService { - @Autowired - private ContractScoreMapper contractScoreMapper; - @Autowired - private YwUnitMapper ywunitMapper; - @Autowired - private TContractMapper contractMapper; - @Autowired - private CalculateRuleMapper calculateRuleMapper; + + private final ContractScoreMapper contractScoreMapper; + private final YwUnitMapper ywunitMapper; + private final TContractMapper contractMapper; + private final CalculateRuleMapper calculateRuleMapper; /** * 鏌ヨ鍚堝悓鎵撳垎鍒楄〃 @@ -45,6 +44,7 @@ */ @Override public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) { + contractScore.setUnitId(Long.valueOf(SecurityUtils.getUnitId())); return contractScoreMapper.selectDefaultScoreList(contractScore); } @@ -63,12 +63,14 @@ 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.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.setUpdateTime(new Date()); return super.updateById(contractScore); } @@ -90,8 +92,4 @@ .list(); } - @Override - public List<Map<String, Object>> calculate() { - return contractScoreMapper.calculate(); - } } -- Gitblit v1.8.0