技术交底涉及/不涉及问题

危险作业粮库选择组织树时bug修改
危险作业实际开始/结束时间修改

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

@@ -1298,7 +1298,8 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         List<THazardDisclosureDetails> tHazardDisclosureDetailsList =
                 tHazardDisclosureDetailsService.list(new QueryWrapper<THazardDisclosureDetails>().eq(THazardDisclosureDetails.DISCLOSURE_ID, tHazardDisclosure.getId()).orderByAsc(THazardDisclosureDetails.SORT));
         for (THazardDisclosureDetails details : tHazardDisclosureDetailsList) {
-            details.setIsDisclosure(ExcelUtil.convertByExp(details.getIsDisclosure(), "1=交底,2=不涉及", ","));
+            //details.setIsDisclosure(ExcelUtil.convertByExp(details.getIsDisclosure(), "1=交底,2=不涉及", ","));
+            details.setIsDisclosure(ExcelUtil.convertByExp(details.getIsDisclosure(), "1=交底,0=不涉及", ","));
         }
         datas.put("tHazardDisclosureDetails", tHazardDisclosureDetailsList);
 

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/task/DynamicCandidateUsersListener.java

@@ -86,8 +86,13 @@ public class DynamicCandidateUsersListener implements TaskListener {
         if ("安全技术交底".equals(name)){
             //修改交底状态
             String bizId = delegateTask.getVariable("bizKeyId").toString();
+            //是否驳回
+            String rejected = delegateTask.getVariable("rejected").toString();
             THazardWorkPlan byId = tHazardWorkPlanService.getById(bizId);
             if (byId != null){
+                if("0".equals(rejected)){
+                    byId.setActualStartTime(new Date());
+                }
                 byId.setWorkStatus(WorkPlanStatusEnum.TECHNICAL_EXPLANATION.getValue());
                 tHazardWorkPlanService.updateById(byId);
             }
@@ -96,17 +101,26 @@ public class DynamicCandidateUsersListener implements TaskListener {
         if ("安全许可证关闭".equals(name)){
             //修改交底状态
             String bizId = delegateTask.getVariable("bizKeyId").toString();
+            //是否驳回
+            String rejected = delegateTask.getVariable("rejected").toString();
             THazardWorkPlan byId = tHazardWorkPlanService.getById(bizId);
             if (byId != null){
+                /*安全技术交底时设置实际开始时间
+                安全许可证关闭时设置实际结束时间
+                到此节点后通过后才设置值*/
                 // 获取当前时间
-                Date currentTime = new Date();
+                /*Date currentTime = new Date();
                 // 获取scheduledStartTime和scheduledEndTime的时间差
                 long timeDifference = byId.getScheduledEndTime().getTime() - byId.getScheduledStartTime().getTime();
                 // 计算实际结束作业时间（当前时间 + 时间差）
                 Date actualEndTime = new Date(currentTime.getTime() + timeDifference);
                 //更新计划作业时间
                 byId.setActualStartTime(new Date());
-                byId.setActualEndTime(actualEndTime);
+                byId.setActualEndTime(actualEndTime);*/
+
+                if("0".equals(rejected)){
+                    byId.setActualEndTime(new Date());
+                }
                 byId.setWorkStatus(WorkPlanStatusEnum.TO_BE_CLOSED.getValue());
                 tHazardWorkPlanService.updateById(byId);
                 //发送消息通知

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysOrgController.java

@@ -570,6 +570,8 @@ public class NewSysOrgController extends SuperController {
         SysOrg rootOrg = new  SysOrg();
         if (org.getParentIds().contains(dbgkOrgId)) {
             rootOrg = orgMap.get(dbgkOrgId);
+        }else if(org.getTreeLevel().compareTo(BigDecimal.valueOf(4))==0){
+            rootOrg = orgMap.get(org.getParentId());
         }else{
             rootOrg = orgMap.get(orgId);
         }