|
@@ -117,9 +117,9 @@ public class SysSecretProjectController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
private void compareToDate(@RequestBody SysSecretProjectDTO sysSecretProjectDTO, LocalDate currentDate, LocalDate previousDate) {
|
|
private void compareToDate(@RequestBody SysSecretProjectDTO sysSecretProjectDTO, LocalDate currentDate, LocalDate previousDate) {
|
|
- int comparisonResult = sysSecretProjectDTO.getOverdueDate().compareTo(currentDate);
|
|
|
|
|
|
+ int comparisonResult = sysSecretProjectDTO.getOverdueDate().plusDays(1).compareTo(currentDate);
|
|
sysSecretProjectDTO.setIsSwitch(true);
|
|
sysSecretProjectDTO.setIsSwitch(true);
|
|
- if (currentDate.isAfter(previousDate) && currentDate.isBefore(sysSecretProjectDTO.getOverdueDate())) {
|
|
|
|
|
|
+ if (currentDate.isAfter(previousDate) && currentDate.isBefore(sysSecretProjectDTO.getOverdueDate().plusDays(1))) {
|
|
sysSecretProjectDTO.setStatus(3L);
|
|
sysSecretProjectDTO.setStatus(3L);
|
|
} else if (comparisonResult > 0) {
|
|
} else if (comparisonResult > 0) {
|
|
sysSecretProjectDTO.setStatus(1L);
|
|
sysSecretProjectDTO.setStatus(1L);
|
|
@@ -140,7 +140,7 @@ public class SysSecretProjectController extends BaseController {
|
|
LocalDate previousDate = currentDate.minusDays(7);
|
|
LocalDate previousDate = currentDate.minusDays(7);
|
|
sysSecretProjectDTO.setOverdueDate(previousDate);
|
|
sysSecretProjectDTO.setOverdueDate(previousDate);
|
|
sysSecretProjectDTO.setStatus(2L);
|
|
sysSecretProjectDTO.setStatus(2L);
|
|
-// sysSecretProjectDTO.setIsSwitch(1L);
|
|
|
|
|
|
+ sysSecretProjectDTO.setIsSwitch(true);
|
|
RestUtil.get(sysSecretProjectService.selectSysSecretProjectAddress(sysSecretProjectDTO));
|
|
RestUtil.get(sysSecretProjectService.selectSysSecretProjectAddress(sysSecretProjectDTO));
|
|
return toAjax(sysSecretProjectService.updateSysSecretProject(sysSecretProjectDTO));
|
|
return toAjax(sysSecretProjectService.updateSysSecretProject(sysSecretProjectDTO));
|
|
}
|
|
}
|
|
@@ -174,4 +174,5 @@ public class SysSecretProjectController extends BaseController {
|
|
return toAjax(sysSecretProjectService.updateIsSwitch(sysSecretProjectDTO));
|
|
return toAjax(sysSecretProjectService.updateIsSwitch(sysSecretProjectDTO));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
}
|
|
}
|