From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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 1c0ae2e..22527b6 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
@@ -9,16 +9,15 @@
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.IContractScoreService;
import com.ycl.system.entity.SysUser;
+import com.ycl.utils.DateUtils;
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.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -28,15 +27,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;
/**
* 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
@@ -46,6 +43,28 @@
*/
@Override
public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
+ //閬垮厤鎼滅储鏉′欢澶辨晥
+ if(contractScore.getUnitId()==null) {
+ //TODO:鏁版嵁鏉冮檺
+ Integer unitId = SecurityUtils.getUnitId();
+ Long uid = null;
+ if (Objects.nonNull(unitId)) {
+ uid = Long.valueOf(unitId);
+ }
+ contractScore.setUnitId(uid);
+ }
+ if(contractScore.getCreateStartTime()!=null) {
+ contractScore.setCreateStartTime(DateUtils.getDayStart(contractScore.getCreateStartTime()));
+ }
+ if(contractScore.getCreateEndTime()!=null) {
+ contractScore.setCreateEndTime(DateUtils.getDayStart(contractScore.getCreateEndTime()));
+ }
+ if(contractScore.getAuditingStartTime()!=null) {
+ contractScore.setAuditingStartTime(DateUtils.getDayStart(contractScore.getAuditingStartTime()));
+ }
+ if(contractScore.getAuditingEndTime()!=null) {
+ contractScore.setAuditingEndTime(DateUtils.getDayStart(contractScore.getAuditingEndTime()));
+ }
return contractScoreMapper.selectDefaultScoreList(contractScore);
}
--
Gitblit v1.8.0