提交合同查询接口

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

@@ -1160,7 +1160,7 @@ public class KwcContractLogisticsService {
             String startDate = DateUtils.format(r.getStartTime(), DateUtils.DATE_TIME_PATTERN);
             queryLogisticListResp.setStartDate(startDate);
             String endDate = DateUtils.format(r.getEndTime(), DateUtils.DATE_TIME_PATTERN);
-            queryLogisticListResp.setEndDate(endDate);
+            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());
             queryLogisticListResp.setInitiator(userCacheResDto.getName());
@@ -1198,7 +1198,7 @@ public class KwcContractLogisticsService {
         saveContractLogistics.setStartTime(baseInfo.getStartTime());
         if (Objects.isNull(baseInfo.getEndTime())){
             // 创建 LocalDate 对象
-            LocalDate localDate = LocalDate.of(9999, 12, 12);
+            LocalDate localDate = LocalDate.of(9999, 12, 30);
 
 // 将 LocalDate 转换为 Date
             Date date1 = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
@@ -1384,7 +1384,16 @@ public class KwcContractLogisticsService {
 
         tradeBaseInfo.setContractCode(logistics.getContractNo());
         tradeBaseInfo.setContractName(logistics.getName());
-        tradeBaseInfo.setEndTime(logistics.getEndTime());
+        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)) {
+                // 处理逻辑：日期相等
+                tradeBaseInfo.setEndTime(null);
+            }else {
+                tradeBaseInfo.setEndTime(logistics.getEndTime());
+            }
+        }
         tradeBaseInfo.setSigningWay(logistics.getSigningWay());
         tradeBaseInfo.setSigningWayDesc(DictEnum.getLabel(DictTypeEnum.SIGNING_TYPE.getType(),
                 String.valueOf(logistics.getSigningWay())));