فهرست منبع

新增、修改 添加修改状态逻辑

bihuisong 1 سال پیش
والد
کامیت
4a89067c8b

+ 6 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysSecretProjectController.java

@@ -84,7 +84,9 @@ public class SysSecretProjectController extends BaseController {
         String jwt = JWTExample.createJWT(sysSecretProjectDTO.getProjectName(), milliseconds);
         sysSecretProjectDTO.setSecretKey(jwt);
         int comparisonResult = sysSecretProjectDTO.getOverdueDate().compareTo(currentDate);
-        if (comparisonResult < 0) {
+        if (comparisonResult > 0) {
+            sysSecretProjectDTO.setStatus(1L);
+        } else if (comparisonResult < 0) {
             sysSecretProjectDTO.setStatus(2L);
         } else if (sysSecretProjectDTO.getOverdueDate().isAfter(previousDate) && sysSecretProjectDTO.getOverdueDate().isBefore(currentDate)) {
             sysSecretProjectDTO.setStatus(3L);
@@ -106,7 +108,9 @@ public class SysSecretProjectController extends BaseController {
         String jwt = JWTExample.createJWT(sysSecretProjectDTO.getProjectName(), milliseconds);
         sysSecretProjectDTO.setSecretKey(jwt);
         int comparisonResult = sysSecretProjectDTO.getOverdueDate().compareTo(currentDate);
-        if (comparisonResult < 0) {
+        if (comparisonResult > 0) {
+            sysSecretProjectDTO.setStatus(1L);
+        } else if (comparisonResult < 0) {
             sysSecretProjectDTO.setStatus(2L);
         } else if (sysSecretProjectDTO.getOverdueDate().isAfter(previousDate) && sysSecretProjectDTO.getOverdueDate().isBefore(currentDate)) {
             sysSecretProjectDTO.setStatus(3L);

+ 4 - 1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -47,7 +47,10 @@ public class RyTask {
         List<SysSecretProjectDTO> list = sysSecretProjectMapper.getAllList();
         for (SysSecretProjectDTO var : list) {
             int comparisonResult = var.getOverdueDate().compareTo(currentDate);
-            if (comparisonResult < 0) {
+            if (comparisonResult > 0) {
+                var.setStatus(1L);
+                sysSecretProjectMapper.updateSysSecretProject(var);
+            } else if (comparisonResult < 0) {
                 var.setStatus(2L);
                 sysSecretProjectMapper.updateSysSecretProject(var);
             } else if (var.getOverdueDate().isAfter(previousDate) && var.getOverdueDate().isBefore(currentDate)) {