安全检查逻辑完善；

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/vo/app/AppOverviewVo.java

@@ -11,21 +11,21 @@ import java.util.Map;
 @Data
 public class AppOverviewVo {
     @ApiModelProperty("行社数量")
-    private Integer hangsheCount;
+    private int hangsheCount;
     @ApiModelProperty("营业网点数量")
-    private Integer bankingCount;
+    private int bankingCount;
     @ApiModelProperty("中心业务库数量")
-    private Integer centerStoreCount;
+    private int centerStoreCount;
     @ApiModelProperty("网点业务库数量")
-    private Integer bankingStoreCount;
+    private int bankingStoreCount;
     @ApiModelProperty("在行式自动银行数量")
-    private  Integer onlineATMCount;
+    private  int onlineATMCount;
     @ApiModelProperty("离行式自动银行数量")
-    private Integer offlineATMCount;
+    private int offlineATMCount;
     @ApiModelProperty("大堂式设备数量")
-    private Integer lobbyDeviceCount;
+    private int lobbyDeviceCount;
     @ApiModelProperty("穿墙式设备数量")
-    private Integer throughwallDeviceCount;
+    private int throughwallDeviceCount;
 
     @ApiModelProperty("GA38信息：GA382021、GA382015")
     private Map<String,AppOverviewItemVo>  ga38;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -272,11 +272,19 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                         .collect(Collectors.toList()));
             }
 
-            List<TaskRegisterNfcVo> areaNfcs = nfcs.stream()
-                    .filter(nfc -> !usedNfcId.contains(nfc.getNfcId()) && ObjectUtil.equal(nfc.getAreaId(), point.getAreaId()))
-                    .collect(Collectors.toList());
-            usedNfcId.addAll(areaNfcs.stream().map(TaskRegisterNfcVo::getNfcId).collect(Collectors.toList()));
-            point.setNfcList(areaNfcs);
+            point.setNfcList(new ArrayList<>());
+            if(ObjectUtil.equal( point.getMustCheck(),1)){
+                for (TaskRegisterNfcVo nfc : nfcs) {
+                    if(usedNfcId.contains(nfc.getNfcId())){
+                        continue;
+                    }
+
+                    if(ObjectUtil.equal(point.getAreaId(),nfc.getAreaId())){
+                        point.getNfcList().add(nfc);
+                        usedNfcId.add(nfc.getNfcId());
+                    }
+                }
+            }
         }
         vo.setCheckList(points);
 

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -743,6 +743,7 @@ SELECT t.id,
 
         where nfc.org_id = #{orgId}
           AND nfc.ENABLE = 0
+          And nfc.del_flag=0
           AND p.plan_id = #{planId}
           AND p.point_scan = 1
     </select>