重大问题线索调整&任务单流程修改

tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/enums/boiler/BoilerBpmModelConstants.java

@@ -22,6 +22,11 @@ public interface BoilerBpmModelConstants {
      */
     String TASK_ORDER = "TASK_ORDER";
 
+    /**
+     * 锅炉任务单审核
+     */
+    String BOILER_TASK_ORDER = "BOILER_TASK_ORDER";
+
     /**
      * 检验意见通知书审核
      */

tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/enums/pipe/PipeBpmModelConstants.java

@@ -22,6 +22,11 @@ public interface PipeBpmModelConstants {
      */
     String TASK_ORDER = "TASK_ORDER";
 
+    /**
+     * 管道任务单审核
+     */
+    String PIPE_TASK_ORDER = "PIPE_TASK_ORDER";
+
     /**
      * 检验意见通知书审核
      */

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/service/pressure2/taskorder/BpmBoilerTaskOrderStatusListener.java

@@ -1,6 +1,7 @@
 package cn.start.tz.module.bpm.service.pressure2.taskorder;
 
 import cn.start.tz.module.bpm.enums.BpmModelConstants;
+import cn.start.tz.module.bpm.enums.boiler.BoilerBpmModelConstants;
 import cn.start.tz.module.bpm.event.BpmProcessInstanceStatusEvent;
 import cn.start.tz.module.bpm.event.BpmProcessInstanceStatusEventListener;
 import cn.start.tz.module.pressure2.api.taskorder.BoilerTaskOrderApi;
@@ -22,7 +23,7 @@ public class BpmBoilerTaskOrderStatusListener extends BpmProcessInstanceStatusEv
 
     @Override
     protected String getProcessDefinitionKey() {
-        return BpmModelConstants.TASK_ORDER;
+        return BoilerBpmModelConstants.BOILER_TASK_ORDER;
     }
 
     @Override

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/service/pressure2/taskorder/BpmPipeTaskOrderStatusListener.java

@@ -1,6 +1,7 @@
 package cn.start.tz.module.bpm.service.pressure2.taskorder;
 
 import cn.start.tz.module.bpm.enums.BpmModelConstants;
+import cn.start.tz.module.bpm.enums.pipe.PipeBpmModelConstants;
 import cn.start.tz.module.bpm.event.BpmProcessInstanceStatusEvent;
 import cn.start.tz.module.bpm.event.BpmProcessInstanceStatusEventListener;
 import cn.start.tz.module.pressure2.api.taskorder.PipeTaskOrderApi;
@@ -22,7 +23,7 @@ public class BpmPipeTaskOrderStatusListener extends BpmProcessInstanceStatusEven
 
     @Override
     protected String getProcessDefinitionKey() {
-        return BpmModelConstants.TASK_ORDER;
+        return PipeBpmModelConstants.PIPE_TASK_ORDER;
     }
 
     @Override

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderoperation/BoilerTaskOrderOperationServiceImpl.java

@@ -4,6 +4,7 @@ import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.module.bpm.api.task.BpmProcessInstanceApi;
 import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
 import cn.start.tz.module.bpm.enums.BpmModelConstants;
+import cn.start.tz.module.bpm.enums.boiler.BoilerBpmModelConstants;
 import cn.start.tz.module.bpm.enums.task.BpmTaskStatusEnum;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderoperation.vo.PipeTaskOrderOperationPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderoperation.vo.PipeTaskOrderOperationRespVO;
@@ -64,7 +65,7 @@ public class BoilerTaskOrderOperationServiceImpl extends ServiceImpl<BoilerTaskO
         boilerTaskOrderOperationMapper.insert(boilerTaskOrderOperation);
 
         String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId,
-                new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(BpmModelConstants.TASK_ORDER)
+                new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(BoilerBpmModelConstants.BOILER_TASK_ORDER)
                         .setBusinessKey(createReqVO.getObjId())).getCheckedData();
 
         // 变更信息同步更新主表

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01010_202402OFData.java

@@ -16,6 +16,8 @@ import cn.start.tz.module.pressure2.dal.mysql.equippipe.EquipPipeMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitem.PipeTaskOrderItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.system.api.clientunit.ClientUnitApi;
+import cn.start.tz.module.system.api.clientunit.dto.ClientUnitDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -55,6 +57,9 @@ public class QC01010_202402OFData implements IDynamicOFData {
     @Resource
     private AdminUserApi adminUserApi;
 
+    @Resource
+    private ClientUnitApi clientUnitApi;
+
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -89,6 +94,13 @@ public class QC01010_202402OFData implements IDynamicOFData {
                     result.put("equipName",equipBoilerDO.getEquipName());
                     result.put("unitAddress",equipBoilerDO.getUnitAddress());
                     result.put("unitName",equipBoilerDO.getUnitName());
+                    //单位信息
+                    ClientUnitDTO clientUnitDTO = clientUnitApi.getClientUnit(equipBoilerDO.getUnitId()).getCheckedData();
+                    if (clientUnitDTO != null){
+                        result.put("enterpriseType",clientUnitDTO.getEnterpriseType());
+                        result.put("legalRepresent",clientUnitDTO.getLegalRepresent());
+                    }
+
                 }
 
                 result.put("reportNo",itemReportDO.getReportNo());
@@ -111,6 +123,8 @@ public class QC01010_202402OFData implements IDynamicOFData {
                         result.put("equipName","见一览表");
                         result.put("unitAddress","见一览表");
                         result.put("unitName","见一览表");
+                        result.put("enterpriseType","见一览表");
+                        result.put("legalRepresent","见一览表");
                     }else {
                         EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
                         if (equipPipeDO != null){
@@ -120,6 +134,12 @@ public class QC01010_202402OFData implements IDynamicOFData {
                             result.put("equipName",equipPipeDO.getProjectName());
                             result.put("unitAddress",equipPipeDO.getUnitAddress());
                             result.put("unitName",equipPipeDO.getUnitName());
+                            //单位信息
+                            ClientUnitDTO clientUnitDTO = clientUnitApi.getClientUnit(equipPipeDO.getUnitId()).getCheckedData();
+                            if (clientUnitDTO != null){
+                                result.put("enterpriseType",clientUnitDTO.getEnterpriseType());
+                                result.put("legalRepresent",clientUnitDTO.getLegalRepresent());
+                            }
                         }
                     }
                 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderoperation/PipeTaskOrderOperationServiceImpl.java

@@ -4,6 +4,7 @@ import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.module.bpm.api.task.BpmProcessInstanceApi;
 import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
 import cn.start.tz.module.bpm.enums.BpmModelConstants;
+import cn.start.tz.module.bpm.enums.pipe.PipeBpmModelConstants;
 import cn.start.tz.module.bpm.enums.task.BpmTaskStatusEnum;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderoperation.vo.BoilerTaskOrderOperationSaveReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
@@ -66,7 +67,7 @@ public class PipeTaskOrderOperationServiceImpl extends ServiceImpl<PipeTaskOrder
         pipeTaskOrderOperationMapper.insert(TaskOrderOperation);
 
         String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId,
-                new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(BpmModelConstants.TASK_ORDER)
+                new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PipeBpmModelConstants.PIPE_TASK_ORDER)
                         .setBusinessKey(createReqVO.getObjId())).getCheckedData();
 
         // 变更信息同步更新主表