Merge remote-tracking branch 'origin/tsg' into tsg
commit
5a4f86be6a
|
|
@ -143,7 +143,7 @@ public class DataTaskTSG {
|
||||||
calendar.add(Calendar.HOUR_OF_DAY, -20);
|
calendar.add(Calendar.HOUR_OF_DAY, -20);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
int diffDays = new BigDecimal((int) Math.ceil(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) {
|
if (diffDays > 3) {
|
||||||
calendar.add(Calendar.DATE, -2);
|
calendar.add(Calendar.DATE, -2);
|
||||||
calendar.add(Calendar.HOUR_OF_DAY, -20);
|
calendar.add(Calendar.HOUR_OF_DAY, -20);
|
||||||
|
|
@ -261,7 +261,7 @@ public class DataTaskTSG {
|
||||||
calendar.add(Calendar.HOUR_OF_DAY, -20);
|
calendar.add(Calendar.HOUR_OF_DAY, -20);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
int diffDays = new BigDecimal((int) Math.ceil(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) {
|
if (diffDays > 3) {
|
||||||
calendar.add(Calendar.DATE, -2);
|
calendar.add(Calendar.DATE, -2);
|
||||||
calendar.add(Calendar.HOUR_OF_DAY, -20);
|
calendar.add(Calendar.HOUR_OF_DAY, -20);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue