提交新增合同文件校验

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryListResVo.java

@@ -195,6 +195,8 @@ public class QueryListResVo implements Serializable {
     /**
      * 发起时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Schema(description = "发起时间")
     private Date initiateTime;
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryLogisticListResp.java

@@ -1,9 +1,11 @@
 package com.sckw.contract.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.web.request.PageReq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -94,11 +96,15 @@ public class QueryLogisticListResp implements Serializable {
      * 起始日期
      */
     @Schema(description = "起始日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private String startDate;
     /**
      * 终止日期
      */
     @Schema(description = "终止日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private String endDate;
     /**
      * 发起人id

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -794,6 +794,10 @@ public class KwcContractLogisticsService {
 
             if (Objects.nonNull(queryListResVo.getEndTime())) {
                 queryListResVo.setEndTime(DateUtils.getStartOfDay(queryListResVo.getEndTime()));
+                String endDate = DateUtils.format(queryListResVo.getEndTime(), DateUtils.DATE_PATTERN);
+                if (org.apache.commons.lang3.StringUtils.equals(endDate,"9999-12-30")){
+                    queryListResVo.setEndTime(null);
+                }
             }
             list.add(queryListResVo);
         }
@@ -1157,9 +1161,9 @@ public class KwcContractLogisticsService {
              }
 
 
-            String startDate = DateUtils.format(r.getStartTime(), DateUtils.DATE_TIME_PATTERN);
+            String startDate = DateUtils.format(r.getStartTime(), DateUtils.DATE_PATTERN);
             queryLogisticListResp.setStartDate(startDate);
-            String endDate = DateUtils.format(r.getEndTime(), DateUtils.DATE_TIME_PATTERN);
+            String endDate = DateUtils.format(r.getEndTime(), DateUtils.DATE_PATTERN);
             queryLogisticListResp.setEndDate(org.apache.commons.lang3.StringUtils.equals(endDate,"9999-12-30") ? "": endDate);
             queryLogisticListResp.setInitiatorId(r.getCreateBy());
             UserCacheResDto userCacheResDto = finalLongUserCacheResDtoMap.getOrDefault(r.getCreateBy(), new UserCacheResDto());
@@ -1197,14 +1201,11 @@ public class KwcContractLogisticsService {
         saveContractLogistics.setSigningWay(baseInfo.getSigningWay());
         saveContractLogistics.setStartTime(baseInfo.getStartTime());
         if (Objects.isNull(baseInfo.getEndTime())){
-            // 创建 LocalDate 对象
             LocalDate localDate = LocalDate.of(9999, 12, 30);
-
-// 将 LocalDate 转换为 Date
             Date date1 = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
-            saveContractLogistics.setEndTime(date1);
+            saveContractLogistics.setEndTime(DateUtils.getEndOfDay(date1));
         }else {
-            saveContractLogistics.setEndTime(baseInfo.getEndTime());
+            saveContractLogistics.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
         }
 
         saveContractLogistics.setStatus(ContractStatusEnum.SUBMIT.getCode());
@@ -1385,10 +1386,8 @@ public class KwcContractLogisticsService {
         tradeBaseInfo.setContractCode(logistics.getContractNo());
         tradeBaseInfo.setContractName(logistics.getName());
         if (Objects.nonNull(logistics.getEndTime())) {
-            LocalDate endTime = logistics.getEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-            LocalDate specialDate = LocalDate.of(9999, 12, 30);
-            if (endTime.equals(specialDate)) {
-                // 处理逻辑：日期相等
+            String endDate = DateUtils.format(logistics.getEndTime(), DateUtils.DATE_PATTERN);
+            if (org.apache.commons.lang3.StringUtils.equals(endDate,"9999-12-30")){
                 tradeBaseInfo.setEndTime(null);
             }else {
                 tradeBaseInfo.setEndTime(logistics.getEndTime());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -64,6 +64,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -294,6 +296,10 @@ public class KwcContractTradeService {
             queryListResVo.setPerformedAmountMoney( performedAmountMoney);
             if(Objects.nonNull(queryListResVo.getEndTime())) {
                 queryListResVo.setEndTime(DateUtils.getStartOfDay(queryListResVo.getEndTime()));
+                String endDate = DateUtils.format(queryListResVo.getEndTime(), DateUtils.DATE_PATTERN);
+                if (org.apache.commons.lang3.StringUtils.equals(endDate,"9999-12-30")){
+                    queryListResVo.setEndTime(null);
+                }
             }
             list.add(queryListResVo);
         }
@@ -413,6 +419,10 @@ public class KwcContractTradeService {
         kwcContractTrade.setStartTime(baseInfo.getStartTime());
         if (Objects.nonNull(baseInfo.getEndTime())) {
             kwcContractTrade.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }else {
+            LocalDate localDate = LocalDate.of(9999, 12, 30);
+            Date date1 = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+            kwcContractTrade.setEndTime(DateUtils.getEndOfDay(date1));
         }
         kwcContractTrade.setPerformedAmount(new BigDecimal("0"));
         kwcContractTrade.setContractPid(pid);
@@ -1477,7 +1487,14 @@ public class KwcContractTradeService {
         tradeBaseInfo.setContractName(kwcContractTrade.getName());
         tradeBaseInfo.setContractStatus(String.valueOf(kwcContractTrade.getStatus()));
         tradeBaseInfo.setContractStatusDesc(ContractStatusEnum.getNameByCode(kwcContractTrade.getStatus()));
-        tradeBaseInfo.setEndTime(kwcContractTrade.getEndTime());
+        if (Objects.nonNull(kwcContractTrade.getEndTime())){
+            tradeBaseInfo.setEndTime(kwcContractTrade.getEndTime());
+            String endDate = DateUtils.format(kwcContractTrade.getEndTime(), DateUtils.DATE_PATTERN);
+            if (org.apache.commons.lang3.StringUtils.equals(endDate,"9999-12-30")){
+                tradeBaseInfo.setEndTime(null);
+            }
+        }
+
         tradeBaseInfo.setSigningWay(kwcContractTrade.getSigningWay());
         tradeBaseInfo.setSigningWayDesc(DictEnum.getLabel(DictTypeEnum.SIGNING_WAY.getType(), String.valueOf(kwcContractTrade.getSigningWay())));
         tradeBaseInfo.setStartTime(kwcContractTrade.getStartTime());
@@ -1631,7 +1648,13 @@ public class KwcContractTradeService {
         }
         queryListResVo.setCreateTime(t.getCreateTime());
         queryListResVo.setStartTime(t.getStartTime());
-        queryListResVo.setEndTime(t.getEndTime());
+        if (Objects.nonNull(t.getStartTime())){
+            queryListResVo.setEndTime(t.getEndTime());
+            String endDate = DateUtils.format(t.getEndTime(), DateUtils.DATE_PATTERN);
+            if (org.apache.commons.lang3.StringUtils.equals(endDate,"9999-12-30")){
+                queryListResVo.setEndTime(null);
+            }
+        }
         queryListResVo.setInitiateTime(t.getCreateTime());
         queryListResVo.setRemark(t.getRemark());
         queryListResVo.setSignTime(t.getSignTime());