Merge remote-tracking branch 'origin/master'

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxInsideInspectionDao.java

@@ -71,13 +71,14 @@ public interface ZhcxInsideInspectionDao extends BaseMapper<ZhcxInsideInspection
     Map<String, SysUserDo> selectSupervision();
 
 
-    @Select("SELECT   " +
-            "  zii.*,   " +
-            "  ziid.INSPECTIONCONCLUSION   " +
-            " FROM   " +
-            "  ZHCX_INSIDE_INSPECTION zii  " +
-            " left JOIN ZHCX_INSIDE_INSPECTION_DISPATCH ziid ON ziid.INSIDEID = zii.ID AND ziid.DELETED = '0'   " +
-            " WHERE zii.DELETED = '0'   " +
-            " AND zii.INSPECTIONSTATUS IN ('30', '40') ORDER by zii.INSPECTIONCODE ASC")
+    @Select("SELECT    " +
+            "  zii.*,    " +
+            "  ziid.INSPECTIONCONCLUSION    " +
+            " FROM    " +
+            "  ZHCX_INSIDE_INSPECTION zii   " +
+            " left JOIN ZHCX_INSIDE_INSPECTION_DISPATCH ziid ON ziid.INSIDEID = zii.ID AND ziid.DELETED = '0'    " +
+            " WHERE zii.DELETED = '0'    " +
+            " AND NOT EXISTS (SELECT * FROM ZHCX_ITP_PROJECT_NODE_STATE_INSIDE zipnsi WHERE zipnsi.INSPECTIONCODE = zii.INSPECTIONCODE) " +
+            " AND zii.INSPECTIONSTATUS IN ('30', '40')  ORDER by zii.INSPECTIONCODE ASC limit 5000")
     List<JSONObject> getInitNodeStateInspection();
 }

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxOutsideInspectionItpDao.java

@@ -59,13 +59,14 @@ public interface ZhcxOutsideInspectionItpDao extends BaseMapper<ZhcxOutsideInspe
             "</script>")
     List<OutsideInspactionSyncDto> getInspection(OutsideInspactionSyncReqquest req);
 
-    @Select("SELECT " +
-            " itp.*, " +
-            " dis.INSPECTIONCONCLUSION " +
-            "FROM " +
-            " ZHCX_OUTSIDE_INSPECTION_ITP itp " +
-            "left JOIN ZHCX_OUTSIDE_INSPECTION_ITP_SUPERVISION_DISPATCH dis ON dis.ITPID = itp.ID AND dis.DELETED = '0' " +
-            "WHERE itp.DELETED = '0' " +
-            "AND INSPECTIONSTATUS IN ('30', '40') ORDER by itp.INSPECTIONCODE ASC")
+    @Select("SELECT  " +
+            " itp.*,  " +
+            " dis.INSPECTIONCONCLUSION  " +
+            "FROM  " +
+            " ZHCX_OUTSIDE_INSPECTION_ITP itp  " +
+            "left JOIN ZHCX_OUTSIDE_INSPECTION_ITP_SUPERVISION_DISPATCH dis ON dis.ITPID = itp.ID AND dis.DELETED = '0'  " +
+            "WHERE itp.DELETED = '0'  " +
+            "AND NOT EXISTS (SELECT * FROM ZHCX_ITP_PROJECT_NODE_STATE_OUTSIDE zipnsi WHERE zipnsi.INSPECTIONCODE = itp.INSPECTIONCODE) " +
+            "AND INSPECTIONSTATUS IN ('30', '40') ORDER by itp.INSPECTIONCODE ASC limit 5000")
     List<JSONObject> getInitNodeStateInspection();
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -362,9 +362,9 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                 .insertList(new ArrayList<>())
                 .updateList(new ArrayList<>())
                 .insideStateList(new ArrayList<>())
+                .unItpList(new ArrayList<>())
                 .build();
 
-
         for(String insideId : req.getInsideIdList()) {
             InsideOperDto inOper = getInsideOperDto(insideId);
             inOper.setOperTime(operDto.getOperTime());