合同修改日期的时间

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/DateUtils.java

@@ -509,10 +509,7 @@ public class DateUtils extends DateUtil {
     }
 
     public static void main(String[] ager) throws InterruptedException {
-        Date newTime = new Date();
-        Date time = addDateMinutes(new Date(), 10);
-        int result = newTime.compareTo(time);
-        System.out.println(result);
+        System.out.println(getEndOfDay(new Date()));
     }
 
     /**
@@ -751,6 +748,18 @@ public class DateUtils extends DateUtil {
         return parse(dateStr, format);
     }
 
+    /**
+     * @desc: 一天的结束时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     */
+    public static Date getEndOfDay(Date date) {
+        String dateStr = format(date, DATE_PATTERN);
+        return parse(dateStr + " 23:59:59", DATE_TIME_PATTERN);
+    }
+
+
+
     /**
      * @desc: localDate转换为date 结束时间
      * @author: yzc

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

@@ -2,6 +2,7 @@ package com.sckw.contract.service;
 
 import java.util.Date;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -192,7 +193,9 @@ public class KwcContractLogisticsService {
         kwcContractLogistics.setSigningWay(baseInfo.getSigningWay());
         kwcContractLogistics.setCharging(baseInfo.getCharging());
         kwcContractLogistics.setStartTime(baseInfo.getStartTime());
-        kwcContractLogistics.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractLogistics.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractLogistics.setPerformedAmount(new BigDecimal("0"));
         kwcContractLogistics.setContractPid(pid);
         kwcContractLogistics.setRemark(remark);
@@ -512,6 +515,9 @@ public class KwcContractLogisticsService {
         kwcContractLogistics.setCharging(baseInfo.getCharging());
         kwcContractLogistics.setStartTime(baseInfo.getStartTime());
         kwcContractLogistics.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractLogistics.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractLogistics.setPerformedAmount(new BigDecimal("0"));
         kwcContractLogistics.setContractPid(reqVo.getPid());
         kwcContractLogistics.setRemark(reqVo.getRemark());
@@ -722,6 +728,10 @@ public class KwcContractLogisticsService {
             queryListResVo.setSigningWay(queryListResDto.getSigningWay());
             queryListResVo.setPerformedAmount(queryListResDto.getPerformedAmount());
             queryListResVo.setAmount(queryListResDto.getAmount());
+
+            if (Objects.nonNull(queryListResVo.getEndTime())) {
+                queryListResVo.setEndTime(DateUtils.getStartOfDay(queryListResVo.getEndTime()));
+            }
             list.add(queryListResVo);
         }
         return list;

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

@@ -3,6 +3,9 @@ package com.sckw.contract.service;
 import java.io.IOException;
 import java.util.Date;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -197,6 +200,10 @@ public class KwcContractTradeService {
             queryListResVo.setSigningWay(queryListResDto.getSigningWay());
             queryListResVo.setAmount(queryListResDto.getAmount());
             queryListResVo.setPerformedAmount(queryListResDto.getPerformedAmount());
+
+            if(Objects.nonNull(queryListResVo.getEndTime())) {
+                queryListResVo.setEndTime(DateUtils.getStartOfDay(queryListResVo.getEndTime()));
+            }
             list.add(queryListResVo);
         }
         return list;
@@ -276,7 +283,9 @@ public class KwcContractTradeService {
         kwcContractTrade.setSigningWay(baseInfo.getSigningWay());
         kwcContractTrade.setTrading(baseInfo.getTrading());
         kwcContractTrade.setStartTime(baseInfo.getStartTime());
-        kwcContractTrade.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractTrade.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractTrade.setPerformedAmount(new BigDecimal("0"));
         kwcContractTrade.setContractPid(pid);
         kwcContractTrade.setRemark(remark);
@@ -586,6 +595,9 @@ public class KwcContractTradeService {
         kwcContractTrade.setTrading(baseInfo.getTrading());
         kwcContractTrade.setStartTime(baseInfo.getStartTime());
         kwcContractTrade.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractTrade.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractTrade.setPerformedAmount(new BigDecimal("0"));
         kwcContractTrade.setContractPid(reqVo.getPid());
         kwcContractTrade.setRemark(reqVo.getRemark());