异常处理

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

@@ -43,7 +43,7 @@ public interface ZhcxProjectManageDao extends BaseMapper<ZhcxProjectManageDo> {
             "AND x.MACHINENO=#{machineno}" +
             "</if>" +
             "AND x.DEPTID is not null and " +
-            "x.STATUS is not null " +
+            "x.STATUS is not null and x.IFOUTSIDEBASE in ('inside', 'outside')" +
             "</script>")
     List<ZhcxProjectRectifyMachineVo> getListData(Map<String, Object> map);
 }

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

@@ -933,15 +933,14 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                         JSONObject org = orgMap.get(realDepartName);
                         if(ObjectUtil.isNotNull(org)) {
                             machineEntity.setDeptid(org.getString("ID"));
-                            //一级部门
-                            JSONObject firstObj = orgIdMap.get(org.getString("PID"));
+
                             //如果上一级选择的基地内id，表示选择的是一级部门
                             // 选择一级部门
-                            if("366d678e57384d0e92c4c5d0d3af2485".equals(firstObj.getString("ID"))) {//基地外
+                            if("366d678e57384d0e92c4c5d0d3af2485".equals(org.getString("PID"))) {//基地外
                                 machineEntity.setFirstdeptid(org.getString("ID"));
                                 machineEntity.setFirstdeptname(realDepartName);
                                 machineEntity.setIfoutsidebase("outside");
-                            } else if("b0bd3ed27bfb4af08535c39f464b3d3a".equals(firstObj.getString("ID"))) {//长兴基地
+                            } else if("b0bd3ed27bfb4af08535c39f464b3d3a".equals(org.getString("PID"))) {//长兴基地
                                 machineEntity.setFirstdeptid(org.getString("ID"));
                                 machineEntity.setFirstdeptname(realDepartName);
                                 machineEntity.setIfoutsidebase("inside");
@@ -949,17 +948,26 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                             //选择二级部门情况
                             else {
                                 //一级部门
-                                machineEntity.setFirstdeptid(firstObj.getString("ID"));
-                                machineEntity.setFirstdeptname(firstObj.getString("SHORTNAME"));
-
-                                //基地内外
-                                if("b0bd3ed27bfb4af08535c39f464b3d3a".equals(firstObj.getString("PID"))) {//长兴基地
-                                    machineEntity.setIfoutsidebase("inside");
+                                JSONObject firstObj = orgIdMap.get(org.getString("PID"));
+
+                                if(ObjectUtil.isNotNull(firstObj)) {
+                                    //一级部门
+                                    machineEntity.setFirstdeptid(firstObj.getString("ID"));
+                                    machineEntity.setFirstdeptname(firstObj.getString("SHORTNAME"));
+
+                                    //基地内外
+                                    if("b0bd3ed27bfb4af08535c39f464b3d3a".equals(firstObj.getString("PID"))) {//长兴基地
+                                        machineEntity.setIfoutsidebase("inside");
+                                    } else {
+                                        machineEntity.setIfoutsidebase("outside");
+                                    }
                                 } else {
-                                    machineEntity.setIfoutsidebase("outside");
+                                    machineEntity.setIfoutsidebase("otherside");
                                 }
+
                             }
 
+
                             machineEntity.setDutydeptid(machineEntity.getDeptid());
                             machineEntity.setFirstdutydeptid(machineEntity.getFirstdeptid());
                             machineEntity.setFirstdutydeptname(machineEntity.getFirstdeptname());
@@ -988,22 +996,21 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                     if(ObjectUtil.isNotEmpty(departName) && ObjectUtil.isNotNull(departOrg)) {
                         machine.setDeptid(departOrg.getString("ID"));
 
-                        //一级部门
-                        JSONObject firstObj = orgIdMap.get(departOrg.getString("PID"));
-                        //如果上一级选择的基地内id，表示选择的是一级部门
-                        if(ObjectUtil.isNotEmpty(firstObj)) {
-                            // 选择一级部门
-                            if ("366d678e57384d0e92c4c5d0d3af2485".equals(firstObj.getString("ID"))) {//基地外
-                                machine.setFirstdeptid(departOrg.getString("ID"));
-                                machine.setFirstdeptname(realDepartName);
-                                machine.setIfoutsidebase("outside");
-                            } else if ("b0bd3ed27bfb4af08535c39f464b3d3a".equals(firstObj.getString("ID"))) {//长兴基地
-                                machine.setFirstdeptid(departOrg.getString("ID"));
-                                machine.setFirstdeptname(realDepartName);
-                                machine.setIfoutsidebase("inside");
-                            }
-                            //选择二级部门情况
-                            else {
+                        // 选择一级部门
+                        if ("366d678e57384d0e92c4c5d0d3af2485".equals(departOrg.getString("PID"))) {//基地外
+                            machine.setFirstdeptid(departOrg.getString("ID"));
+                            machine.setFirstdeptname(realDepartName);
+                            machine.setIfoutsidebase("outside");
+                        } else if ("b0bd3ed27bfb4af08535c39f464b3d3a".equals(departOrg.getString("PID"))) {//长兴基地
+                            machine.setFirstdeptid(departOrg.getString("ID"));
+                            machine.setFirstdeptname(realDepartName);
+                            machine.setIfoutsidebase("inside");
+                        }
+                        //其他情况视为选择二级部门
+                        else { //选择二级部门情况
+                            JSONObject firstObj = orgIdMap.get(departOrg.getString("PID")); //一级部门
+                            //如果上一级选择的基地内id，表示选择的是一级部门
+                            if(ObjectUtil.isNotEmpty(firstObj)) {
                                 //一级部门
                                 machine.setFirstdeptid(firstObj.getString("ID"));
                                 machine.setFirstdeptname(firstObj.getString("SHORTNAME"));
@@ -1014,11 +1021,16 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                                 } else {
                                     machine.setIfoutsidebase("outside");
                                 }
+
+                            }
+                            else {
+                                machine.setIfoutsidebase("otherside");
                             }
                         }
-
 //                        machine.setFirstdeptid(departOrg.getString("PID"));
 //                        machine.setFirstdeptname(departOrg.getString("PSHORTNAME"));
+                    } else {
+                        machine.setIfoutsidebase("otherside");
                     }
 
                     //责任部门
@@ -1035,23 +1047,22 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                     if(ObjectUtil.isNotEmpty(realDutyDepartName) && ObjectUtil.isNotNull(dutyDepartOrg)) {
                         machine.setDutydeptid(dutyDepartOrg.getString("ID"));
 
-                        //一级部门
-                        JSONObject firstObj = orgIdMap.get(dutyDepartOrg.getString("PID"));
-
-                        //如果上一级选择的基地内id，表示选择的是一级部门
-                        if(ObjectUtil.isNotEmpty(firstObj)) {
-                            // 选择一级部门
-                            if("366d678e57384d0e92c4c5d0d3af2485".equals(firstObj.getString("ID"))) {//基地外
-                                machine.setFirstdutydeptid(dutyDepartOrg.getString("ID"));
-                                machine.setFirstdutydeptname(realDepartName);
-                                machine.setDutyifoutsidebase("outside");
-                            } else if("b0bd3ed27bfb4af08535c39f464b3d3a".equals(firstObj.getString("ID"))) {//长兴基地
-                                machine.setFirstdutydeptid(dutyDepartOrg.getString("ID"));
-                                machine.setFirstdutydeptname(realDepartName);
-                                machine.setDutyifoutsidebase("inside");
-                            }
-                            //选择二级部门情况
-                            else {
+                        // 选择一级部门
+                        if("366d678e57384d0e92c4c5d0d3af2485".equals(dutyDepartOrg.getString("PID"))) {//基地外
+                            machine.setFirstdutydeptid(dutyDepartOrg.getString("ID"));
+                            machine.setFirstdutydeptname(realDepartName);
+                            machine.setDutyifoutsidebase("outside");
+                        } else if("b0bd3ed27bfb4af08535c39f464b3d3a".equals(dutyDepartOrg.getString("PID"))) {//长兴基地
+                            machine.setFirstdutydeptid(dutyDepartOrg.getString("ID"));
+                            machine.setFirstdutydeptname(realDepartName);
+                            machine.setDutyifoutsidebase("inside");
+                        }
+                        //其他情况视为选择二级部门
+                        else {  //选择二级部门情况
+                            //一级部门
+                            JSONObject firstObj = orgIdMap.get(dutyDepartOrg.getString("PID"));
+                            //如果上一级选择的基地内id，表示选择的是一级部门
+                            if(ObjectUtil.isNotEmpty(firstObj)) {
                                 //一级部门
                                 machine.setFirstdutydeptid(firstObj.getString("ID"));
                                 machine.setFirstdutydeptname(firstObj.getString("SHORTNAME"));
@@ -1062,12 +1073,15 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                                 } else {
                                     machine.setDutyifoutsidebase("outside");
                                 }
+                            } else {
+                                machine.setDutyifoutsidebase("otherside");
                             }
-
                         }
 
 //                        machine.setFirstdutydeptid(dutyDepartOrg.getString("PID"));
 //                        machine.setFirstdutydeptname(dutyDepartOrg.getString("PSHORTNAME"));
+                    } else {
+                        machine.setDutyifoutsidebase("otherside");
                     }
                     machine.setBatchid(summaryDataBo.getBatchId());