From 33cba1df43544a1f85302ce0677b148366d7c6e3 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Sun, 28 Dec 2025 10:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/material/service/impl/BackApplyServiceImpl.java | 4 ++-- .../main/resources/mapper/material/SltAgreementInfoMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 9a0db06..824d1ed 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -1252,7 +1252,7 @@ public class BackApplyServiceImpl implements BackApplyService { LocalDate leaseStart = LocalDate.parse(backApplyInfo.getStartTime()); LocalDate leaseEnd = LocalDate.parse(startTime); long dayDiff = ChronoUnit.DAYS.between(leaseStart, leaseEnd); - Integer leaseDay = (int) dayDiff; + Integer leaseDay = (int) dayDiff + 1; if (backNum.equals(num)) {//1.退的全部是本身 sltSuppleInfo.setNum(num); @@ -1355,7 +1355,7 @@ public class BackApplyServiceImpl implements BackApplyService { // endTime减一天处理 if (endTime != null) { LocalDate date = LocalDate.parse(endTime); - sltSuppleInfo.setEndTime(date.minusDays(1).toString()); + sltSuppleInfo.setEndTime(date.toString()); } else { sltSuppleInfo.setEndTime(null); } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml index 8917939..9b43460 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml @@ -1013,7 +1013,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update project_temp_cost - set end_time = STR_TO_DATE(#{startTime}, '%Y-%m-%d %H:%i:%s') + set end_time = DATE_SUB(STR_TO_DATE(#{startTime}, '%Y-%m-%d %H:%i:%s'), INTERVAL 1 DAY) where agreement_id = #{agreementId} and end_time is null and DATE(mark_time) between #{startTime} and #{endTime}