保存

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

@@ -31,7 +31,7 @@ public interface LuckysheetDao extends BaseMapper<LuckysheetDo> {
             "o.ID, " +
             "o.PID, " +
             "o.SHORTNAME, " +
-            "so.SHORTNAME AS pshortName " +
+            "so.SHORTNAME AS PSHORTNAME " +
             "FROM " +
             "SYS_ORGANIZATION o " +
             "JOIN SYS_ORGANIZATION so ON so.ID = o.PID  " +

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

@@ -802,47 +802,68 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                         departNames = departName.split("、");
                     }
 
-                    for(String departNameTemp : departNames) {
+                    for(String depName : departNames) {
+
+                        //去掉无用部分
+                        String realDepartName = getRealDepartName(depName);
+
+                        if(ObjectUtil.isEmpty(realDepartName)) {
+                            continue;
+                        }
 
                         ZhcxProjectRectifyMachineDo machineEntity = new ZhcxProjectRectifyMachineDo();
                         BeanUtil.copyProperties(machine, machineEntity);
 
-                        JSONObject org = orgMap.get(departNameTemp);
+                        JSONObject org = orgMap.get(realDepartName);
                         if(ObjectUtil.isNotNull(org)) {
                             machineEntity.setDeptid(org.getString("ID"));
                             machineEntity.setFirstdeptid(org.getString("PID"));
-                            machineEntity.setFirstdeptname(org.getString("pshortName"));
+                            machineEntity.setFirstdeptname(org.getString("PSHORTNAME"));
 
                             machineEntity.setDutydeptid(org.getString("ID"));
                             machineEntity.setFirstdutydeptid(org.getString("PID"));
-                            machineEntity.setFirstdutydeptname(org.getString("pshortName"));
+                            machineEntity.setFirstdutydeptname(org.getString("PSHORTNAME"));
                         }
-                        machineEntity.setDeptname(departNameTemp);
-                        machineEntity.setDutydeptname(departNameTemp);
+                        machineEntity.setDeptname(realDepartName);
+                        machineEntity.setDutydeptname(realDepartName);
 
                         machineEntity.setId(SecurityUtil.getUUID());
                         slaveList.add(machineEntity);
                     }
 
                 } else {
+
+                    //去掉无用
+                    String realDepartName = getRealDepartName(departName);
+                    if(ObjectUtil.isEmpty(realDepartName)) {
+                        continue;
+                    }
+
                     //施工部门
-                    JSONObject departOrg = orgMap.get(departName);
+                    JSONObject departOrg = orgMap.get(realDepartName);
                     if(ObjectUtil.isNotEmpty(departName) && ObjectUtil.isNotNull(departOrg)) {
                         machine.setDeptid(departOrg.getString("ID"));
                         machine.setFirstdeptid(departOrg.getString("PID"));
-                        machine.setFirstdeptname(departOrg.getString("pshortName"));
+                        machine.setFirstdeptname(departOrg.getString("PSHORTNAME"));
                     }
-                    machine.setDeptname(departName);
+                    machine.setDeptname(realDepartName);
 
                     //责任部门
                     String dutyDepartName = machineObj.getString("责任部门");
-                    JSONObject dutyDepartOrg = orgMap.get(dutyDepartName);
-                    if(ObjectUtil.isNotEmpty(dutyDepartName) && ObjectUtil.isNotNull(dutyDepartOrg)) {
+
+                    //去掉无用
+                    String realDutyDepartName = getRealDepartName(dutyDepartName);
+                    if(ObjectUtil.isEmpty(realDepartName)) {
+                        continue;
+                    }
+
+                    JSONObject dutyDepartOrg = orgMap.get(realDutyDepartName);
+                    if(ObjectUtil.isNotEmpty(realDutyDepartName) && ObjectUtil.isNotNull(dutyDepartOrg)) {
                         machine.setDutydeptid(dutyDepartOrg.getString("ID"));
                         machine.setFirstdutydeptid(dutyDepartOrg.getString("PID"));
-                        machine.setFirstdutydeptname(dutyDepartOrg.getString("pshortName"));
+                        machine.setFirstdutydeptname(dutyDepartOrg.getString("PSHORTNAME"));
                     }
-                    machine.setDutydeptname(dutyDepartName);
+                    machine.setDutydeptname(realDutyDepartName);
 
                     machine.setId(SecurityUtil.getUUID());
                     slaveList.add(machine);
@@ -860,6 +881,30 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
         }
     }
 
+    /**
+     * 获取真实部门
+     *
+     * @param departName
+     * @return
+     */
+    private String getRealDepartName(String departName) {
+        if(ObjectUtil.isEmpty(departName)) {
+            return null;
+        }
+
+        if(departName.contains("(")) {
+            String[] split = departName.split("\\(");
+            return split[0];
+        }
+
+        if(departName.contains("（")) {
+            String[] split = departName.split("（");
+            return split[0];
+        }
+
+        return departName;
+    }
+
     /**
      * 解析数据
      * {

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

@@ -142,9 +142,11 @@ public class XlsSheetUtil {
                     //bg 背景颜色
                     if(v_json.containsKey("bg")){
                         String _v=getByDBObject(v_json,"bg");
-                        Short _color=ColorUtil.getColorByStr(_v);
-                        if(_color!=null) {
-                            style.setFillBackgroundColor(_color);
+                        if(_v != null) {
+                            Short _color=ColorUtil.getColorByStr(_v);
+                            if(_color!=null) {
+                                style.setFillBackgroundColor(_color);
+                            }
                         }
                     }