feat(screen): 新增自核查展示

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/CheckScreenServiceImpl.java

@@ -105,18 +105,29 @@ public class CheckScreenServiceImpl implements CheckScreenService {
         DeviceCheckDetail detail = detailDao.findById(task.getBillId()).orElse(new DeviceCheckDetail());
         checkUnitInfo.setBillId(bigBillId);
         checkUnitInfo.setUnitId(task.getOwnUnit());
-        if (detail.getUserAId() != null && detail.getUserAId() != 0) {
+
+        if (task.getBillStatus() == 120 ||task.getBillStatus() == 140) {
+            checkUnitInfo.setCheckOneInfo(0);
+            checkUnitInfo.setCheckTwoInfo(0);
+            checkUnitInfo.setCheckThreeInfo(0);
+        } else if (task.getBillStatus() == 160) {
+            checkUnitInfo.setCheckOneInfo(0);
+            checkUnitInfo.setCheckTwoInfo(0);
+            checkUnitInfo.setCheckThreeInfo(-1);
+        } else if (task.getBillStatus() == 121 ||task.getBillStatus() == 141 ) {
+            checkUnitInfo.setCheckOneInfo(1);
+            checkUnitInfo.setCheckTwoInfo(0);
+            checkUnitInfo.setCheckThreeInfo(0);
+        } else if (task.getBillStatus() == 161) {
+            checkUnitInfo.setCheckOneInfo(1);
+            checkUnitInfo.setCheckTwoInfo(0);
+            checkUnitInfo.setCheckThreeInfo(-1);
+        } else if (task.getBillStatus() == 122 ||task.getBillStatus() == 142) {
             checkUnitInfo.setCheckOneInfo(1);
-        }
-        if (detail.getUserBId() != null && detail.getUserAId() != 0 ) {
             checkUnitInfo.setCheckTwoInfo(1);
-        }
-        if (detail.getUserCId() != null && detail.getUserAId() != 0 ) {
-            checkUnitInfo.setCheckThreeInfo(1);
-        } else {
             checkUnitInfo.setCheckThreeInfo(0);
-
         }
+
         return checkUnitInfo;
     }
 

dev-screen/src/main/java/com/tykj/dev/device/screen/subject/task/CheckScreenTask.java

@@ -17,7 +17,7 @@ public class CheckScreenTask {
     @Autowired
     private CheckMapTask checkMapTask;
 
-    @Scheduled(cron = "* 15 * * * ? ")
+    @Scheduled(cron = "0 * * * * ? ")
     public void checkMap() {
 
         long startTime = System.currentTimeMillis();

dev-union/pom.xml

@@ -76,11 +76,11 @@
 
     <dependencies>
 
-<!--        <dependency>-->
-<!--            <groupId>com.tykj</groupId>-->
-<!--            <artifactId>dev-screen</artifactId>-->
-<!--            <version>1.0-SNAPSHOT</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.tykj</groupId>
+            <artifactId>dev-screen</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>