feat(核查模块): 完善了阅知,自动终结任务的机制

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -145,16 +145,6 @@ public class ObjTransUtil {
         List<Task> childTask = taskDao.findAllByParentTaskId(fatherTaskId);
 
         boolean flag = false;
-        boolean confirmTaskisDone = false;
-        for (Task task : childTask) {
-            if (task.getTitle().contains("统计数据确认任务")) {
-                if (task.getBillStatus() != 9999) {
-                    flag = true;
-                } else {
-                    confirmTaskisDone = true;
-                }
-            }
-        }
 
         // 3/3 -> 统计待确认 -> 省统计任务待完结
 
@@ -166,7 +156,7 @@ public class ObjTransUtil {
         long total = childTask.size();
 
         long done = childTask.stream()
-                .filter(task -> task.getBillStatus().equals(END.id)||task.getBillStatus().equals(REVOKEALLOTTASK.id))
+                .filter(task -> task.getBillStatus().equals(END.id) || task.getBillStatus().equals(REVOKEALLOTTASK.id))
                 .count();
 
         //如果是检查统计的话那么还要看一下他的父节点是不是已经完成了
@@ -179,14 +169,10 @@ public class ObjTransUtil {
                     completion = "核查完成待确认";
                 } else {
                     // confirmTaskidDone 为true 代表此时等待最后的father任务 为false代表 flag = false 且isDone为false 代表整个节点里没有确认节点直接完结
-                    if (confirmTaskisDone) {
-                        if (fatherTask.getBillStatus() == 9999) {
-                            completion = "核查完成";
-                        } else {
-                            completion = "核查完成待办结";
-                        }
-                    } else {
+                    if (fatherTask.getBillStatus().equals(END.id) || fatherTask.getBillStatus().equals(REVOKEALLOTTASK.id)) {
                         completion = "核查完成";
+                    } else {
+                        completion = "核查完成待办结";
                     }
                 }
             }

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/CacheLibraryServiceImpl.java

@@ -36,7 +36,6 @@ public class CacheLibraryServiceImpl implements DeviceLibraryCacheService {
     public List<DeviceLibrary> getAllDeviceLibraryList() {
         long l = System.currentTimeMillis();
         List<DeviceLibrary> all = deviceLibraryDao.findAll();
-        System.out.println("缓存时间"+(System.currentTimeMillis()-l));
         return all;
     }