电签检查方法偏移参数调整

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/ScrDataServiceImpl.java

@@ -34,7 +34,7 @@ public class ScrDataServiceImpl implements ScrDataService {
     @Override
     public void sctTaskBatch(ScrSignInfoVO taskApp) throws Exception {
         // 电签检查
-        this.sctTaskBatch2(taskApp);
+        this.sctTaskBatch3(taskApp);
     }
 
 
@@ -582,7 +582,7 @@ public class ScrDataServiceImpl implements ScrDataService {
                     }
                 }
             }
-
+            Map<String, String> dataUserMap = new HashMap<>(dataMap);
             boolean isSign = true;
             //判断章是否签完
             List<String> companList = strategyListByDFZX.stream().filter(item -> item.get("type").equals("2")).map(map -> map.get("keyWord").toString()).collect(Collectors.toList());
@@ -600,23 +600,45 @@ public class ScrDataServiceImpl implements ScrDataService {
                 }
             }
 
-            boolean isSign1 = true;
-            //判断个人是否签完
-            List<String> userList = strategyListByDFZX.stream().filter(item -> item.get("type").equals("1")).map(map -> map.get("keyWord").toString()).collect(Collectors.toList());
-            if (!userList.isEmpty()) {
-                Set<String> differentElements = new HashSet<>(userList);
-                sucessUser.forEach(differentElements::remove);
-                if (!differentElements.isEmpty()) {
-                    isSign1 = false;
-                    StringBuilder sb = new StringBuilder();
-                    sb.append("id = ").append(taskApp.getId()).append(", 人总共：").append(userList.size()).append(", 剩下：").append(differentElements.size());
-                    for (String element : differentElements) {
-                        sb.append(", ").append(element);
+//            boolean isSign1 = true;
+//            //判断个人是否签完
+//            List<String> userList = strategyListByDFZX.stream().filter(item -> item.get("type").equals("1")).map(map -> map.get("keyWord").toString()).collect(Collectors.toList());
+//            if (!userList.isEmpty()) {
+//                Set<String> differentElements = new HashSet<>(userList);
+//                sucessUser.forEach(differentElements::remove);
+//                if (!differentElements.isEmpty()) {
+//                    isSign1 = false;
+//                    StringBuilder sb = new StringBuilder();
+//                    sb.append("id = ").append(taskApp.getId()).append(", 人总共：").append(userList.size()).append(", 剩下：").append(differentElements.size());
+//                    for (String element : differentElements) {
+//                        sb.append(", ").append(element);
+//                    }
+//                    System.err.println(sb);
+//                }
+//            }
+            if(!sucessUser.isEmpty() && isSign){
+                for(String user:sucessUser){
+                    for(String mapkey:dataMap.keySet()){
+                        String mapval = dataMap.get(mapkey);
+                        if(mapval.contains(user)){
+                            dataUserMap.remove(mapkey) ;
+                        }
                     }
-                    System.err.println(sb);
                 }
+                for(String company:sucessCompan){
+                    for(String mapkey:dataMap.keySet()){
+                        String mapval = dataMap.get(mapkey);
+                        if(mapval != null && (mapval.equals(company) || mapval.equals(company+"\r"))){
+                            dataUserMap.remove(mapkey) ;
+                        }
+                    }
+                }
+                if(!dataUserMap.isEmpty()){
+                    isSign = false ;
+                }
+                System.out.println(taskApp.getId() +"-"+"个人总共:" + sucessUser.size() + "-剩下-" +dataUserMap.keySet().size());
             }
-            if (isSign && isSign1) {
+            if (isSign ) {
                 String sql2 = "UPDATE u_information_query set chek_status=2 where id='" + taskApp.getId() + "'";
                 jdbcTemplate.execute(sql2);
             } else {