项目批次

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

@@ -807,10 +807,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
             main.setArcposition(row.getString("部位"));
             main.setArccontent(row.getString("内容"));
             String status = row.getString("总状态");
-            if(ObjectUtil.isNotEmpty(status)) {
-                status = status.toLowerCase();
-            }
-            main.setMainstatus(status);
+            main.setMainstatus(LuckySheet4SummaryHelp.getCommonStatus(status));
             main.setReqdate(LuckySheet4SummaryHelp.getDateDefaultNull(row, "提出日期"));
             main.setRequser(row.getString("提出者"));
             main.setRectifydate(LuckySheet4SummaryHelp.getDateDefaultNull(row, "整改日期"));
@@ -842,10 +839,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
 
                 machine.setFinishdate(LuckySheet4SummaryHelp.getDateDefaultNull(machineObj, "完成日期"));
                 String mochineStatus = machineObj.getString("状态");
-                if(ObjectUtil.isNotEmpty(mochineStatus)) {
-                    mochineStatus = mochineStatus.toLowerCase();
-                }
-                machine.setStatus(mochineStatus);
+                machine.setStatus(LuckySheet4SummaryHelp.getCommonStatus(mochineStatus));
 
                 Map<String, JSONObject> orgMap = summaryDataBo.getOrgMap();
 
@@ -886,6 +880,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                         }
                         machineEntity.setDeptname(realDepartName);
                         machineEntity.setDutydeptname(realDepartName);
+                        machineEntity.setBatchid(summaryDataBo.getBatchId());
 
                         machineEntity.setId(SecurityUtil.getUUID());
                         slaveList.add(machineEntity);
@@ -924,6 +919,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                         machine.setFirstdutydeptname(dutyDepartOrg.getString("PSHORTNAME"));
                     }
                     machine.setDutydeptname(realDutyDepartName);
+                    machine.setBatchid(summaryDataBo.getBatchId());
 
                     machine.setId(SecurityUtil.getUUID());
                     slaveList.add(machine);
@@ -1137,6 +1133,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                 .prjDeviceNumMap(deviceNumMap)
                 .orgMap(workshopMap)
                 .project(project)
+                .batchId(dto.getBatchId())
                 .build();
     }
 

business-common/src/main/java/com/rongwei/bscommon/sys/utils/LuckySheet4SummaryHelp.java

@@ -30,6 +30,11 @@ public class LuckySheet4SummaryHelp {
      */
     public static final List<String> DATA_VERIFY_STATUS = Arrays.asList(new String[] {"OK", "X", "/"});
 
+    /**
+     *
+     */
+    public static final List<String> WRONG_STATUS = Arrays.asList(new String[] {"×"});
+
     /**
      * 获取单元格值
      *
@@ -174,4 +179,26 @@ public class LuckySheet4SummaryHelp {
         departObj.put("prohibitInput", false);
         return departObj;
     }
+
+    /**
+     * 获取状态
+     *
+     * @param status
+     * @return
+     */
+    public static String getCommonStatus(String status) {
+
+        if(ObjectUtil.isEmpty(status)) {
+            return status;
+        }
+
+        if(WRONG_STATUS.contains(status)) {
+            return "x";
+        }
+
+        if(ObjectUtil.isNotEmpty(status)) {
+            status = status.toLowerCase();
+        }
+        return status;
+    }
 }

business-entity/src/main/java/com/rongwei/bsentity/dto/project/SaveSummaryDataBo.java

@@ -28,4 +28,9 @@ public class SaveSummaryDataBo {
      * 项目id
      */
     private ZhcxProjectManageDo project;
+
+    /**
+     * 批次id
+     */
+    private String batchId;
 }