调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -2600,12 +2600,12 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             Map<String, AdminUserRespDTO> userMap = adminUserApi.getUserMap(finalUids);
             pageResult.getList().forEach(item -> {
                 item.setSubmitUser(userMap.get(item.getSubmitId()));
-//                if (item.getCurrentAuditorId() != null){
-//                    item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
-//                }else{
-//                    item.setCurrentAuditor(userMap.get(item.getApprovalId()));
-//                }
-                item.setCurrentAuditor(userMap.get(item.getApprovalId()));
+                if (item.getApprovalId() != null){
+                    item.setCurrentAuditor(userMap.get(item.getApprovalId()));
+                }else{
+                    item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
+                }
+//                item.setCurrentAuditor(userMap.get(item.getApprovalId()));
                 item.setRatifyUser(userMap.get(item.getRatifyId()));
                 item.setOrderItemIds(dataMap.get(item.getId()));
             });
@@ -2675,12 +2675,12 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         //List<TaskOrderSignFileDO> finalTaskOrderSignFileDOs = taskOrderSignFileDOs;
         pageResult.getList().forEach(item -> {
             item.setSubmitUser(userMap.get(item.getSubmitId()));
-//            if (item.getCurrentAuditorId() != null){
-//                item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
-//            }else{
-//                item.setCurrentAuditor(userMap.get(item.getApprovalId()));
-//            }
-            item.setCurrentAuditor(userMap.get(item.getApprovalId()));
+            if (item.getApprovalId() != null){
+                item.setCurrentAuditor(userMap.get(item.getApprovalId()));
+            }else{
+                item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
+            }
+//            item.setCurrentAuditor(userMap.get(item.getApprovalId()));
             item.setOrderItemIds(dataMap.get(item.getId()));
 //            if (CollUtil.isNotEmpty(finalTaskOrderSignFileDOs)) {
 //                List<TaskOrderSignFileDO> list = finalTaskOrderSignFileDOs.stream().filter(x -> x.getOrderItemId().equals(item.getOrderItemId())).toList();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -2032,12 +2032,12 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         pageResult.getList().forEach(item -> {
             item.setSubmitUser(userMap.get(item.getSubmitId()));
-//            if (item.getCurrentAuditorId() != null){
-//                item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
-//            }else{
-//                item.setCurrentAuditor(userMap.get(item.getApprovalId()));
-//            }
-            item.setCurrentAuditor(userMap.get(item.getApprovalId()));
+            if (item.getApprovalId() != null){
+                item.setCurrentAuditor(userMap.get(item.getApprovalId()));
+            }else{
+                item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
+            }
+//            item.setCurrentAuditor(userMap.get(item.getApprovalId()));
             item.setRatifyUser(userMap.get(item.getRatifyId()));
             item.setOrderItemIds(dataMap.get(item.getId()));
         });
@@ -3569,14 +3569,16 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         List<BpmTaskRespVO> list = Lists.newArrayList();
         PipeTaskOrderItemReportDO itemReportDO = null;
-        if (reportType != null && reportType.intValue() == TaskOrderItemReportTypeEnum.INSPECTION_PLAN.getType()) {
-            PipeTaskOrderReportDO taskOrderReportDO = taskOrderReportMapper.selectById(id);
-            if (taskOrderReportDO != null) {
-                itemReportDO = BeanUtils.toBean(taskOrderReportDO, PipeTaskOrderItemReportDO.class);
-            }
-        } else {
-            itemReportDO = taskOrderItemReportMapper.selectById(id);
-        }
+//        if (reportType != null && reportType.intValue() == TaskOrderItemReportTypeEnum.INSPECTION_PLAN.getType()) {
+//            PipeTaskOrderReportDO taskOrderReportDO = taskOrderReportMapper.selectById(id);
+//            if (taskOrderReportDO != null) {
+//                itemReportDO = BeanUtils.toBean(taskOrderReportDO, PipeTaskOrderItemReportDO.class);
+//            }
+//        } else {
+//            itemReportDO = taskOrderItemReportMapper.selectById(id);
+//        }
+
+        itemReportDO = taskOrderItemReportMapper.selectById(id);
 
         if (ObjectUtil.isNotEmpty(itemReportDO) && StrUtil.isNotEmpty(itemReportDO.getProcessInstanceId())) {
             //获取最新的工作流-流程信息