From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 21 二月 2025 15:51:13 +0800 Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数 --- ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 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 c01af46..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,6 +9,7 @@ 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; @@ -16,10 +17,7 @@ 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; /** @@ -45,7 +43,28 @@ */ @Override public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) { - contractScore.setUnitId(Long.valueOf(SecurityUtils.getUnitId())); + //閬垮厤鎼滅储鏉′欢澶辨晥 + 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