bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复

This commit is contained in:
hongchao 2025-12-28 10:44:39 +08:00
parent 6aa4a5eae7
commit 33cba1df43
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
View File

@ -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);
}

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
View File

@ -1013,7 +1013,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateSuppleMonthThree">
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}