From f0ec80a9eb4d12aca25f311fecf8f6e5edf8c577 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 06 十一月 2024 16:47:00 +0800
Subject: [PATCH] 工单加搜索table、一些搜索bug
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 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 f23b814..010b6fc 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;
@@ -42,12 +43,28 @@
*/
@Override
public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
- Integer unitId = SecurityUtils.getUnitId();
- Long uid = null;
- if (Objects.nonNull(unitId)) {
- uid = Long.valueOf(unitId);
+ //閬垮厤鎼滅储鏉′欢澶辨晥
+ if(contractScore.getUnitId()==null) {
+ //TODO:鏁版嵁鏉冮檺(鏆傛椂涓嶇煡閬撹涓嶈鏁版嵁鏉冮檺)
+ Integer unitId = SecurityUtils.getUnitId();
+ Long uid = null;
+ if (Objects.nonNull(unitId)) {
+ uid = Long.valueOf(unitId);
+ }
+ contractScore.setUnitId(uid);
}
- 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