危险作业显示部门+/部门所属机构

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/THazardWorkPlanService.java

@@ -89,4 +89,6 @@ public interface THazardWorkPlanService extends SuperService<THazardWorkPlan> {
     boolean exportJobTicket(HttpServletResponse response, THazardWorkPlanParam param);
 
     List<TaskInfoDTO> getAllTaskApprovers(String processInstanceId, String planId);
+
+    public String getOrgNamesByOrgIds(String orgId);
 }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -183,16 +183,16 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
             tHazardWorkPlanDTO.setInvolvesOtherHazardousWorkName(String.join(",", names));
         }
         //作业所在单位
-        tHazardWorkPlanDTO.setOperationUnitName(getOrgNamesByOrgId(tHazardWorkPlanDTO.getOperationUnit()));
+        tHazardWorkPlanDTO.setOperationUnitName(getOrgNamesByOrgIds(tHazardWorkPlanDTO.getOperationUnit()));
         //作业主管单位
         String workSupervisoryUnit = tHazardWorkPlanDTO.getWorkSupervisoryUnit();
-        tHazardWorkPlanDTO.setWorkSupervisoryUnitName(getOrgNamesByOrgId(workSupervisoryUnit));
+        tHazardWorkPlanDTO.setWorkSupervisoryUnitName(getOrgNamesByOrgIds(workSupervisoryUnit));
         //现场负责人
         String workSiteResponsible = tHazardWorkPlanDTO.getWorkSiteResponsible();
         tHazardWorkPlanDTO.setWorkSiteResponsibleName(getUserNamesByUserIds(workSiteResponsible));
         //设置作业单位
         String workUnit = tHazardWorkPlanDTO.getWorkUnit();
-        tHazardWorkPlanDTO.setWorkUnitName(getOrgNamesByOrgId(workUnit));
+        tHazardWorkPlanDTO.setWorkUnitName(getOrgNamesByOrgIds(workUnit));
         ;
         //设置项目负责人
         String projectLeader = tHazardWorkPlanDTO.getProjectLeader();
@@ -260,7 +260,8 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         for (THazardWorkPlanDTO tHazardWorkPlanDTO : tHazardWorkPlanDTOS) {
             //设置作业单位
             String workUnit = tHazardWorkPlanDTO.getWorkUnit();
-            tHazardWorkPlanDTO.setWorkUnitName(getOrgNamesByOrgId(workUnit));
+            //tHazardWorkPlanDTO.setWorkUnitName(getOrgNamesByOrgId(workUnit));
+            tHazardWorkPlanDTO.setWorkUnitName(getOrgNamesByOrgIds(workUnit));
             SysUser sysUser = sysUserService.getById(tHazardWorkPlanDTO.getCreateBy());
             if (sysUser != null) {
                 tHazardWorkPlanDTO.setCreateByName(sysUser.getUserName());
@@ -729,6 +730,38 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         return null;
     }
 
+
+    @Override
+    public String getOrgNamesByOrgIds(String orgId) {
+        try{
+            String orgName = "";
+            if (StringUtils.isNotBlank(orgId)) {
+                String[] split = orgId.split("-");
+                //如果是0是企业内部机构
+                if ("0".equals(split[0])) {
+                    NewSysOrg sysOrg = newSysOrgService.getById(split[1]);
+                    if (sysOrg != null) {
+                        orgName = sysOrg.getOrgName();
+                        NewSysOrg sysOrg2 = newSysOrgService.getById(sysOrg.getParentId());
+                        if(sysOrg2 != null){
+                            orgName = sysOrg2.getOrgName()+"/"+orgName;
+                        }
+                        return orgName;
+                    }
+                } else {
+                    TContractorInfo tContractorInfo = tContractorInfoService.getById(split[1]);
+                    if (tContractorInfo != null) {
+                        return tContractorInfo.getName();
+                    }
+                }
+            }
+        }catch (Exception e){
+            log.info("获取单位名称异常",e);
+        }
+
+        return null;
+    }
+
     /**
      * 提取 0-id,1-id ，格式中的id字段 返回如 id1,id2
      *