整改拆分项目

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

@@ -51,8 +51,18 @@ public class ZhcxProjectDeviceNumberServiceImpl extends ServiceImpl<ZhcxProjectD
             return Collections.emptyList();
         }
         list.sort((sort1, sort2) -> {
-            int sort1Int = Integer.parseInt(sort1.getDeviceNumber().replace("#", ""));
-            int sort2Int = Integer.parseInt(sort2.getDeviceNumber().replace("#", ""));
+            String sort1Temp;
+            String sort2Temp;
+            if(sort1.getDeviceNumber().contains("-")) {
+                sort1Temp = sort1.getDeviceNumber().split("-")[1];
+                sort2Temp = sort2.getDeviceNumber().split("-")[1];
+            } else {
+                sort1Temp = sort1.getDeviceNumber();
+                sort2Temp =  sort2.getDeviceNumber();
+            }
+
+            int sort1Int = Integer.parseInt(sort1Temp.replace("#", ""));
+            int sort2Int = Integer.parseInt(sort2Temp.replace("#", ""));
             return sort1Int - sort2Int;
         });
         return list;

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

@@ -871,7 +871,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
 
             main.setBatchid(summaryDataBo.getBatchId());
 
-            main.setSeqsort(row.getString("总序号"));
+            main.setSeqsort(row.getInteger("总序号"));
             main.setSupervisorcode(row.getString("监理编号"));
             main.setArcposition(row.getString("部位"));
             main.setArccontent(row.getString("内容"));
@@ -905,7 +905,10 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
 
                 machine.setMachineno(machineNo);
                 ZhcxProjectDeviceNumberDo numberDo = summaryDataBo.getPrjDeviceNumMap().get(machineNo);
-                machine.setMachineid(numberDo.getId());
+
+                if(ObjectUtil.isNotNull(numberDo)) {
+                    machine.setMachineid(numberDo.getId());
+                }
 
                 machine.setFinishdate(LuckySheet4SummaryHelp.getDateDefaultNull(machineObj, "完成日期"));
                 String mochineStatus = machineObj.getString("状态");
@@ -1286,6 +1289,9 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
      */
     private SaveSummaryDataBo assembleSaveSummaryDataParam(SavePorjectSummaryDto dto) {
 
+        //项目
+        ZhcxProjectManageDo project = getById(dto.getProjectId());
+
         List<ZhcxProjectDeviceNumberDo> deviceNumList;
         Map<String, ZhcxProjectDeviceNumberDo> deviceNumMap = new LinkedHashMap<>();
         //机号列表
@@ -1309,9 +1315,6 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
             workshopIdMap.put(item.getString("ID"), item);
         });
 
-        //项目
-        ZhcxProjectManageDo project = getById(dto.getProjectId());
-
         return SaveSummaryDataBo.builder()
                 .prjDeviceNumMap(deviceNumMap)
                 .orgMap(workshopMap)

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxProjectRectifyDo.java

@@ -58,7 +58,7 @@ public class ZhcxProjectRectifyDo extends BaseDo {
      * 总序号
      */
     @TableField("SEQSORT")
-    private String seqsort;
+    private Integer seqsort;
     /**
      * 监理编号
      */

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxProjectRectifyMachineDo.java

@@ -152,4 +152,15 @@ public class ZhcxProjectRectifyMachineDo extends BaseDo {
     @TableField("DUTYSUBCONTRACTORNAME")
     private String dutysubcontractorname;
 
+    @TableField("PRJCODE")
+    private String prjcode;
+
+    @TableField("PRJNAME")
+    private String prjname;
+
+    @TableField("REALMACHINENO")
+    private String realmachineno;
+
+    @TableField("REALMACHINEID")
+    private String realmachineid;
 }