yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tsg' into tsg 

# Conflicts:
#	src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java
master
李一帆 2025-04-07 11:50:44 +08:00
parent 0a6cc7d11c 0b14698815
commit dae66822bc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java
View File

@ -143,7 +143,7 @@ public class DataTaskTSG {
calendar.add(Calendar.HOUR_OF_DAY, -20);
}
} else {
int diffDays = new BigDecimal((now.getTime() - stm.getTime()) / (24 * 60 * 60 * 1000)).intValue();
int diffDays = new BigDecimal((int) Math.ceil(now.getTime() - stm.getTime() / (24 * 60 * 60 * 1000))).intValue();
if (diffDays > 3) {
calendar.add(Calendar.DATE, -2);
calendar.add(Calendar.HOUR_OF_DAY, -20);
@ -261,7 +261,7 @@ public class DataTaskTSG {
calendar.add(Calendar.HOUR_OF_DAY, -20);
}
} else {
int diffDays = new BigDecimal((now.getTime() - stm.getTime()) / (24 * 60 * 60 * 1000)).intValue();
int diffDays = new BigDecimal((int) Math.ceil(now.getTime() - stm.getTime() / (24 * 60 * 60 * 1000))).intValue();
if (diffDays > 3) {
calendar.add(Calendar.DATE, -2);
calendar.add(Calendar.HOUR_OF_DAY, -20);