设备变更

master/src/main/java/com/ruoyi/config/ActivitiConfig.java

@@ -125,6 +125,9 @@ public class ActivitiConfig {
         Resource spec8 = resourceLoader.getResource("classpath:/processes/maintenance.bpmn"); //加载流程图资源文件
         deploymentBuilder8.enableDuplicateFiltering().addInputStream(spec8.getFilename(), spec8.getInputStream()).name("设备维修审核").deploy();//按流程id部署
 
+        DeploymentBuilder deploymentBuilder9 = repositoryService().createDeployment();
+        Resource spec9 = resourceLoader.getResource("classpath:/processes/intact/intactChangeApplicationProcess.bpmn"); //加载流程图资源文件
+        deploymentBuilder9.enableDuplicateFiltering().addInputStream(spec8.getFilename(), spec9.getInputStream()).name("设备变更申请流程").deploy();//按流程id部署
     }
 }
 

master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -18,7 +18,9 @@ import com.ruoyi.project.common.service.ITCommonfileService;
 import com.ruoyi.project.ehs.domain.TApproveAccident;
 import com.ruoyi.project.ehs.service.ITApproveAccidentService;
 import com.ruoyi.project.intact.domain.TApproveMaintenance;
+import com.ruoyi.project.intact.domain.TIntactApprove;
 import com.ruoyi.project.intact.service.ITApproveMaintenanceService;
+import com.ruoyi.project.intact.service.ITIntactApproveService;
 import com.ruoyi.project.listener.*;
 import com.ruoyi.project.sems.domain.TApprove;
 import com.ruoyi.project.sems.his.domain.TApproveSpecModify;
@@ -101,6 +103,8 @@ public class TApproveDangerController extends BaseController
     private RepositoryService repositoryService;
     @Autowired
     private ITApproveMaintenanceService tApproveMaintenanceService;
+    @Autowired
+    private ITIntactApproveService tIntactApproveService;
     /**
      * 任务申请
      */
@@ -251,6 +255,10 @@ public class TApproveDangerController extends BaseController
                     TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
                     devProcess.setApproveObject(approve);
                     devProcess.setApNo(approve.getApNo());
+                }else if(pi.getProcessDefinitionName().equals("设备变更申请")){
+                    TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
+                    devProcess.setApproveObject(approve);
+                    devProcess.setApNo(approve.getApNo());
                 }
                 devProcess.setBusinessKey(pi.getBusinessKey());
                 devProcess.setProcessCreateTime(pi.getStartTime());

master/src/main/java/com/ruoyi/project/intact/domain/TIntactYsj.java

@@ -50,6 +50,15 @@ public class TIntactYsj extends BaseEntity
     @Excel(name = "尺寸")
     private String deviceSize;
 
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
     /** 设计压力 */
     @Excel(name = "设计压力")
     private String desPressure;
@@ -281,6 +290,22 @@ public class TIntactYsj extends BaseEntity
         this.delFlag = delFlag;
     }
 
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+
     public Long getDelFlag()
     {
         return delFlag;

master/src/main/java/com/ruoyi/project/intact/mapper/TIntactGylMapper.java

@@ -1,7 +1,10 @@
 package com.ruoyi.project.intact.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TIntactGj;
 import com.ruoyi.project.intact.domain.TIntactGyl;
 
 /**
@@ -10,7 +13,7 @@ import com.ruoyi.project.intact.domain.TIntactGyl;
  * @author ruoyi
  * @date 2022-06-21
  */
-public interface TIntactGylMapper 
+public interface TIntactGylMapper extends BaseMapper<TIntactGyl>
 {
     /**
      * 查询设备完整性工业炉台账

master/src/main/java/com/ruoyi/project/intact/mapper/TIntactYsjMapper.java

@@ -1,7 +1,10 @@
 package com.ruoyi.project.intact.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TIntactGj;
 import com.ruoyi.project.intact.domain.TIntactYsj;
 
 /**
@@ -10,7 +13,7 @@ import com.ruoyi.project.intact.domain.TIntactYsj;
  * @author ruoyi
  * @date 2022-06-21
  */
-public interface TIntactYsjMapper 
+public interface TIntactYsjMapper extends BaseMapper<TIntactYsj>
 {
     /**
      * 查询设备完整性压缩机台账

master/src/main/java/com/ruoyi/project/intact/service/ITIntactGylService.java

@@ -1,7 +1,10 @@
 package com.ruoyi.project.intact.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.project.intact.domain.TIntactGyl;
+import com.ruoyi.project.intact.domain.TIntactPump;
 
 /**
  * 设备完整性工业炉台账Service接口
@@ -9,7 +12,7 @@ import com.ruoyi.project.intact.domain.TIntactGyl;
  * @author ruoyi
  * @date 2022-06-21
  */
-public interface ITIntactGylService 
+public interface ITIntactGylService extends IService<TIntactGyl>
 {
     /**
      * 查询设备完整性工业炉台账

master/src/main/java/com/ruoyi/project/intact/service/ITIntactYsjService.java

@@ -1,6 +1,9 @@
 package com.ruoyi.project.intact.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.intact.domain.TIntactGj;
 import com.ruoyi.project.intact.domain.TIntactYsj;
 
 /**
@@ -9,7 +12,7 @@ import com.ruoyi.project.intact.domain.TIntactYsj;
  * @author ruoyi
  * @date 2022-06-21
  */
-public interface ITIntactYsjService 
+public interface ITIntactYsjService  extends IService<TIntactYsj>
 {
     /**
      * 查询设备完整性压缩机台账

master/src/main/java/com/ruoyi/project/intact/service/impl/TIntactGylServiceImpl.java

@@ -1,6 +1,11 @@
 package com.ruoyi.project.intact.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.project.intact.domain.TIntactPump;
+import com.ruoyi.project.intact.mapper.TIntactGjMapper;
+import com.ruoyi.project.intact.mapper.TIntactPumpMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.intact.mapper.TIntactGylMapper;
@@ -14,7 +19,7 @@ import com.ruoyi.project.intact.service.ITIntactGylService;
  * @date 2022-06-21
  */
 @Service
-public class TIntactGylServiceImpl implements ITIntactGylService
+public class TIntactGylServiceImpl extends ServiceImpl<TIntactGylMapper, TIntactGyl> implements ITIntactGylService
 {
     @Autowired
     private TIntactGylMapper tIntactGylMapper;

master/src/main/java/com/ruoyi/project/intact/service/impl/TIntactYsjServiceImpl.java

@@ -1,6 +1,10 @@
 package com.ruoyi.project.intact.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.project.intact.domain.TIntactGyl;
+import com.ruoyi.project.intact.mapper.TIntactGylMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.intact.mapper.TIntactYsjMapper;
@@ -14,7 +18,7 @@ import com.ruoyi.project.intact.service.ITIntactYsjService;
  * @date 2022-06-21
  */
 @Service
-public class TIntactYsjServiceImpl implements ITIntactYsjService
+public class TIntactYsjServiceImpl extends ServiceImpl<TIntactYsjMapper, TIntactYsj> implements ITIntactYsjService
 {
     @Autowired
     private TIntactYsjMapper tIntactYsjMapper;

master/src/main/resources/processes/MyProcess.bpmn

@@ -1,167 +1,207 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
-  <process id="myProcess" name="特种设备审核" isExecutable="true">
-    <startEvent id="startevent1" name="开始" activiti:initiator="${applyUserId}"></startEvent>
-    <userTask id="wxjlTask" name="装置维修经理" activiti:assignee="#{wxjlusers}">
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1656407819069" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
+  <process id="myProcess" isClosed="false" isExecutable="true" name="特种设备审核" processType="None">
+    <startEvent activiti:initiator="${applyUserId}" id="startevent1" name="开始"/>
+    <userTask activiti:assignee="#{wxjlusers}" activiti:exclusive="true" id="wxjlTask" name="装置维修经理">
       <extensionElements>
-        <activiti:taskListener event="create" delegateExpression="${wxjlTaskCreateListener}"></activiti:taskListener>
+        <activiti:taskListener delegateExpression="${wxjlTaskCreateListener}" event="create"/>
       </extensionElements>
     </userTask>
-    <userTask id="gyzjTask" name="工艺总监" activiti:assignee="#{gyzjusers}">
+    <userTask activiti:assignee="#{gyzjusers}" activiti:exclusive="true" id="gyzjTask" name="工艺总监">
       <extensionElements>
-        <activiti:taskListener event="create" delegateExpression="${gyzjTaskCreateListener}"></activiti:taskListener>
+        <activiti:taskListener delegateExpression="${gyzjTaskCreateListener}" event="create"/>
       </extensionElements>
     </userTask>
-    <sequenceFlow id="flow1" name="开始" sourceRef="startevent1" targetRef="wxjlTask"></sequenceFlow>
+    <sequenceFlow id="flow1" name="开始" sourceRef="startevent1" targetRef="wxjlTask"/>
     <sequenceFlow id="flow7" name="不通过" sourceRef="wxjlTask" targetRef="endevent2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression">
+        <![CDATA[${condition == 0}]]>
+      </conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow9" name="不通过" sourceRef="gyzjTask" targetRef="endevent2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression">
+        <![CDATA[${condition == 0}]]>
+      </conditionExpression>
     </sequenceFlow>
     <endEvent id="endevent2" name="审核不通过">
       <extensionElements>
-        <activiti:executionListener event="start" delegateExpression="${specEndFaileListener}"></activiti:executionListener>
+        <activiti:executionListener delegateExpression="${specEndFaileListener}" event="start"/>
       </extensionElements>
     </endEvent>
     <endEvent id="endevent3" name="审核通过">
       <extensionElements>
-        <activiti:executionListener event="start" delegateExpression="${specEndSucessListener}"></activiti:executionListener>
+        <activiti:executionListener delegateExpression="${specEndSucessListener}" event="start"/>
       </extensionElements>
     </endEvent>
-    <userTask id="ctmTask" name="机械维修总监" activiti:assignee="#{ctmusers}">
+    <userTask activiti:assignee="#{ctmusers}" activiti:exclusive="true" id="ctmTask" name="机械维修总监">
       <extensionElements>
-        <activiti:taskListener event="create" delegateExpression="${ctmTaskCreateListener}"></activiti:taskListener>
+        <activiti:taskListener delegateExpression="${ctmTaskCreateListener}" event="create"/>
       </extensionElements>
     </userTask>
     <sequenceFlow id="flow4" name="通过" sourceRef="gyzjTask" targetRef="ctmTask">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression">
+        <![CDATA[${condition == 1}]]>
+      </conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow10" name="不通过" sourceRef="ctmTask" targetRef="endevent2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression">
+        <![CDATA[${condition == 0}]]>
+      </conditionExpression>
     </sequenceFlow>
-    <userTask id="gyjlTask" name="装置工艺经理" activiti:assignee="#{gyjlusers}">
+    <userTask activiti:assignee="#{gyjlusers}" activiti:exclusive="true" id="gyjlTask" name="装置工艺经理">
       <extensionElements>
-        <activiti:taskListener event="create" delegateExpression="${gyjlTaskCreateListener}"></activiti:taskListener>
+        <activiti:taskListener delegateExpression="${gyjlTaskCreateListener}" event="create"/>
       </extensionElements>
     </userTask>
-    <sequenceFlow id="flow3" name="通过" sourceRef="gyjlTask" targetRef="gyzjTask"></sequenceFlow>
+    <sequenceFlow id="flow3" name="通过" sourceRef="gyjlTask" targetRef="gyzjTask"/>
     <sequenceFlow id="flow8" name="不通过" sourceRef="gyjlTask" targetRef="endevent2">
-      <documentation>${condition == 0}</documentation>
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+      <documentation id="flow8_D_1">
+        <![CDATA[${condition == 0}]]>
+      </documentation>
+      <conditionExpression xsi:type="tFormalExpression">
+        <![CDATA[${condition == 0}]]>
+      </conditionExpression>
     </sequenceFlow>
-    <userTask id="zfhzTask" name="政府回执" activiti:assignee="#{zfusers}">
+    <userTask activiti:assignee="#{zfusers}" activiti:exclusive="true" id="zfhzTask" name="政府回执">
       <extensionElements>
-        <activiti:taskListener event="create" delegateExpression="${zfhzTaskCreateListener}"></activiti:taskListener>
+        <activiti:taskListener delegateExpression="${zfhzTaskCreateListener}" event="create"/>
       </extensionElements>
     </userTask>
     <sequenceFlow id="flow5" name="通过" sourceRef="ctmTask" targetRef="zfhzTask">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression">
+        <![CDATA[${condition == 1}]]>
+      </conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow6" name="结束" sourceRef="zfhzTask" targetRef="endevent3"></sequenceFlow>
+    <sequenceFlow id="flow6" name="结束" sourceRef="zfhzTask" targetRef="endevent3"/>
     <sequenceFlow id="flow11" name="通过" sourceRef="wxjlTask" targetRef="gyjlTask">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression">
+        <![CDATA[${condition == 1}]]>
+      </conditionExpression>
     </sequenceFlow>
   </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_myProcess">
-    <bpmndi:BPMNPlane bpmnElement="myProcess" id="BPMNPlane_myProcess">
-      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
-        <omgdc:Bounds height="50.0" width="41.0" x="80.0" y="28.0"></omgdc:Bounds>
+  <bpmndi:BPMNDiagram documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
+    <bpmndi:BPMNPlane bpmnElement="myProcess">
+      <bpmndi:BPMNShape bpmnElement="startevent1" id="Shape-startevent1">
+        <omgdc:Bounds height="32.0" width="32.0" x="80.0" y="28.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="wxjlTask" id="BPMNShape_wxjlTask">
-        <omgdc:Bounds height="55.0" width="105.0" x="180.0" y="25.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="wxjlTask" id="Shape-wxjlTask">
+        <omgdc:Bounds height="55.0" width="105.0" x="180.0" y="25.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="gyzjTask" id="BPMNShape_gyzjTask">
-        <omgdc:Bounds height="55.0" width="105.0" x="490.0" y="25.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="gyzjTask" id="Shape-gyzjTask">
+        <omgdc:Bounds height="55.0" width="105.0" x="490.0" y="25.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="endevent2" id="BPMNShape_endevent2">
-        <omgdc:Bounds height="35.0" width="35.0" x="377.0" y="150.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="endevent2" id="Shape-endevent2">
+        <omgdc:Bounds height="32.0" width="32.0" x="377.0" y="150.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="endevent3" id="BPMNShape_endevent3">
-        <omgdc:Bounds height="35.0" width="35.0" x="950.0" y="35.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="endevent3" id="Shape-endevent3">
+        <omgdc:Bounds height="32.0" width="32.0" x="950.0" y="35.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="ctmTask" id="BPMNShape_ctmTask">
-        <omgdc:Bounds height="55.0" width="105.0" x="640.0" y="25.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="ctmTask" id="Shape-ctmTask">
+        <omgdc:Bounds height="55.0" width="105.0" x="640.0" y="25.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="gyjlTask" id="BPMNShape_gyjlTask">
-        <omgdc:Bounds height="55.0" width="111.0" x="339.0" y="25.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="gyjlTask" id="Shape-gyjlTask">
+        <omgdc:Bounds height="55.0" width="111.0" x="339.0" y="25.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="55.0" width="111.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="zfhzTask" id="BPMNShape_zfhzTask">
-        <omgdc:Bounds height="55.0" width="105.0" x="796.0" y="25.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="zfhzTask" id="Shape-zfhzTask">
+        <omgdc:Bounds height="55.0" width="105.0" x="796.0" y="25.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
-        <omgdi:waypoint x="121.0" y="53.0"></omgdi:waypoint>
-        <omgdi:waypoint x="180.0" y="52.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" sourceElement="startevent1" targetElement="wxjlTask">
+        <omgdi:waypoint x="112.0" y="44.0"/>
+        <omgdi:waypoint x="180.0" y="52.5"/>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="32.0" x="129.0" y="63.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="129.0" y="63.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow7" id="BPMNEdge_flow7">
-        <omgdi:waypoint x="232.0" y="80.0"></omgdi:waypoint>
-        <omgdi:waypoint x="232.0" y="167.0"></omgdi:waypoint>
-        <omgdi:waypoint x="377.0" y="167.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3" sourceElement="gyjlTask" targetElement="gyzjTask">
+        <omgdi:waypoint x="450.0" y="52.5"/>
+        <omgdi:waypoint x="490.0" y="52.5"/>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="48.0" x="240.0" y="119.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="448.0" y="62.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow9" id="BPMNEdge_flow9">
-        <omgdi:waypoint x="542.0" y="80.0"></omgdi:waypoint>
-        <omgdi:waypoint x="542.0" y="167.0"></omgdi:waypoint>
-        <omgdi:waypoint x="412.0" y="167.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4" sourceElement="gyzjTask" targetElement="ctmTask">
+        <omgdi:waypoint x="595.0" y="52.5"/>
+        <omgdi:waypoint x="640.0" y="52.5"/>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="48.0" x="547.0" y="119.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="599.0" y="62.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
-        <omgdi:waypoint x="595.0" y="52.0"></omgdi:waypoint>
-        <omgdi:waypoint x="640.0" y="52.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5" sourceElement="ctmTask" targetElement="zfhzTask">
+        <omgdi:waypoint x="745.0" y="52.5"/>
+        <omgdi:waypoint x="796.0" y="52.5"/>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="32.0" x="599.0" y="62.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="746.0" y="62.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow10" id="BPMNEdge_flow10">
-        <omgdi:waypoint x="692.0" y="80.0"></omgdi:waypoint>
-        <omgdi:waypoint x="692.0" y="167.0"></omgdi:waypoint>
-        <omgdi:waypoint x="412.0" y="167.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6" sourceElement="zfhzTask" targetElement="endevent3">
+        <omgdi:waypoint x="901.0" y="52.5"/>
+        <omgdi:waypoint x="950.0" y="51.0"/>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="48.0" x="700.0" y="119.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="905.0" y="62.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
-        <omgdi:waypoint x="450.0" y="52.0"></omgdi:waypoint>
-        <omgdi:waypoint x="490.0" y="52.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="flow7" id="BPMNEdge_flow7" sourceElement="wxjlTask" targetElement="endevent2">
+        <omgdi:waypoint x="232.0" y="80.0"/>
+        <omgdi:waypoint x="232.0" y="167.0"/>
+        <omgdi:waypoint x="377.0312805773287" y="167.0"/>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="32.0" x="448.0" y="62.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="48.0" x="240.0" y="119.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow8" id="BPMNEdge_flow8">
-        <omgdi:waypoint x="394.0" y="80.0"></omgdi:waypoint>
-        <omgdi:waypoint x="394.0" y="150.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="flow10" id="BPMNEdge_flow10" sourceElement="ctmTask" targetElement="endevent2">
+        <omgdi:waypoint x="692.0" y="80.0"/>
+        <omgdi:waypoint x="692.0" y="167.0"/>
+        <omgdi:waypoint x="408.9687194226713" y="167.0"/>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="48.0" x="397.0" y="119.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="48.0" x="700.0" y="119.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5">
-        <omgdi:waypoint x="745.0" y="52.0"></omgdi:waypoint>
-        <omgdi:waypoint x="796.0" y="52.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="flow8" id="BPMNEdge_flow8" sourceElement="gyjlTask" targetElement="endevent2">
+        <omgdi:waypoint x="393.0" y="80.0"/>
+        <omgdi:waypoint x="393.0" y="150.0"/>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="32.0" x="746.0" y="62.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="48.0" x="397.0" y="119.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
-        <omgdi:waypoint x="901.0" y="52.0"></omgdi:waypoint>
-        <omgdi:waypoint x="950.0" y="52.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11" sourceElement="wxjlTask" targetElement="gyjlTask">
+        <omgdi:waypoint x="285.0" y="52.5"/>
+        <omgdi:waypoint x="339.0" y="52.5"/>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="32.0" x="905.0" y="62.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="285.0" y="52.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11">
-        <omgdi:waypoint x="285.0" y="52.0"></omgdi:waypoint>
-        <omgdi:waypoint x="339.0" y="52.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="flow9" id="BPMNEdge_flow9" sourceElement="gyzjTask" targetElement="endevent2">
+        <omgdi:waypoint x="542.0" y="80.0"/>
+        <omgdi:waypoint x="542.0" y="167.0"/>
+        <omgdi:waypoint x="408.9687194226713" y="167.0"/>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="32.0" x="285.0" y="52.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="48.0" x="547.0" y="119.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</definitions>
+</definitions>

master/src/main/resources/processes/intact/intactChangeApplicationProcess.bpmn

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/testm1656032909040" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1656032909040" name="" targetNamespace="http://www.activiti.org/testm1656032909040" typeLanguage="http://www.w3.org/2001/XMLSchema">
-  <process id="intactChangeApplication" isClosed="false" isExecutable="true" name="设备变更申请" processType="None">
+  <process id="intactChangeApplicationProcess" isClosed="false" isExecutable="true" name="设备变更申请" processType="None">
     <startEvent id="startEquipmentApplication" name="提交申请"/>
-    <userTask activiti:exclusive="true" id="gyzjTask" name="工艺总监"/>
+    <userTask activiti:assignee="#{gyzjusers}" activiti:exclusive="true" id="gyzjTask" name="工艺总监"/>
     <endEvent id="endevent3" name="设备变更申请已通过"/>
     <sequenceFlow id="_10" sourceRef="gyzjTask" targetRef="endevent3"/>
     <endEvent id="endevent2" name="申请未通过"/>
@@ -10,7 +10,7 @@
     <sequenceFlow id="_2" sourceRef="startEquipmentApplication" targetRef="gyzjTask"/>
   </process>
   <bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
-    <bpmndi:BPMNPlane bpmnElement="intactChangeApplication">
+    <bpmndi:BPMNPlane bpmnElement="intactChangeApplicationProcess">
       <bpmndi:BPMNShape bpmnElement="startEquipmentApplication" id="Shape-startEquipmentApplication">
         <dc:Bounds height="32.0" width="32.0" x="205.0" y="55.0"/>
         <bpmndi:BPMNLabel>

ui/src/views/approve/myapprove/index.vue

@@ -46,6 +46,7 @@
     <spec-modify v-if="specModifyDealVisible" ref="specModifyDeal" @refreshDataList="getList"></spec-modify>
     <spec-training-plan v-if="specTrainingPlanVisible" ref="specTrainingPlan" @refreshDataList="getList"></spec-training-plan>
     <spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>
+    <intact-detail v-if="intactDetailVisible" ref="intactDetail" @refreshDataList="getList"></intact-detail>
   </div>
 </template>
 
@@ -59,10 +60,11 @@
   import SpecModify from '../approveDetail/specModify-detail';
   import SpecTrainingPlan from '../approveDetail/specTrainingPlan-detaill';
   import SpecMaintenance from '../approveDetail/specMaintenance-detail';
+  import IntactDetail from '../approveDetail/intact-detail';
 
   export default {
     name: "Myapprove",
-    components: { Treeselect,ProcessImg,AddOrUpdate,SpecModify,SpecTrainingPlan,SpecMaintenance},
+    components: { Treeselect,ProcessImg,AddOrUpdate,SpecModify,SpecTrainingPlan,SpecMaintenance,IntactDetail},
     data() {
       return {
         // 遮罩层
@@ -72,6 +74,7 @@
         specModifyDealVisible: false,
         specTrainingPlanVisible: false,
         specMaintenanceVisible: false,
+        intactDetailVisible:false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -176,10 +179,19 @@
         }else if (row.processName == "设备维修审批流程") {
           this.specMaintenanceVisible = true
           this.$nextTick(() => {
-            console.log(row.taskName)
+          //  console.log(row.taskName)
+
+              console.log(row)
             this.$refs.specMaintenance.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
           })
-        }else {
+        }else if (row.processName == "设备变更申请") {
+          this.intactDetailVisible = true
+          this.$nextTick(() => {
+
+            console.log(row)
+            this.$refs.intactDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
+          })
+        } else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;
           this.infoprocessName = row.processName;

ui/src/views/approve/pending/index.vue

@@ -125,6 +125,7 @@
     <spec-modify v-if="specModifyDealVisible" ref="specModifyDeal" @refreshDataList="getList"></spec-modify>
     <spec-training-plan v-if="specTrainingPlanDealVisible" ref="specTrainingPlanDeal" @refreshDataList="getList"></spec-training-plan>
     <process-img v-if="processImgVisible" ref="processImg" @refreshDataList="getList"></process-img>
+    <intact-resolve v-if="intactResolveVisible" ref="intactResolveDeal" @refreshDataList="getList"></intact-resolve>
   </div>
 </template>
 
@@ -133,6 +134,7 @@
   import AddOrUpdate from './spec-detail';
   import SpecModify from './specModify-deal';
   import SpecTrainingPlan from './specTrainingPlan-deal';
+  import IntactResolve from '../approveDetail/intact-resolve';
   import Accident from '../approveaccidentDetail/index';
   import ProcessImg from '../processImg/index';
   import {treeselect} from "@/api/system/dept";
@@ -148,7 +150,8 @@
       SpecModify,
       Accident,
       SpecTrainingPlan,
-      ProcessImg
+      ProcessImg,
+      IntactResolve,
     },
     data() {
       return {
@@ -160,6 +163,7 @@
         specDealVisible: false,
         specModifyDealVisible: false,
         specTrainingPlanDealVisible: false,
+        intactResolveVisible:false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -355,6 +359,14 @@
             console.log(row.taskName)
             this.$refs.specModifyDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
           })
+        }else if (row.processName == "设备变更申请"){
+          this.intactResolveVisible = true
+          this.$nextTick(() => {
+
+            console.log(row)
+           
+            this.$refs.intactResolveDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
+          })
         }else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;

ui/src/views/intact/approve/index.vue

@@ -464,7 +464,7 @@
     importTemplate,
     listApprove,
     updateApprove
-  } from "@/api/intact/approve";
+  } from "@/api/intact/approve_dev";
   import {treeselect} from "@/api/system/dept";
   import {getToken} from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";

ui/src/views/intact/approve/tapprove-add.vue

@@ -215,7 +215,7 @@
           :label="$t('设计压力')+'（MPa）'">
         </el-table-column>
       </el-table>
-  
+
     </el-form-item>
       <el-form-item :label="$t('审批类型')" prop="approveType">
         <el-select v-model="dataForm.approveType" :placeholder="$t('审批类型')" @change="handleChange">
@@ -233,8 +233,8 @@
                   maxlength="200" show-word-limit
                   :autosize="{ minRows: 2, maxRows: 10}"></el-input>
       </el-form-item>
-  
-    
+
+
       <el-form-item :label="$t('工艺总监')" prop="gyzj">
         <el-select v-model="dataForm.gyzj" filterable :placeholder="$t('请选择') + $t('工艺总监')">
           <el-option
@@ -246,7 +246,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-  
+
       <template v-if="dataForm.approveType == 5">
         <el-form-item :label="$t('延期日期')" prop="delayDate">
           <el-form-item prop="endTime">
@@ -284,7 +284,7 @@
 
 <script>
   import {getToken} from "@/utils/auth";
-  import {addApprove, getApprove} from "@/api/intact/approve";
+  import {addApprove, getApprove} from "@/api/intact/approve_dev";
   import {listPostUser} from "@/api/system/user";
 
   export default {
@@ -393,8 +393,8 @@
       }).then(response => {
         this.gyzjOption = response;
       });
-  
-    
+
+
       console.log(type)
       this.getDicts("INTACT_APPROVE_TYPE").then(response => {
         this.approveOption = response.data;

ui/src/views/intact/approve/tapprove-his.vue

@@ -38,12 +38,12 @@
 </template>
 
 <script>
-import { listApprove, getApprove,listHisApprove, delApprove, addApprove, updateApprove, exportApprove, importTemplate} from "@/api/intact/approve";
+import { listApprove, getApprove,listHisApprove, delApprove, addApprove, updateApprove, exportApprove, importTemplate} from "@/api/intact/approve_dev";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import AddOrUpdate from '../../approve/approveDetail/intact_detail';
+import AddOrUpdate from '../../approve/approveDetail/intact-detail';
 import Editor from '@/components/Editor';
 
 export default {
@@ -332,12 +332,12 @@ export default {
     //操作审批流程
     detailHandle (row) {
         this.specDealVisible = true
-      
+
         this.$nextTick(() => {
           console.log(row.taskName)
-          
+
           this.$refs.specDeal.init(row.id, row.taskId, row.processId,row.taskName)
-            
+
         })
 
     },