报验点报表

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

@@ -76,8 +76,8 @@ public interface ZhcxInsideInspectionDao extends BaseMapper<ZhcxInsideInspection
             "  ziid.INSPECTIONCONCLUSION   " +
             " FROM   " +
             "  ZHCX_INSIDE_INSPECTION zii  " +
-            " JOIN ZHCX_INSIDE_INSPECTION_DISPATCH ziid ON ziid.INSIDEID = zii.ID AND ziid.DELETED = '0'   " +
+            " 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.CREATEDATE ASC")
+            " AND zii.INSPECTIONSTATUS IN ('30', '40') ORDER by zii.INSPECTIONCODE ASC")
     List<JSONObject> getInitNodeStateInspection();
 }

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

@@ -64,8 +64,8 @@ public interface ZhcxOutsideInspectionItpDao extends BaseMapper<ZhcxOutsideInspe
             " dis.INSPECTIONCONCLUSION " +
             "FROM " +
             " ZHCX_OUTSIDE_INSPECTION_ITP itp " +
-            "JOIN ZHCX_OUTSIDE_INSPECTION_ITP_SUPERVISION_DISPATCH dis ON dis.ITPID = itp.ID AND dis.DELETED = '0' " +
+            "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.CREATEDATE ASC")
+            "AND INSPECTIONSTATUS IN ('30', '40') ORDER by itp.INSPECTIONCODE ASC")
     List<JSONObject> getInitNodeStateInspection();
 }

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

@@ -442,6 +442,9 @@ public class ZhcxItpProjectNodeStateServiceImpl extends ServiceImpl<ZhcxItpProje
                 .insideStateList(new ArrayList<>())
                 .outsideStateList(new ArrayList<>())
                 .build();
+
+        Map<String, ZhcxItpProjectNodeStateDo> nodeStateSet = new HashMap<>();
+
         for(RelactionNodeStateBo state : list) {
             LambdaQueryWrapper<ZhcxItpProjectNodeStateDo> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.eq(ZhcxItpProjectNodeStateDo::getPrjid, state.getProjectId())
@@ -471,12 +474,26 @@ public class ZhcxItpProjectNodeStateServiceImpl extends ServiceImpl<ZhcxItpProje
             }
 
             if(ObjectUtil.isNull(stateDo)) {
-                entity.setId(SecurityUtil.getUUID());
-                entity.setMathinecode(state.getMachineNo());
-                entity.setPrjid(state.getProjectId());
-                entity.setNodeid(state.getNodeId());
-                entity.setDeleted("0");
-                prjNodeState.getInsertList().add(entity);
+
+                StringBuilder sb = new StringBuilder();
+                sb.append(state.getProjectId());
+                sb.append(state.getMachineNo());
+                sb.append(state.getNodeId());
+                stateDo = nodeStateSet.get(sb.toString());
+
+                if(ObjectUtil.isNull(stateDo)) {
+                    entity.setId(SecurityUtil.getUUID());
+                    entity.setMathinecode(state.getMachineNo());
+                    entity.setPrjid(state.getProjectId());
+                    entity.setNodeid(state.getNodeId());
+                    entity.setDeleted("0");
+                    prjNodeState.getInsertList().add(entity);
+
+                    nodeStateSet.put(sb.toString(), entity);
+                } else {
+                    entity.setId(stateDo.getId());
+                    prjNodeState.getUpdateList().add(entity);
+                }
             } else {
                 entity.setId(stateDo.getId());
                 prjNodeState.getUpdateList().add(entity);