PSSR:

-添加检修项目创建流程

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -7,15 +7,16 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.mapper.SysUserMapper;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -196,6 +197,29 @@ public class TPssrApproveController extends BaseController {
         return AjaxResult.success();
     }
 
+    public static void handleConfirmApprove(TPssrApprove approve, String userId) {
+        String processInstancesId = approve.getProcessId();
+        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+        TaskService taskService = processEngine.getTaskService();
+        Task task = processEngine.getTaskService()//获取任务service
+                .createTaskQuery()//创建查询对象
+                .taskAssignee(userId)
+                .processInstanceId(processInstancesId).singleResult();
+        ProcessInstance pi = processEngine.getRuntimeService()//表示正在执行的流程实例和执行对象
+                .createProcessInstanceQuery()//创建流程实例查询*/
+                .processInstanceId(processInstancesId)//使用流程实例ID查询
+                .singleResult();
+        String taskId = task.getId();
+
+        //处理流程节点
+        Map<String, Object> param = new HashMap<>();
+        param.put("condition", "1");
+        //认领任务
+        processEngine.getTaskService().claim(taskId, userId);
+        taskService.addComment(taskId, processInstancesId, "通过");
+        taskService.complete(taskId, param);
+    }
+
     // 检修项目审批流程发起申请
     public void do01Approve(TPssrSubcontent sub) {
         String userId = getUserId().toString();
@@ -208,12 +232,50 @@ public class TPssrApproveController extends BaseController {
         approve.setCreaterCode(userId);
         approve.setCreatedate(new Date());
         tPssrApproveService.insertTPssrApprove(approve);
+        //修改所有表的审批状态
+        TPssrOverhaulExchanger exchanger = new TPssrOverhaulExchanger();
+        exchanger.setSubId(sub.getId());
+        exchanger.setApproveStatus(1L);
+        exchanger.setUpdaterCode(userId);
+        exchanger.setUpdatedate(new Date());
+        tPssrOverhaulExchangerService.updateAllBySubId(exchanger);
+        TPssrOverhaulFilter filter = new TPssrOverhaulFilter();
+        filter.setSubId(sub.getId());
+        filter.setApproveStatus(1L);
+        filter.setUpdaterCode(userId);
+        filter.setUpdatedate(new Date());
+        tPssrOverhaulFilterService.updateAllBySubId(filter);
+        TPssrOverhaulPipe pipe = new TPssrOverhaulPipe();
+        pipe.setSubId(sub.getId());
+        pipe.setApproveStatus(1L);
+        pipe.setUpdaterCode(userId);
+        pipe.setUpdatedate(new Date());
+        tPssrOverhaulPipeService.updateAllBySubId(pipe);
+        TPssrOverhaulPump pump = new TPssrOverhaulPump();
+        pump.setSubId(sub.getId());
+        pump.setApproveStatus(1L);
+        pump.setUpdaterCode(userId);
+        pump.setUpdatedate(new Date());
+        tPssrOverhaulPumpService.updateAllBySubId(pump);
+        TPssrOverhaulTower tower = new TPssrOverhaulTower();
+        tower.setSubId(sub.getId());
+        tower.setApproveStatus(1L);
+        tower.setUpdaterCode(userId);
+        tower.setUpdatedate(new Date());
+        tPssrOverhaulTowerService.updateAllBySubId(tower);
+        TPssrOverhaulValve valve = new TPssrOverhaulValve();
+        valve.setSubId(sub.getId());
+        valve.setApproveStatus(1L);
+        valve.setUpdaterCode(userId);
+        valve.setUpdatedate(new Date());
+        tPssrOverhaulValveService.updateAllBySubId(valve);
 
         //查询所有确认人
-        TPssrOverhaulExchanger exchanger = new TPssrOverhaulExchanger();
+        exchanger = new TPssrOverhaulExchanger();
         exchanger.setSubId(sub.getId());
         TPssrOverhaulExchanger tPssrOverhaulExchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(exchanger);
         String confirmers = tPssrOverhaulExchanger.getConfirmedPerson();
+        logger.info("=======================confirmers:{}", confirmers);
         // 开始申请流程
         long businessKey = approve.getApproveId();
         //开始工作流、监听

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -6,8 +6,14 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -27,12 +33,18 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @Autowired
     private ITPssrOverhaulExchangerService tPssrOverhaulExchangerService;
 
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     /**
      * 查询检修项目-换热器列表
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulExchanger:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulExchanger tPssrOverhaulExchanger) {
+        if ("1".equals(tPssrOverhaulExchanger.getConfirmedPerson())){
+            tPssrOverhaulExchanger.setConfirmedPerson(getUserId().toString());
+        }
         startPage();
         List<TPssrOverhaulExchanger> list = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerList(tPssrOverhaulExchanger);
         return getDataTable(list);
@@ -66,6 +78,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @Log(title = "检修项目-换热器", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulExchanger tPssrOverhaulExchanger) {
+        tPssrOverhaulExchanger.setApproveStatus(0L);
         return toAjax(tPssrOverhaulExchangerService.insertTPssrOverhaulExchanger(tPssrOverhaulExchanger));
     }
 
@@ -99,6 +112,9 @@ public class TPssrOverhaulExchangerController extends BaseController {
         if (tPssrOverhaulExchanger.getIds() != null && tPssrOverhaulExchanger.getIds().length > 0) {
             for (Long id : tPssrOverhaulExchanger.getIds()) {
                 TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(id);
+                if (exchanger.getCompletionDate()==null){
+                    exchanger.setCompletionDate(new Date());
+                }
                 exchanger.setApproveStatus(2L);
                 exchanger.setUpdatedate(new Date());
                 exchanger.setUpdaterCode(String.valueOf(getUserId()));
@@ -110,26 +126,33 @@ public class TPssrOverhaulExchangerController extends BaseController {
             exchanger.setConfirmedPerson(getUserId().toString());
             exchanger.setApproveStatus(1L);
             for (TPssrOverhaulExchanger overhaulExchanger : tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerList(exchanger)) {
+                if (overhaulExchanger.getCompletionDate()==null){
+                    overhaulExchanger.setCompletionDate(new Date());
+                }
                 overhaulExchanger.setApproveStatus(2L);
                 overhaulExchanger.setUpdatedate(new Date());
                 overhaulExchanger.setUpdaterCode(String.valueOf(getUserId()));
                 tPssrOverhaulExchangerService.updateTPssrOverhaulExchanger(overhaulExchanger);
             }
         }
+        //查询当前待审批的确认人
         TPssrOverhaulExchanger entity = new TPssrOverhaulExchanger();
         entity.setSubId(tPssrOverhaulExchanger.getSubId());
         entity.setApproveStatus(1L);
         TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(entity);
         String confirmedPerson = exchanger.getConfirmedPerson();
+        logger.info("===========confirmedPerson:{}", confirmedPerson);
+        //如果当前用户还有待审批任务
         if (confirmedPerson.contains(getUserId().toString())) {
             return AjaxResult.success();
         }
-        handleApprove();
+        //无待审批任务结束当前用户流程
+        TPssrApprove approve = new TPssrApprove();
+        approve.setSubId(tPssrOverhaulExchanger.getSubId());
+        // 因为流程关系所以approve一定会有且只有一条数据
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
         return AjaxResult.success();
     }
 
-    public void handleApprove(){
-
-    }
-
 }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -1,6 +1,12 @@
 package com.ruoyi.project.pssr.controller;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +39,12 @@ public class TPssrOverhaulFilterController extends BaseController
     @Autowired
     private ITPssrOverhaulFilterService tPssrOverhaulFilterService;
 
+    @Autowired
+    private ITPssrOverhaulExchangerService tPssrOverhaulExchangerService;
+
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     /**
      * 查询检修项目-过滤器列表
      */
@@ -40,6 +52,9 @@ public class TPssrOverhaulFilterController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulFilter tPssrOverhaulFilter)
     {
+        if ("1".equals(tPssrOverhaulFilter.getRespPerson())){
+            tPssrOverhaulFilter.setRespPerson(getUserId().toString());
+        }
         startPage();
         List<TPssrOverhaulFilter> list = tPssrOverhaulFilterService.selectTPssrOverhaulFilterList(tPssrOverhaulFilter);
         return getDataTable(list);
@@ -76,6 +91,7 @@ public class TPssrOverhaulFilterController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulFilter tPssrOverhaulFilter)
     {
+        tPssrOverhaulFilter.setApproveStatus(0L);
         return toAjax(tPssrOverhaulFilterService.insertTPssrOverhaulFilter(tPssrOverhaulFilter));
     }
 
@@ -100,4 +116,54 @@ public class TPssrOverhaulFilterController extends BaseController
     {
         return toAjax(tPssrOverhaulFilterService.deleteTPssrOverhaulFilterByIds(ids));
     }
+
+    @PreAuthorize("@ss.hasPermi('pssr:overhaulFilter:edit')")
+    @Log(title = "检修项目-过滤器", businessType = BusinessType.UPDATE)
+    @PutMapping("/confirmFilter")
+    public AjaxResult confirmFilter(@RequestBody TPssrOverhaulFilter tPssrOverhaulFilter) {
+        if (tPssrOverhaulFilter.getIds() != null && tPssrOverhaulFilter.getIds().length > 0) {
+            for (Long id : tPssrOverhaulFilter.getIds()) {
+                TPssrOverhaulFilter filter = tPssrOverhaulFilterService.selectTPssrOverhaulFilterById(id);
+                if (filter.getCompletionDate()==null){
+                    filter.setCompletionDate(new Date());
+                }
+                filter.setApproveStatus(2L);
+                filter.setUpdatedate(new Date());
+                filter.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrOverhaulFilterService.updateTPssrOverhaulFilter(filter);
+            }
+        } else {
+            TPssrOverhaulFilter filter = new TPssrOverhaulFilter();
+            filter.setSubId(tPssrOverhaulFilter.getSubId());
+            filter.setRespPerson(getUserId().toString());
+            filter.setApproveStatus(1L);
+            for (TPssrOverhaulFilter overhaulFilter : tPssrOverhaulFilterService.selectTPssrOverhaulFilterList(filter)) {
+                if (overhaulFilter.getCompletionDate()==null){
+                    overhaulFilter.setCompletionDate(new Date());
+                }
+                overhaulFilter.setApproveStatus(2L);
+                overhaulFilter.setUpdatedate(new Date());
+                overhaulFilter.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrOverhaulFilterService.updateTPssrOverhaulFilter(overhaulFilter);
+            }
+        }
+        //查询当前待审批的确认人
+        TPssrOverhaulExchanger entity = new TPssrOverhaulExchanger();
+        entity.setSubId(tPssrOverhaulFilter.getSubId());
+        entity.setApproveStatus(1L);
+        TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(entity);
+        String confirmedPerson = exchanger.getConfirmedPerson();
+        logger.info("===========confirmedPerson:{}", confirmedPerson);
+        //如果当前用户还有待审批任务
+        if (confirmedPerson.contains(getUserId().toString())) {
+            return AjaxResult.success();
+        }
+        //无待审批任务结束当前用户流程
+        TPssrApprove approve = new TPssrApprove();
+        approve.setSubId(tPssrOverhaulFilter.getSubId());
+        // 因为流程关系所以approve一定会有且只有一条数据
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
+        return AjaxResult.success();
+    }
 }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.java

@@ -1,6 +1,12 @@
 package com.ruoyi.project.pssr.controller;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +39,12 @@ public class TPssrOverhaulPipeController extends BaseController
     @Autowired
     private ITPssrOverhaulPipeService tPssrOverhaulPipeService;
 
+    @Autowired
+    private ITPssrOverhaulExchangerService tPssrOverhaulExchangerService;
+
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     /**
      * 查询检修项目-管线列表
      */
@@ -40,6 +52,9 @@ public class TPssrOverhaulPipeController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulPipe tPssrOverhaulPipe)
     {
+        if ("1".equals(tPssrOverhaulPipe.getConfirmer())){
+            tPssrOverhaulPipe.setConfirmer(getUserId().toString());
+        }
         startPage();
         List<TPssrOverhaulPipe> list = tPssrOverhaulPipeService.selectTPssrOverhaulPipeList(tPssrOverhaulPipe);
         return getDataTable(list);
@@ -76,6 +91,7 @@ public class TPssrOverhaulPipeController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulPipe tPssrOverhaulPipe)
     {
+        tPssrOverhaulPipe.setApproveStatus(0L);
         return toAjax(tPssrOverhaulPipeService.insertTPssrOverhaulPipe(tPssrOverhaulPipe));
     }
 
@@ -100,4 +116,54 @@ public class TPssrOverhaulPipeController extends BaseController
     {
         return toAjax(tPssrOverhaulPipeService.deleteTPssrOverhaulPipeByIds(ids));
     }
+
+    @PreAuthorize("@ss.hasPermi('pssr:overhaulPipe:edit')")
+    @Log(title = "检修项目-管线", businessType = BusinessType.UPDATE)
+    @PutMapping("/confirmPipe")
+    public AjaxResult confirmPipe(@RequestBody TPssrOverhaulPipe tPssrOverhaulPipe) {
+        if (tPssrOverhaulPipe.getIds() != null && tPssrOverhaulPipe.getIds().length > 0) {
+            for (Long id : tPssrOverhaulPipe.getIds()) {
+                TPssrOverhaulPipe pipe = tPssrOverhaulPipeService.selectTPssrOverhaulPipeById(id);
+                if (pipe.getConfirmationDate()==null){
+                    pipe.setConfirmationDate(new Date());
+                }
+                pipe.setApproveStatus(2L);
+                pipe.setUpdatedate(new Date());
+                pipe.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrOverhaulPipeService.updateTPssrOverhaulPipe(pipe);
+            }
+        } else {
+            TPssrOverhaulPipe pipe = new TPssrOverhaulPipe();
+            pipe.setSubId(tPssrOverhaulPipe.getSubId());
+            pipe.setConfirmer(getUserId().toString());
+            pipe.setApproveStatus(1L);
+            for (TPssrOverhaulPipe overhaulPipe : tPssrOverhaulPipeService.selectTPssrOverhaulPipeList(pipe)) {
+                if (overhaulPipe.getConfirmationDate()==null){
+                    overhaulPipe.setConfirmationDate(new Date());
+                }
+                overhaulPipe.setApproveStatus(2L);
+                overhaulPipe.setUpdatedate(new Date());
+                overhaulPipe.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrOverhaulPipeService.updateTPssrOverhaulPipe(overhaulPipe);
+            }
+        }
+        //查询当前待审批的确认人
+        TPssrOverhaulExchanger entity = new TPssrOverhaulExchanger();
+        entity.setSubId(tPssrOverhaulPipe.getSubId());
+        entity.setApproveStatus(1L);
+        TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(entity);
+        String confirmedPerson = exchanger.getConfirmedPerson();
+        logger.info("===========confirmedPerson:{}", confirmedPerson);
+        //如果当前用户还有待审批任务
+        if (confirmedPerson.contains(getUserId().toString())) {
+            return AjaxResult.success();
+        }
+        //无待审批任务结束当前用户流程
+        TPssrApprove approve = new TPssrApprove();
+        approve.setSubId(tPssrOverhaulPipe.getSubId());
+        // 因为流程关系所以approve一定会有且只有一条数据
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
+        return AjaxResult.success();
+    }
 }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPumpController.java

@@ -1,6 +1,12 @@
 package com.ruoyi.project.pssr.controller;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +39,12 @@ public class TPssrOverhaulPumpController extends BaseController
     @Autowired
     private ITPssrOverhaulPumpService tPssrOverhaulPumpService;
 
+    @Autowired
+    private ITPssrOverhaulExchangerService tPssrOverhaulExchangerService;
+
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     /**
      * 查询检修项目-泵列表
      */
@@ -40,6 +52,9 @@ public class TPssrOverhaulPumpController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulPump tPssrOverhaulPump)
     {
+        if ("1".equals(tPssrOverhaulPump.getConfirmedPerson())){
+            tPssrOverhaulPump.setConfirmedPerson(getUserId().toString());
+        }
         startPage();
         List<TPssrOverhaulPump> list = tPssrOverhaulPumpService.selectTPssrOverhaulPumpList(tPssrOverhaulPump);
         return getDataTable(list);
@@ -76,6 +91,7 @@ public class TPssrOverhaulPumpController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulPump tPssrOverhaulPump)
     {
+        tPssrOverhaulPump.setApproveStatus(0L);
         return toAjax(tPssrOverhaulPumpService.insertTPssrOverhaulPump(tPssrOverhaulPump));
     }
 
@@ -100,4 +116,54 @@ public class TPssrOverhaulPumpController extends BaseController
     {
         return toAjax(tPssrOverhaulPumpService.deleteTPssrOverhaulPumpByIds(ids));
     }
+
+    @PreAuthorize("@ss.hasPermi('pssr:overhaulPump:edit')")
+    @Log(title = "检修项目-泵", businessType = BusinessType.UPDATE)
+    @PutMapping("/confirmPump")
+    public AjaxResult confirmPump(@RequestBody TPssrOverhaulPump tPssrOverhaulPump) {
+        if (tPssrOverhaulPump.getIds() != null && tPssrOverhaulPump.getIds().length > 0) {
+            for (Long id : tPssrOverhaulPump.getIds()) {
+                TPssrOverhaulPump pump = tPssrOverhaulPumpService.selectTPssrOverhaulPumpById(id);
+                if (pump.getCompletionDate()==null){
+                    pump.setCompletionDate(new Date());
+                }
+                pump.setApproveStatus(2L);
+                pump.setUpdatedate(new Date());
+                pump.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrOverhaulPumpService.updateTPssrOverhaulPump(pump);
+            }
+        } else {
+            TPssrOverhaulPump pump = new TPssrOverhaulPump();
+            pump.setSubId(tPssrOverhaulPump.getSubId());
+            pump.setConfirmedPerson(getUserId().toString());
+            pump.setApproveStatus(1L);
+            for (TPssrOverhaulPump overhaulPump : tPssrOverhaulPumpService.selectTPssrOverhaulPumpList(pump)) {
+                if (overhaulPump.getCompletionDate()==null){
+                    overhaulPump.setCompletionDate(new Date());
+                }
+                overhaulPump.setApproveStatus(2L);
+                overhaulPump.setUpdatedate(new Date());
+                overhaulPump.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrOverhaulPumpService.updateTPssrOverhaulPump(overhaulPump);
+            }
+        }
+        //查询当前待审批的确认人
+        TPssrOverhaulExchanger entity = new TPssrOverhaulExchanger();
+        entity.setSubId(tPssrOverhaulPump.getSubId());
+        entity.setApproveStatus(1L);
+        TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(entity);
+        String confirmedPerson = exchanger.getConfirmedPerson();
+        logger.info("===========confirmedPerson:{}", confirmedPerson);
+        //如果当前用户还有待审批任务
+        if (confirmedPerson.contains(getUserId().toString())) {
+            return AjaxResult.success();
+        }
+        //无待审批任务结束当前用户流程
+        TPssrApprove approve = new TPssrApprove();
+        approve.setSubId(tPssrOverhaulPump.getSubId());
+        // 因为流程关系所以approve一定会有且只有一条数据
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
+        return AjaxResult.success();
+    }
 }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -1,6 +1,12 @@
 package com.ruoyi.project.pssr.controller;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +39,12 @@ public class TPssrOverhaulTowerController extends BaseController
     @Autowired
     private ITPssrOverhaulTowerService tPssrOverhaulTowerService;
 
+    @Autowired
+    private ITPssrOverhaulExchangerService tPssrOverhaulExchangerService;
+
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     /**
      * 查询检修项目-塔罐列表
      */
@@ -40,6 +52,9 @@ public class TPssrOverhaulTowerController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulTower tPssrOverhaulTower)
     {
+        if ("1".equals(tPssrOverhaulTower.getConfirmedPerson())){
+            tPssrOverhaulTower.setConfirmedPerson(getUserId().toString());
+        }
         startPage();
         List<TPssrOverhaulTower> list = tPssrOverhaulTowerService.selectTPssrOverhaulTowerList(tPssrOverhaulTower);
         return getDataTable(list);
@@ -76,6 +91,7 @@ public class TPssrOverhaulTowerController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulTower tPssrOverhaulTower)
     {
+        tPssrOverhaulTower.setApproveStatus(0L);
         return toAjax(tPssrOverhaulTowerService.insertTPssrOverhaulTower(tPssrOverhaulTower));
     }
 
@@ -100,4 +116,54 @@ public class TPssrOverhaulTowerController extends BaseController
     {
         return toAjax(tPssrOverhaulTowerService.deleteTPssrOverhaulTowerByIds(ids));
     }
+
+    @PreAuthorize("@ss.hasPermi('pssr:overhaulTower:edit')")
+    @Log(title = "检修项目-塔罐", businessType = BusinessType.UPDATE)
+    @PutMapping("/confirmTower")
+    public AjaxResult confirmTower(@RequestBody TPssrOverhaulTower tPssrOverhaulTower) {
+        if (tPssrOverhaulTower.getIds() != null && tPssrOverhaulTower.getIds().length > 0) {
+            for (Long id : tPssrOverhaulTower.getIds()) {
+                TPssrOverhaulTower tower = tPssrOverhaulTowerService.selectTPssrOverhaulTowerById(id);
+                if (tower.getCompletionDate()==null){
+                    tower.setCompletionDate(new Date());
+                }
+                tower.setApproveStatus(2L);
+                tower.setUpdatedate(new Date());
+                tower.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrOverhaulTowerService.updateTPssrOverhaulTower(tower);
+            }
+        } else {
+            TPssrOverhaulTower tower = new TPssrOverhaulTower();
+            tower.setSubId(tPssrOverhaulTower.getSubId());
+            tower.setConfirmedPerson(getUserId().toString());
+            tower.setApproveStatus(1L);
+            for (TPssrOverhaulTower overhaulTower : tPssrOverhaulTowerService.selectTPssrOverhaulTowerList(tower)) {
+                if (overhaulTower.getCompletionDate()==null){
+                    overhaulTower.setCompletionDate(new Date());
+                }
+                overhaulTower.setApproveStatus(2L);
+                overhaulTower.setUpdatedate(new Date());
+                overhaulTower.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrOverhaulTowerService.updateTPssrOverhaulTower(overhaulTower);
+            }
+        }
+        //查询当前待审批的确认人
+        TPssrOverhaulExchanger entity = new TPssrOverhaulExchanger();
+        entity.setSubId(tPssrOverhaulTower.getSubId());
+        entity.setApproveStatus(1L);
+        TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(entity);
+        String confirmedPerson = exchanger.getConfirmedPerson();
+        logger.info("===========confirmedPerson:{}", confirmedPerson);
+        //如果当前用户还有待审批任务
+        if (confirmedPerson.contains(getUserId().toString())) {
+            return AjaxResult.success();
+        }
+        //无待审批任务结束当前用户流程
+        TPssrApprove approve = new TPssrApprove();
+        approve.setSubId(tPssrOverhaulTower.getSubId());
+        // 因为流程关系所以approve一定会有且只有一条数据
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
+        return AjaxResult.success();
+    }
 }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -1,6 +1,12 @@
 package com.ruoyi.project.pssr.controller;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +39,12 @@ public class TPssrOverhaulValveController extends BaseController
     @Autowired
     private ITPssrOverhaulValveService tPssrOverhaulValveService;
 
+    @Autowired
+    private ITPssrOverhaulExchangerService tPssrOverhaulExchangerService;
+
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     /**
      * 查询检修项目-阀门列表
      */
@@ -40,6 +52,9 @@ public class TPssrOverhaulValveController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulValve tPssrOverhaulValve)
     {
+        if ("1".equals(tPssrOverhaulValve.getIdentifyingPerson())){
+            tPssrOverhaulValve.setIdentifyingPerson(getUserId().toString());
+        }
         startPage();
         List<TPssrOverhaulValve> list = tPssrOverhaulValveService.selectTPssrOverhaulValveList(tPssrOverhaulValve);
         return getDataTable(list);
@@ -76,6 +91,7 @@ public class TPssrOverhaulValveController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulValve tPssrOverhaulValve)
     {
+        tPssrOverhaulValve.setApproveStatus(0L);
         return toAjax(tPssrOverhaulValveService.insertTPssrOverhaulValve(tPssrOverhaulValve));
     }
 
@@ -100,4 +116,54 @@ public class TPssrOverhaulValveController extends BaseController
     {
         return toAjax(tPssrOverhaulValveService.deleteTPssrOverhaulValveByIds(ids));
     }
+
+    @PreAuthorize("@ss.hasPermi('pssr:overhaulValve:edit')")
+    @Log(title = "检修项目-阀门", businessType = BusinessType.UPDATE)
+    @PutMapping("/confirmValve")
+    public AjaxResult confirmValve(@RequestBody TPssrOverhaulValve tPssrOverhaulValve) {
+        if (tPssrOverhaulValve.getIds() != null && tPssrOverhaulValve.getIds().length > 0) {
+            for (Long id : tPssrOverhaulValve.getIds()) {
+                TPssrOverhaulValve valve = tPssrOverhaulValveService.selectTPssrOverhaulValveById(id);
+                if (valve.getDoneDate()==null){
+                    valve.setDoneDate(new Date());
+                }
+                valve.setApproveStatus(2L);
+                valve.setUpdatedate(new Date());
+                valve.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrOverhaulValveService.updateTPssrOverhaulValve(valve);
+            }
+        } else {
+            TPssrOverhaulValve valve = new TPssrOverhaulValve();
+            valve.setSubId(tPssrOverhaulValve.getSubId());
+            valve.setIdentifyingPerson(getUserId().toString());
+            valve.setApproveStatus(1L);
+            for (TPssrOverhaulValve overhaulValve : tPssrOverhaulValveService.selectTPssrOverhaulValveList(valve)) {
+                if (overhaulValve.getDoneDate()==null){
+                    overhaulValve.setDoneDate(new Date());
+                }
+                overhaulValve.setApproveStatus(2L);
+                overhaulValve.setUpdatedate(new Date());
+                overhaulValve.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrOverhaulValveService.updateTPssrOverhaulValve(overhaulValve);
+            }
+        }
+        //查询当前待审批的确认人
+        TPssrOverhaulExchanger entity = new TPssrOverhaulExchanger();
+        entity.setSubId(tPssrOverhaulValve.getSubId());
+        entity.setApproveStatus(1L);
+        TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(entity);
+        String confirmedPerson = exchanger.getConfirmedPerson();
+        logger.info("===========confirmedPerson:{}", confirmedPerson);
+        //如果当前用户还有待审批任务
+        if (confirmedPerson.contains(getUserId().toString())) {
+            return AjaxResult.success();
+        }
+        //无待审批任务结束当前用户流程
+        TPssrApprove approve = new TPssrApprove();
+        approve.setSubId(tPssrOverhaulValve.getSubId());
+        // 因为流程关系所以approve一定会有且只有一条数据
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
+        return AjaxResult.success();
+    }
 }

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAboveall.java

@@ -74,6 +74,16 @@ public class TPssrAboveall extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAirtight.java

@@ -93,6 +93,16 @@ public class TPssrAirtight extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAlarm.java

@@ -60,6 +60,16 @@ public class TPssrAlarm extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAnalyzer.java

@@ -81,6 +81,16 @@ public class TPssrAnalyzer extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrApprove.java

@@ -68,6 +68,16 @@ public class TPssrApprove extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrBlind.java

@@ -150,6 +150,16 @@ public class TPssrBlind extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrCircuit.java

@@ -105,6 +105,16 @@ public class TPssrCircuit extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrCleaning.java

@@ -85,6 +85,16 @@ public class TPssrCleaning extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrContentModel.java

@@ -60,6 +60,16 @@ public class TPssrContentModel extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrFrame.java

@@ -101,6 +101,16 @@ public class TPssrFrame extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrFranklinism.java

@@ -77,6 +77,16 @@ public class TPssrFranklinism extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrGasdetector.java

@@ -81,6 +81,16 @@ public class TPssrGasdetector extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrHygiene.java

@@ -69,6 +69,16 @@ public class TPssrHygiene extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrInstrumentCalibration.java

@@ -85,6 +85,16 @@ public class TPssrInstrumentCalibration extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrInstrumentTest.java

@@ -60,6 +60,16 @@ public class TPssrInstrumentTest extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLighting.java

@@ -77,6 +77,16 @@ public class TPssrLighting extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLock.java

@@ -115,6 +115,16 @@ public class TPssrLock extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMaterial.java

@@ -77,6 +77,16 @@ public class TPssrMaterial extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMotor.java

@@ -81,6 +81,16 @@ public class TPssrMotor extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrNitrogen.java

@@ -85,6 +85,16 @@ public class TPssrNitrogen extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulExchanger.java

@@ -51,6 +51,8 @@ public class TPssrOverhaulExchanger extends BaseEntity
 
     /** 确认人 */
     @Excel(name = "确认人")
+    private String confirmedName;
+
     private String confirmedPerson;
 
     /** 删除状态 */
@@ -77,6 +79,16 @@ public class TPssrOverhaulExchanger extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")
@@ -88,6 +100,14 @@ public class TPssrOverhaulExchanger extends BaseEntity
 
     private Long ids[];
 
+    public String getConfirmedName() {
+        return confirmedName;
+    }
+
+    public void setConfirmedName(String confirmedName) {
+        this.confirmedName = confirmedName;
+    }
+
     public Long[] getIds() {
         return ids;
     }

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulFilter.java

@@ -63,6 +63,7 @@ public class TPssrOverhaulFilter extends BaseEntity
 
     /** 负责人 */
     @Excel(name = "负责人")
+    private String confirmerName;
     private String respPerson;
 
     /** 删除状态 */
@@ -89,6 +90,16 @@ public class TPssrOverhaulFilter extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")
@@ -98,6 +109,25 @@ public class TPssrOverhaulFilter extends BaseEntity
     @Excel(name = "审批状态")
     private Long approveStatus;
 
+    private Long ids[];
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
+    public String getConfirmerName() {
+        return confirmerName;
+    }
+
+    public void setConfirmedName(String confirmerName) {
+        this.confirmerName = confirmerName;
+    }
+
+
     public void setId(Long id)
     {
         this.id = id;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulPipe.java

@@ -42,6 +42,7 @@ public class TPssrOverhaulPipe extends BaseEntity
 
     /** 确认人 */
     @Excel(name = "确认人")
+    private String confirmerName;
     private String confirmer;
 
     /** 完成时间 */
@@ -73,6 +74,16 @@ public class TPssrOverhaulPipe extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")
@@ -82,6 +93,24 @@ public class TPssrOverhaulPipe extends BaseEntity
     @Excel(name = "审批状态")
     private Long approveStatus;
 
+    private Long ids[];
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
+    public String getConfirmerName() {
+        return confirmerName;
+    }
+
+    public void setConfirmerName(String confirmerName) {
+        this.confirmerName = confirmerName;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulPump.java

@@ -51,6 +51,7 @@ public class TPssrOverhaulPump extends BaseEntity
 
     /** 确认人 */
     @Excel(name = "确认人")
+    private String confirmerName;
     private String confirmedPerson;
 
     /** 删除状态 */
@@ -77,6 +78,16 @@ public class TPssrOverhaulPump extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")
@@ -86,6 +97,24 @@ public class TPssrOverhaulPump extends BaseEntity
     @Excel(name = "审批状态")
     private Long approveStatus;
 
+    private Long ids[];
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
+    public String getConfirmerName() {
+        return confirmerName;
+    }
+
+    public void setConfirmedName(String confirmerName) {
+        this.confirmerName = confirmerName;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulTower.java

@@ -51,6 +51,7 @@ public class TPssrOverhaulTower extends BaseEntity
 
     /** 确认人 */
     @Excel(name = "确认人")
+    private String confirmerName;
     private String confirmedPerson;
 
     /** 删除状态 */
@@ -77,6 +78,16 @@ public class TPssrOverhaulTower extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")
@@ -86,6 +97,24 @@ public class TPssrOverhaulTower extends BaseEntity
     @Excel(name = "审批状态")
     private Long approveStatus;
 
+    private Long ids[];
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
+    public String getConfirmerName() {
+        return confirmerName;
+    }
+
+    public void setConfirmedName(String confirmerName) {
+        this.confirmerName = confirmerName;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulValve.java

@@ -95,6 +95,7 @@ public class TPssrOverhaulValve extends BaseEntity
 
     /** 确认人 */
     @Excel(name = "确认人")
+    private String confirmerName;
     private String identifyingPerson;
 
     /** 删除状态 */
@@ -121,6 +122,16 @@ public class TPssrOverhaulValve extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")
@@ -130,6 +141,24 @@ public class TPssrOverhaulValve extends BaseEntity
     @Excel(name = "审批状态")
     private Long approveStatus;
 
+    private Long ids[];
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
+    public String getConfirmerName() {
+        return confirmerName;
+    }
+
+    public void setConfirmedName(String confirmerName) {
+        this.confirmerName = confirmerName;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPatrol.java

@@ -73,6 +73,16 @@ public class TPssrPatrol extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPipe.java

@@ -89,6 +89,16 @@ public class TPssrPipe extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrProgramme.java

@@ -64,6 +64,16 @@ public class TPssrProgramme extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrProtection.java

@@ -73,6 +73,16 @@ public class TPssrProtection extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPublic.java

@@ -69,6 +69,16 @@ public class TPssrPublic extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpCleaning.java

@@ -89,6 +89,16 @@ public class TPssrPumpCleaning extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpFill.java

@@ -89,6 +89,16 @@ public class TPssrPumpFill extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpOverhaul.java

@@ -81,6 +81,16 @@ public class TPssrPumpOverhaul extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrRegion.java

@@ -64,6 +64,16 @@ public class TPssrRegion extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBleed.java

@@ -100,6 +100,16 @@ public class TPssrSafetyBleed extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBreath.java

@@ -100,6 +100,16 @@ public class TPssrSafetyBreath extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBrust.java

@@ -100,6 +100,16 @@ public class TPssrSafetyBrust extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyFlamearrester.java

@@ -84,6 +84,16 @@ public class TPssrSafetyFlamearrester extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyValve.java

@@ -104,6 +104,16 @@ public class TPssrSafetyValve extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSubcontent.java

@@ -75,6 +75,16 @@ public class TPssrSubcontent extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrTorchvoc.java

@@ -73,6 +73,16 @@ public class TPssrTorchvoc extends BaseEntity
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
+    
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     /** 备注 */
     @Excel(name = "备注")

master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulExchangerMapper.java

@@ -46,6 +46,7 @@ public interface TPssrOverhaulExchangerMapper
      * @return 结果
      */
     public int updateTPssrOverhaulExchanger(TPssrOverhaulExchanger tPssrOverhaulExchanger);
+    public int updateAllBySubId(TPssrOverhaulExchanger tPssrOverhaulExchanger);
 
     /**
      * 删除检修项目-换热器

master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulFilterMapper.java

@@ -44,6 +44,7 @@ public interface TPssrOverhaulFilterMapper
      * @return 结果
      */
     public int updateTPssrOverhaulFilter(TPssrOverhaulFilter tPssrOverhaulFilter);
+    public int updateAllBySubId(TPssrOverhaulFilter tPssrOverhaulFilter);
 
     /**
      * 删除检修项目-过滤器

master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulPipeMapper.java

@@ -44,6 +44,7 @@ public interface TPssrOverhaulPipeMapper
      * @return 结果
      */
     public int updateTPssrOverhaulPipe(TPssrOverhaulPipe tPssrOverhaulPipe);
+    public int updateAllBySubId(TPssrOverhaulPipe tPssrOverhaulPipe);
 
     /**
      * 删除检修项目-管线

master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulPumpMapper.java

@@ -44,6 +44,7 @@ public interface TPssrOverhaulPumpMapper
      * @return 结果
      */
     public int updateTPssrOverhaulPump(TPssrOverhaulPump tPssrOverhaulPump);
+    public int updateAllBySubId(TPssrOverhaulPump tPssrOverhaulPump);
 
     /**
      * 删除检修项目-泵

master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulTowerMapper.java

@@ -44,6 +44,7 @@ public interface TPssrOverhaulTowerMapper
      * @return 结果
      */
     public int updateTPssrOverhaulTower(TPssrOverhaulTower tPssrOverhaulTower);
+    public int updateAllBySubId(TPssrOverhaulTower tPssrOverhaulTower);
 
     /**
      * 删除检修项目-塔罐

master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulValveMapper.java

@@ -44,6 +44,7 @@ public interface TPssrOverhaulValveMapper
      * @return 结果
      */
     public int updateTPssrOverhaulValve(TPssrOverhaulValve tPssrOverhaulValve);
+    public int updateAllBySubId(TPssrOverhaulValve tPssrOverhaulValve);
 
     /**
      * 删除检修项目-阀门

master/src/main/java/com/ruoyi/project/pssr/service/ITPssrOverhaulExchangerService.java

@@ -44,6 +44,7 @@ public interface ITPssrOverhaulExchangerService
      * @return 结果
      */
     public int updateTPssrOverhaulExchanger(TPssrOverhaulExchanger tPssrOverhaulExchanger);
+    public int updateAllBySubId(TPssrOverhaulExchanger tPssrOverhaulExchanger);
 
     /**
      * 批量删除检修项目-换热器

master/src/main/java/com/ruoyi/project/pssr/service/ITPssrOverhaulFilterService.java

@@ -42,6 +42,7 @@ public interface ITPssrOverhaulFilterService
      * @return 结果
      */
     public int updateTPssrOverhaulFilter(TPssrOverhaulFilter tPssrOverhaulFilter);
+    public int updateAllBySubId(TPssrOverhaulFilter tPssrOverhaulFilter);
 
     /**
      * 批量删除检修项目-过滤器

master/src/main/java/com/ruoyi/project/pssr/service/ITPssrOverhaulPipeService.java

@@ -42,6 +42,7 @@ public interface ITPssrOverhaulPipeService
      * @return 结果
      */
     public int updateTPssrOverhaulPipe(TPssrOverhaulPipe tPssrOverhaulPipe);
+    public int updateAllBySubId(TPssrOverhaulPipe tPssrOverhaulPipe);
 
     /**
      * 批量删除检修项目-管线

master/src/main/java/com/ruoyi/project/pssr/service/ITPssrOverhaulPumpService.java

@@ -42,6 +42,7 @@ public interface ITPssrOverhaulPumpService
      * @return 结果
      */
     public int updateTPssrOverhaulPump(TPssrOverhaulPump tPssrOverhaulPump);
+    public int updateAllBySubId(TPssrOverhaulPump tPssrOverhaulPump);
 
     /**
      * 批量删除检修项目-泵

master/src/main/java/com/ruoyi/project/pssr/service/ITPssrOverhaulTowerService.java

@@ -42,6 +42,7 @@ public interface ITPssrOverhaulTowerService
      * @return 结果
      */
     public int updateTPssrOverhaulTower(TPssrOverhaulTower tPssrOverhaulTower);
+    public int updateAllBySubId(TPssrOverhaulTower tPssrOverhaulTower);
 
     /**
      * 批量删除检修项目-塔罐

master/src/main/java/com/ruoyi/project/pssr/service/ITPssrOverhaulValveService.java

@@ -42,6 +42,7 @@ public interface ITPssrOverhaulValveService
      * @return 结果
      */
     public int updateTPssrOverhaulValve(TPssrOverhaulValve tPssrOverhaulValve);
+    public int updateAllBySubId(TPssrOverhaulValve tPssrOverhaulValve);
 
     /**
      * 批量删除检修项目-阀门

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrOverhaulExchangerServiceImpl.java

@@ -73,6 +73,18 @@ public class TPssrOverhaulExchangerServiceImpl implements ITPssrOverhaulExchange
         return tPssrOverhaulExchangerMapper.updateTPssrOverhaulExchanger(tPssrOverhaulExchanger);
     }
 
+    /**
+     * 修改检修项目-换热器
+     *
+     * @param tPssrOverhaulExchanger 检修项目-换热器
+     * @return 结果
+     */
+    @Override
+    public int updateAllBySubId(TPssrOverhaulExchanger tPssrOverhaulExchanger)
+    {
+        return tPssrOverhaulExchangerMapper.updateAllBySubId(tPssrOverhaulExchanger);
+    }
+
     /**
      * 批量删除检修项目-换热器
      *

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrOverhaulFilterServiceImpl.java

@@ -66,6 +66,11 @@ public class TPssrOverhaulFilterServiceImpl implements ITPssrOverhaulFilterServi
     {
         return tPssrOverhaulFilterMapper.updateTPssrOverhaulFilter(tPssrOverhaulFilter);
     }
+    @Override
+    public int updateAllBySubId(TPssrOverhaulFilter tPssrOverhaulFilter)
+    {
+        return tPssrOverhaulFilterMapper.updateAllBySubId(tPssrOverhaulFilter);
+    }
 
     /**
      * 批量删除检修项目-过滤器

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrOverhaulPipeServiceImpl.java

@@ -66,6 +66,11 @@ public class TPssrOverhaulPipeServiceImpl implements ITPssrOverhaulPipeService
     {
         return tPssrOverhaulPipeMapper.updateTPssrOverhaulPipe(tPssrOverhaulPipe);
     }
+    @Override
+    public int updateAllBySubId(TPssrOverhaulPipe tPssrOverhaulPipe)
+    {
+        return tPssrOverhaulPipeMapper.updateAllBySubId(tPssrOverhaulPipe);
+    }
 
     /**
      * 批量删除检修项目-管线

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrOverhaulPumpServiceImpl.java

@@ -66,6 +66,11 @@ public class TPssrOverhaulPumpServiceImpl implements ITPssrOverhaulPumpService
     {
         return tPssrOverhaulPumpMapper.updateTPssrOverhaulPump(tPssrOverhaulPump);
     }
+    @Override
+    public int updateAllBySubId(TPssrOverhaulPump tPssrOverhaulPump)
+    {
+        return tPssrOverhaulPumpMapper.updateAllBySubId(tPssrOverhaulPump);
+    }
 
     /**
      * 批量删除检修项目-泵

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrOverhaulTowerServiceImpl.java

@@ -66,6 +66,10 @@ public class TPssrOverhaulTowerServiceImpl implements ITPssrOverhaulTowerService
     {
         return tPssrOverhaulTowerMapper.updateTPssrOverhaulTower(tPssrOverhaulTower);
     }
+    public int updateAllBySubId(TPssrOverhaulTower tPssrOverhaulTower)
+    {
+        return tPssrOverhaulTowerMapper.updateAllBySubId(tPssrOverhaulTower);
+    }
 
     /**
      * 批量删除检修项目-塔罐

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrOverhaulValveServiceImpl.java

@@ -66,6 +66,11 @@ public class TPssrOverhaulValveServiceImpl implements ITPssrOverhaulValveService
     {
         return tPssrOverhaulValveMapper.updateTPssrOverhaulValve(tPssrOverhaulValve);
     }
+    @Override
+    public int updateAllBySubId(TPssrOverhaulValve tPssrOverhaulValve)
+    {
+        return tPssrOverhaulValveMapper.updateAllBySubId(tPssrOverhaulValve);
+    }
 
     /**
      * 批量删除检修项目-阀门

master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pidNo"    column="pid_no"    />
         <result property="completionDate"    column="completion_date"    />
         <result property="confirmedPerson"    column="confirmed_person"    />
+        <result property="confirmedName"    column="confirmed_name"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createrCode"    column="creater_code"    />
         <result property="createdate"    column="createdate"    />
@@ -26,8 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTPssrOverhaulExchangerVo">
-        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_exchanger d
+        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person,u.NICK_NAME confirmed_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_exchanger d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u on u.user_id = d.CONFIRMED_PERSON
     </sql>
 
     <select id="selectTPssrOverhaulExchangerList" parameterType="TPssrOverhaulExchanger" resultMap="TPssrOverhaulExchangerResult">
@@ -76,6 +78,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>)
     </select>
 
+    <update id="updateAllBySubId" parameterType="TPssrOverhaulExchanger">
+        update T_PSSR_OVERHAUL_EXCHANGER
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+        </trim>
+        where sub_id= #{subId} and APPROVE_STATUS=0
+    </update>
+
     <insert id="insertTPssrOverhaulExchanger" parameterType="TPssrOverhaulExchanger">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_overhaul_exchanger.NEXTVAL as id FROM DUAL

master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="flangeSize"    column="flange_size"    />
         <result property="qtyNum"    column="qty_num"    />
         <result property="completionDate"    column="completion_date"    />
+        <result property="confirmerName"    column="confirmer_name"    />
         <result property="respPerson"    column="resp_person"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createrCode"    column="creater_code"    />
@@ -29,8 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTPssrOverhaulFilterVo">
-        select d.id, d.sub_id, d.approve_id, d.plant, d.unit, d.strainer_location, d.pid_no, d.iso_dwg_no, d.flange_size, d.qty_num, d.completion_date, d.resp_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_filter d
+        select d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.plant, d.unit, d.strainer_location, d.pid_no, d.iso_dwg_no, d.flange_size, d.qty_num, d.completion_date, d.resp_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_filter d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u on u.user_id = d.resp_person
     </sql>
 
     <select id="selectTPssrOverhaulFilterList" parameterType="TPssrOverhaulFilter" resultMap="TPssrOverhaulFilterResult">
@@ -116,6 +118,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <update id="updateAllBySubId" parameterType="TPssrOverhaulFilter">
+        update t_pssr_overhaul_filter
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+        </trim>
+        where sub_id= #{subId} and APPROVE_STATUS=0
+    </update>
+
     <update id="updateTPssrOverhaulFilter" parameterType="TPssrOverhaulFilter">
         update t_pssr_overhaul_filter
         <trim prefix="SET" suffixOverrides=",">

master/src/main/resources/mybatis/pssr/TPssrOverhaulPipeMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="changeReason"    column="change_reason"    />
         <result property="pidNo"    column="pid_no"    />
         <result property="confirmer"    column="confirmer"    />
+        <result property="confirmerName"    column="confirmer_name"    />
         <result property="confirmationDate"    column="confirmation_date"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createrCode"    column="creater_code"    />
@@ -25,8 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTPssrOverhaulPipeVo">
-        select d.id, d.sub_id, d.approve_id, d.pipeline_no, d.change_reason, d.pid_no, d.confirmer, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_pipe d
+        select d.id, d.sub_id, d.approve_id, d.pipeline_no, d.change_reason, d.pid_no, d.confirmer,u.NICK_NAME confirmer_name, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_pipe d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u on u.user_id = d.confirmer
     </sql>
 
     <select id="selectTPssrOverhaulPipeList" parameterType="TPssrOverhaulPipe" resultMap="TPssrOverhaulPipeResult">
@@ -100,6 +102,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <update id="updateAllBySubId" parameterType="TPssrOverhaulPipe">
+        update t_pssr_overhaul_pipe
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+        </trim>
+        where sub_id= #{subId} and APPROVE_STATUS=0
+    </update>
+
     <update id="updateTPssrOverhaulPipe" parameterType="TPssrOverhaulPipe">
         update t_pssr_overhaul_pipe
         <trim prefix="SET" suffixOverrides=",">

master/src/main/resources/mybatis/pssr/TPssrOverhaulPumpMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pidNo"    column="pid_no"    />
         <result property="completionDate"    column="completion_date"    />
         <result property="confirmedPerson"    column="confirmed_person"    />
+        <result property="confirmerName"    column="confirmer_name"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createrCode"    column="creater_code"    />
         <result property="createdate"    column="createdate"    />
@@ -26,8 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTPssrOverhaulPumpVo">
-        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_pump d
+        select d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_pump d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u on u.user_id = d.CONFIRMED_PERSON
     </sql>
 
     <select id="selectTPssrOverhaulPumpList" parameterType="TPssrOverhaulPump" resultMap="TPssrOverhaulPumpResult">
@@ -104,6 +106,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <update id="updateAllBySubId" parameterType="TPssrOverhaulPump">
+        update t_pssr_overhaul_pump
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+        </trim>
+        where sub_id= #{subId} and APPROVE_STATUS=0
+    </update>
+
     <update id="updateTPssrOverhaulPump" parameterType="TPssrOverhaulPump">
         update t_pssr_overhaul_pump
         <trim prefix="SET" suffixOverrides=",">

master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pidNo"    column="pid_no"    />
         <result property="completionDate"    column="completion_date"    />
         <result property="confirmedPerson"    column="confirmed_person"    />
+        <result property="confirmerName"    column="confirmer_name"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createrCode"    column="creater_code"    />
         <result property="createdate"    column="createdate"    />
@@ -26,8 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTPssrOverhaulTowerVo">
-        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_tower d
+        select d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_tower d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u on u.user_id = d.CONFIRMED_PERSON
     </sql>
 
     <select id="selectTPssrOverhaulTowerList" parameterType="TPssrOverhaulTower" resultMap="TPssrOverhaulTowerResult">
@@ -104,6 +106,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <update id="updateAllBySubId" parameterType="TPssrOverhaulTower">
+        update t_pssr_overhaul_tower
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+        </trim>
+        where sub_id= #{subId} and APPROVE_STATUS=0
+    </update>
+
     <update id="updateTPssrOverhaulTower" parameterType="TPssrOverhaulTower">
         update t_pssr_overhaul_tower
         <trim prefix="SET" suffixOverrides=",">

master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pidNo"    column="pid_no"    />
         <result property="doneDate"    column="done_date"    />
         <result property="identifyingPerson"    column="identifying_person"    />
+        <result property="confirmerName"    column="confirmer_name"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createrCode"    column="creater_code"    />
         <result property="createdate"    column="createdate"    />
@@ -37,8 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTPssrOverhaulValveVo">
-        select d.id, d.sub_id, d.approve_id, d.change_type, d.connection_form, d.itp, d.construction_team, d.item, d.plant, d.valve_position, d.vavle_info_des, d.type, d.pipe_size, d.valve_class, d.quantity_required, d.fault_common, d.medium, d.pid_no, d.done_date, d.identifying_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_valve d
+        select d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.change_type, d.connection_form, d.itp, d.construction_team, d.item, d.plant, d.valve_position, d.vavle_info_des, d.type, d.pipe_size, d.valve_class, d.quantity_required, d.fault_common, d.medium, d.pid_no, d.done_date, d.identifying_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_valve d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u on u.user_id = d.identifying_person
     </sql>
 
     <select id="selectTPssrOverhaulValveList" parameterType="TPssrOverhaulValve" resultMap="TPssrOverhaulValveResult">
@@ -148,6 +150,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <update id="updateAllBySubId" parameterType="TPssrOverhaulValve">
+        update t_pssr_overhaul_valve
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+        </trim>
+        where sub_id= #{subId} and APPROVE_STATUS=0
+    </update>
+
     <update id="updateTPssrOverhaulValve" parameterType="TPssrOverhaulValve">
         update t_pssr_overhaul_valve
         <trim prefix="SET" suffixOverrides=",">

master/src/main/resources/processes/pssr/pssr1confirm.bpmn

@@ -2,24 +2,22 @@
 <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="pssr1confirm" name="PSSR单确认人确认流程" isExecutable="true">
     <startEvent id="applyUser" name="Start" activiti:initiator="${applyUser}"></startEvent>
-    <sequenceFlow id="flow1" sourceRef="applyUser" targetRef="confirmUser">
-    </sequenceFlow>
+    <sequenceFlow id="flow1" sourceRef="applyUser" targetRef="confirmUser"></sequenceFlow>
     <userTask id="chargePerson" name="检查内容负责人" activiti:assignee="#{chargePerson}"></userTask>
 
-    <userTask id="confirmUser" name="确认人">
+    <userTask id="confirmUser" name="确认人" activiti:assignee="${confirmUser}">
         <extensionElements>
             <!-- 定义多实例任务，使用集合变量 confirmUsers 动态生成 -->
             <activiti:multiInstanceLoopCharacteristics isSequential="false" activiti:collection="confirmUsers" activiti:elementVariable="confirmUser">
                 <completionCondition>${nrOfCompletedInstances == nrOfInstances}</completionCondition>
             </activiti:multiInstanceLoopCharacteristics>
 
-            <!-- 动态将任务分配给 confirmUser -->
-            <activiti:assignee>${confirmUser}</activiti:assignee>
         </extensionElements>
     </userTask>
 
 
     <sequenceFlow id="flow2" sourceRef="confirmUser" targetRef="chargePerson">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow3" sourceRef="chargePerson" targetRef="confirmUser">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
@@ -28,21 +26,38 @@
     <sequenceFlow id="flow4" sourceRef="chargePerson" targetRef="endevent1">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
+    <userTask id="stoped" name="流程挂起"></userTask>
+    <sequenceFlow id="flow5" sourceRef="chargePerson" targetRef="stoped">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+    </sequenceFlow>
+    <endEvent id="endevent2" name="End"></endEvent>
+    <sequenceFlow id="flow6" sourceRef="stoped" targetRef="endevent2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow7" sourceRef="stoped" targetRef="confirmUser">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_pssr1confirm">
     <bpmndi:BPMNPlane bpmnElement="pssr1confirm" id="BPMNPlane_pssr1confirm">
       <bpmndi:BPMNShape bpmnElement="applyUser" id="BPMNShape_applyUser">
         <omgdc:Bounds height="35.0" width="35.0" x="160.0" y="250.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="confirmUser" id="BPMNShape_confirmUser">
-        <omgdc:Bounds height="55.0" width="105.0" x="240.0" y="240.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="chargePerson" id="BPMNShape_chargePerson">
         <omgdc:Bounds height="55.0" width="105.0" x="390.0" y="240.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="confirmUser" id="BPMNShape_confirmUser">
+        <omgdc:Bounds height="55.0" width="105.0" x="240.0" y="240.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
         <omgdc:Bounds height="35.0" width="35.0" x="540.0" y="250.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="stoped" id="BPMNShape_stoped">
+        <omgdc:Bounds height="55.0" width="105.0" x="540.0" y="240.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent2" id="BPMNShape_endevent2">
+        <omgdc:Bounds height="35.0" width="35.0" x="690.0" y="250.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
         <omgdi:waypoint x="195.0" y="267.0"></omgdi:waypoint>
         <omgdi:waypoint x="240.0" y="267.0"></omgdi:waypoint>
@@ -62,6 +77,21 @@
         <omgdi:waypoint x="495.0" y="267.0"></omgdi:waypoint>
         <omgdi:waypoint x="540.0" y="267.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5">
+        <omgdi:waypoint x="495.0" y="267.0"></omgdi:waypoint>
+        <omgdi:waypoint x="540.0" y="267.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
+        <omgdi:waypoint x="645.0" y="267.0"></omgdi:waypoint>
+        <omgdi:waypoint x="690.0" y="267.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow7" id="BPMNEdge_flow7">
+        <omgdi:waypoint x="592.0" y="240.0"></omgdi:waypoint>
+        <omgdi:waypoint x="592.0" y="187.0"></omgdi:waypoint>
+        <omgdi:waypoint x="442.0" y="187.0"></omgdi:waypoint>
+        <omgdi:waypoint x="292.0" y="187.0"></omgdi:waypoint>
+        <omgdi:waypoint x="292.0" y="240.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>

ui/src/api/pssr/overhaulExchanger.js

@@ -35,6 +35,15 @@ export function updateOverhaulExchanger(data) {
   })
 }
 
+// 确认检修项目-换热器
+export function handleConfirmApprove(data) {
+  return request({
+    url: '/pssr/overhaulExchanger/confirmExchanger',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除检修项目-换热器
 export function delOverhaulExchanger(id) {
   return request({
@@ -50,4 +59,4 @@ export function exportOverhaulExchanger(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/api/pssr/overhaulFilter.js

@@ -35,6 +35,15 @@ export function updateOverhaulFilter(data) {
   })
 }
 
+// 确认检修项目-过滤器
+export function handleConfirmApprove(data) {
+  return request({
+    url: '/pssr/overhaulFilter/confirmFilter',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除检修项目-过滤器
 export function delOverhaulFilter(id) {
   return request({
@@ -50,4 +59,4 @@ export function exportOverhaulFilter(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/api/pssr/overhaulPipe.js

@@ -35,6 +35,15 @@ export function updateOverhaulPipe(data) {
   })
 }
 
+// 确认检修项目-管线
+export function handleConfirmApprove(data) {
+  return request({
+    url: '/pssr/overhaulPipe/confirmPipe',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除检修项目-管线
 export function delOverhaulPipe(id) {
   return request({
@@ -50,4 +59,4 @@ export function exportOverhaulPipe(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/api/pssr/overhaulPump.js

@@ -35,6 +35,15 @@ export function updateOverhaulPump(data) {
   })
 }
 
+// 确认检修项目-泵
+export function handleConfirmApprove(data) {
+  return request({
+    url: '/pssr/overhaulPump/confirmPump',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除检修项目-泵
 export function delOverhaulPump(id) {
   return request({
@@ -50,4 +59,4 @@ export function exportOverhaulPump(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/api/pssr/overhaulTower.js

@@ -35,6 +35,15 @@ export function updateOverhaulTower(data) {
   })
 }
 
+// 确认检修项目-塔罐
+export function handleConfirmApprove(data) {
+  return request({
+    url: '/pssr/overhaulTower/confirmTower',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除检修项目-塔罐
 export function delOverhaulTower(id) {
   return request({
@@ -50,4 +59,4 @@ export function exportOverhaulTower(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/api/pssr/overhaulValve.js

@@ -35,6 +35,15 @@ export function updateOverhaulValve(data) {
   })
 }
 
+// 确认检修项目-管线
+export function handleConfirmApprove(data) {
+  return request({
+    url: '/pssr/overhaulValve/confirmValve',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除检修项目-阀门
 export function delOverhaulValve(id) {
   return request({
@@ -50,4 +59,4 @@ export function exportOverhaulValve(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/views/approve/approveDetail/pssrApprove-detail.vue

@@ -4,11 +4,11 @@
              :visible.sync="visible"
              :append-to-body="true"
              width="60%">
-    <Subitem :sub-id="Number(subId)" :serial-number="sn" :is-approve="Number((taskForm.taskId == '')?2:1)" />
+    <Subitem :sub-id="Number(subId)" :serial-number="sn" :is-approve="isApprove"/>
     <span slot="footer" class="dialog-footer">
-      <el-button v-if="!this.taskForm.taskId == ''" type="primary"
+      <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2" type="primary"
                  @click="dataFormSubmit(1)" :disabled="submitDisabled">通过</el-button>
-      <el-button v-if="!this.taskForm.taskId == ''" type="danger"
+      <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2" type="danger"
                  @click="dataFormSubmit(0)" :disabled="submitDisabled">驳回</el-button>
       <el-button @click="visible = false">{{ $t('返回') }}</el-button>
     </span>
@@ -41,6 +41,7 @@ export default {
     return {
       //label样式
       labelStyle: {'width': '200px'},
+      isApprove: 1,//0-显示新增等按钮；1-确认人查询（我的待办）；2-28项负责人查询（我的待办）；3-无按钮；
       //流转列表
       historyList: [],
       historyLoading: true,
@@ -48,10 +49,11 @@ export default {
       taskName: '',
       visible: false,
       subId: null,
-      sn: null,
+      sn: '',
       taskForm: {
         comment: '',
         taskId: '',
+        taskName: '',
         businessKey: '',
         tPssrApprove: {}
       },
@@ -64,11 +66,21 @@ export default {
   },
   methods: {
     init(id, taskId, processId, taskName) {
-      this.subId = id;
       getSubcontent(id).then(res => {
+        if (taskName=='检查内容负责人'){
+          this.isApprove=2;
+        }
+        console.log(res)
         this.sn = res.data.serialNumber
+        this.subId = id;
+        this.taskForm.taskId = taskId
+        this.taskForm.taskName = taskName
+        if (this.taskForm.taskId==''){
+          this.isApprove=3;
+        }
+        console.log(this.sn)
+        this.visible = true;
       })
-      this.visible = true;
       getHistorylist({processId: processId}).then(response => {
         this.historyList = response.rows;
         this.historyLoading = false

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

@@ -456,7 +456,7 @@
         }  else if (row.processName == "PSSR单确认人确认流程") {
           this.pssrApproveDetailVisible = true
           this.$nextTick(() => {
-            this.$refs.pssrApproveDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
+            this.$refs.pssrApproveDetail.init(row.approveObject.subId, row.taskId, row.processId, row.taskName)
           })
         } else {
           this.approveInfo = row;

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

@@ -291,7 +291,7 @@
         } else if (row.processName == "PSSR单确认人确认流程") {
           this.pssrApproveDetailVisible = true
           this.$nextTick(() => {
-            this.$refs.pssrApproveDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
+            this.$refs.pssrApproveDetail.init(row.approveObject.subId, row.taskId, row.processId, row.taskName)
           })
         } else {
           this.approveInfo = row;

ui/src/views/pssr/overhaulExchanger/index.vue

@@ -58,6 +58,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulExchanger:add']"
         >新增
         </el-button>
@@ -69,6 +70,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulExchanger:edit']"
         >修改
         </el-button>
@@ -80,6 +82,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulExchanger:remove']"
         >删除
         </el-button>
@@ -90,6 +93,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulExchanger:edit']"
         >导入
         </el-button>
@@ -100,6 +104,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulExchanger:export']"
         >导出
         </el-button>
@@ -110,8 +115,20 @@
           icon="el-icon-s-promotion"
           size="mini"
           @click="handleApprove"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulExchanger:edit']"
-        >确认内容
+        >发起审批
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-check"
+          size="mini"
+          v-if="isApprove==1"
+          @click="handleConfirmApprove"
+          v-hasPermi="['pssr:overhaulExchanger:edit']"
+        >确认
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -121,7 +138,8 @@
     </div>
     <el-table v-loading="loading" :data="overhaulExchangerList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="位号/管线号" align="center" prop="tagNo" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
       <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
@@ -131,9 +149,10 @@
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认人" align="center" prop="confirmedPerson" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人" align="center" prop="confirmedName" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right"
+                       v-if="isApprove==0" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -245,6 +264,7 @@ import {
   delOverhaulExchanger,
   exportOverhaulExchanger,
   getOverhaulExchanger,
+  handleConfirmApprove,
   importTemplate,
   listOverhaulExchanger,
   updateOverhaulExchanger
@@ -352,6 +372,9 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 250
     })
+    if (this.isApprove != 0) {
+      this.queryParams.confirmedPerson = 1;
+    }
     this.getList();
     this.getTreeselect();
     listUserNoPage({}).then(res => {
@@ -368,6 +391,20 @@ export default {
     })
   },
   methods: {
+    checkSelectable(row) {
+      console.log(this.isApprove)
+      return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0
+    },
+    handleConfirmApprove() {
+      let data = {
+        ids: this.ids,
+        subId: this.subId,
+      }
+      handleConfirmApprove(data).then(res => {
+        this.msgSuccess("确认成功");
+        this.getList()
+      })
+    },
     /** 查询检修项目-换热器列表 */
     getList() {
       this.loading = true;
@@ -491,9 +528,9 @@ export default {
     },
     /** 确认按钮操作*/
     handleApprove() {
-     doApprove(this.subId).then(res=>{
-       this.msgSuccess("已发起确认流程");
-     })
+      doApprove(this.subId).then(res => {
+        this.msgSuccess("已发起确认流程");
+      })
     },
     /** 导入按钮操作 */
     handleImport() {

ui/src/views/pssr/overhaulFilter/index.vue

@@ -41,6 +41,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulFilter:add']"
         >新增
         </el-button>
@@ -52,6 +53,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulFilter:edit']"
         >修改
         </el-button>
@@ -63,6 +65,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulFilter:remove']"
         >删除
         </el-button>
@@ -73,6 +76,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulFilter:edit']"
         >导入
         </el-button>
@@ -83,6 +87,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulFilter:export']"
         >导出
         </el-button>
@@ -94,8 +99,20 @@
           size="mini"
           :disabled="subStatus!=0"
           @click="handleApprove"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulFilter:edit']"
-        >确认内容
+        >发起审批
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-check"
+          size="mini"
+          v-if="isApprove==1"
+          @click="handleConfirmApprove"
+          v-hasPermi="['pssr:overhaulFilter:edit']"
+        >确认
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -105,7 +122,8 @@
     </div>
     <el-table v-loading="loading" :data="overhaulFilterList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="装置" align="center" prop="plant" :show-overflow-tooltip="true"/>
       <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="过滤网位置" align="center" prop="strainerLocation" :show-overflow-tooltip="true"/>
@@ -118,9 +136,10 @@
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="负责人" align="center" prop="respPerson" :show-overflow-tooltip="true"/>
+      <el-table-column label="负责人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right"
+                       v-if="isApprove==0" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -254,6 +273,7 @@ import {
   delOverhaulFilter,
   exportOverhaulFilter,
   getOverhaulFilter,
+  handleConfirmApprove,
   importTemplate,
   listOverhaulFilter,
   updateOverhaulFilter
@@ -267,6 +287,7 @@ import {getSubcontent} from "@/api/pssr/subcontent";
 import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
 
+
 export default {
   name: "OverhaulFilter",
   components: {Treeselect},
@@ -351,23 +372,23 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        plant:[
-          {required:true,message:"区域不得为空",trigger:"blur"}
+        plant: [
+          {required: true, message: "区域不得为空", trigger: "blur"}
         ],
-        strainerLocation:[
-          {required:true,message:"过滤网位置不得为空",trigger:"blur"}
+        strainerLocation: [
+          {required: true, message: "过滤网位置不得为空", trigger: "blur"}
         ],
-        pidNo:[
-          {required:true,message:"图号不得为空",trigger:"blur"}
+        pidNo: [
+          {required: true, message: "图号不得为空", trigger: "blur"}
         ],
-        isoDwgNo:[
-          {required:true,message:"管线号不得为空",trigger:"blur"}
+        isoDwgNo: [
+          {required: true, message: "管线号不得为空", trigger: "blur"}
         ],
-        flangeSize:[
-          {required:true,message:"法兰尺寸不得为空",trigger:"blur"}
+        flangeSize: [
+          {required: true, message: "法兰尺寸不得为空", trigger: "blur"}
         ],
-        qtyNum:[
-          {required:true,message:"QTY数量不得为空",trigger:"blur"}
+        qtyNum: [
+          {required: true, message: "QTY数量不得为空", trigger: "blur"}
         ],
       }
     };
@@ -383,6 +404,9 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 320
     })
+    if (this.isApprove != 0) {
+      this.queryParams.respPerson = 1;
+    }
     this.getList();
     this.getTreeselect();
     listUserNoPage({}).then(res => {
@@ -399,6 +423,20 @@ export default {
     })
   },
   methods: {
+    checkSelectable(row) {
+      console.log(this.isApprove)
+      return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0
+    },
+    handleConfirmApprove() {
+      let data = {
+        ids: this.ids,
+        subId: this.subId,
+      }
+      handleConfirmApprove(data).then(res => {
+        this.msgSuccess("确认成功");
+        this.getList()
+      })
+    },
     /** 查询检修项目-过滤器列表 */
     getList() {
       this.loading = true;
@@ -553,7 +591,7 @@ export default {
 
     /** 确认按钮操作*/
     handleApprove() {
-      doApprove(this.subId).then(res=>{
+      doApprove(this.subId).then(res => {
         this.msgSuccess("已发起确认流程");
       })
     },

ui/src/views/pssr/overhaulPipe/index.vue

@@ -92,7 +92,7 @@
           v-if="isApprove==0"
           @click="handleApprove"
           v-hasPermi="['pssr:overhaulPipe:edit']"
-        >发起申请
+        >发起审批
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -101,7 +101,7 @@
           icon="el-icon-check"
           size="mini"
           v-if="isApprove==1"
-          @click=""
+          @click="handleConfirmApprove"
           v-hasPermi="['pssr:overhaulPipe:edit']"
         >确认
         </el-button>
@@ -113,11 +113,12 @@
     </div>
     <el-table v-loading="loading" :data="overhaulPipeList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="管线号" align="center" prop="pipelineNo" :show-overflow-tooltip="true"/>
       <el-table-column label="更换原因" align="center" prop="changeReason" :show-overflow-tooltip="true"/>
       <el-table-column label="P&ID图号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人" align="center" prop="confirmer" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
       <el-table-column label="完成时间" align="center" prop="confirmationDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
@@ -234,6 +235,7 @@ import {
   delOverhaulPipe,
   exportOverhaulPipe,
   getOverhaulPipe,
+  handleConfirmApprove,
   importTemplate,
   listOverhaulPipe,
   updateOverhaulPipe
@@ -247,6 +249,7 @@ import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
 import {getSubcontent} from "@/api/pssr/subcontent";
 
+
 export default {
   name: "OverhaulPipe",
   components: {Treeselect},
@@ -340,6 +343,9 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 250
     })
+    if (this.isApprove != 0) {
+      this.queryParams.confirmer = 1;
+    }
     this.getList();
     this.getTreeselect();
     listUserNoPage({}).then(res => {
@@ -356,6 +362,20 @@ export default {
     })
   },
   methods: {
+    checkSelectable(row) {
+      console.log(this.isApprove)
+      return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0
+    },
+    handleConfirmApprove() {
+      let data = {
+        ids: this.ids,
+        subId: this.subId,
+      }
+      handleConfirmApprove(data).then(res => {
+        this.msgSuccess("确认成功");
+        this.getList()
+      })
+    },
     /** 查询检修项目-管线列表 */
     getList() {
       this.loading = true;

ui/src/views/pssr/overhaulPump/index.vue

@@ -41,6 +41,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulPump:add']"
         >新增
         </el-button>
@@ -52,6 +53,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulPump:edit']"
         >修改
         </el-button>
@@ -63,6 +65,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulPump:remove']"
         >删除
         </el-button>
@@ -73,6 +76,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulPump:edit']"
         >导入
         </el-button>
@@ -83,6 +87,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulPump:export']"
         >导出
         </el-button>
@@ -94,8 +99,20 @@
           size="mini"
           :disabled="subStatus!=0"
           @click="handleApprove"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulPump:edit']"
-        >确认内容
+        >发起审批
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-check"
+          size="mini"
+          v-if="isApprove==1"
+          @click="handleConfirmApprove"
+          v-hasPermi="['pssr:overhaulPump:edit']"
+        >确认
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -105,19 +122,21 @@
     </div>
     <el-table v-loading="loading" :data="overhaulPumpList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="位号/管线号" align="center" prop="tagNo" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
       <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
       <el-table-column label="图号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人" align="center" prop="confirmedPerson" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
       <el-table-column label="完成日期" align="center" prop="completionDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
+                       class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -229,6 +248,7 @@ import {
   delOverhaulPump,
   exportOverhaulPump,
   getOverhaulPump,
+  handleConfirmApprove,
   importTemplate,
   listOverhaulPump,
   updateOverhaulPump
@@ -242,6 +262,7 @@ import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
 import {getSubcontent} from "@/api/pssr/subcontent";
 
+
 export default {
   name: "OverhaulPump",
   components: {Treeselect},
@@ -336,6 +357,9 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 250
     })
+    if (this.isApprove != 0) {
+      this.queryParams.confirmedPerson = 1;
+    }
     this.getList();
     this.getTreeselect();
     listUserNoPage({}).then(res => {
@@ -352,6 +376,20 @@ export default {
     })
   },
   methods: {
+    checkSelectable(row) {
+      console.log(this.isApprove)
+      return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0
+    },
+    handleConfirmApprove() {
+      let data = {
+        ids: this.ids,
+        subId: this.subId,
+      }
+      handleConfirmApprove(data).then(res => {
+        this.msgSuccess("确认成功");
+        this.getList()
+      })
+    },
     /** 查询检修项目-泵列表 */
     getList() {
       this.loading = true;
@@ -503,7 +541,7 @@ export default {
 
     /** 确认按钮操作*/
     handleApprove() {
-      doApprove(this.subId).then(res=>{
+      doApprove(this.subId).then(res => {
         this.msgSuccess("已发起确认流程");
       })
     },

ui/src/views/pssr/overhaulTower/index.vue

@@ -42,6 +42,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulTower:add']"
         >新增
         </el-button>
@@ -53,6 +54,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulTower:edit']"
         >修改
         </el-button>
@@ -64,6 +66,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulTower:remove']"
         >删除
         </el-button>
@@ -74,6 +77,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulTower:edit']"
         >导入
         </el-button>
@@ -84,6 +88,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulTower:export']"
         >导出
         </el-button>
@@ -95,8 +100,20 @@
           size="mini"
           :disabled="subStatus!=0"
           @click="handleApprove"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulTower:edit']"
-        >确认内容
+        >发起审批
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-check"
+          size="mini"
+          v-if="isApprove==1"
+          @click="handleConfirmApprove"
+          v-hasPermi="['pssr:overhaulTower:edit']"
+        >确认
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -107,7 +124,8 @@
     </div>
     <el-table v-loading="loading" :data="overhaulTowerList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="位号/管线号" align="center" prop="tagNo" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
       <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
@@ -117,9 +135,10 @@
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认人" align="center" prop="confirmedPerson" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
+                       class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -231,6 +250,7 @@ import {
   delOverhaulTower,
   exportOverhaulTower,
   getOverhaulTower,
+  handleConfirmApprove,
   importTemplate,
   listOverhaulTower,
   updateOverhaulTower
@@ -244,6 +264,7 @@ import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
 import {getSubcontent} from "@/api/pssr/subcontent";
 
+
 export default {
   name: "OverhaulTower",
   components: {Treeselect},
@@ -338,6 +359,9 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 250
     })
+    if (this.isApprove != 0) {
+      this.queryParams.confirmedPerson = 1;
+    }
     this.getList();
     this.getTreeselect();
     listUserNoPage({}).then(res => {
@@ -354,6 +378,20 @@ export default {
     })
   },
   methods: {
+    checkSelectable(row) {
+      console.log(this.isApprove)
+      return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0
+    },
+    handleConfirmApprove() {
+      let data = {
+        ids: this.ids,
+        subId: this.subId,
+      }
+      handleConfirmApprove(data).then(res => {
+        this.msgSuccess("确认成功");
+        this.getList()
+      })
+    },
     /** 查询检修项目-塔罐列表 */
     getList() {
       this.loading = true;
@@ -505,7 +543,7 @@ export default {
 
     /** 确认按钮操作*/
     handleApprove() {
-      doApprove(this.subId).then(res=>{
+      doApprove(this.subId).then(res => {
         this.msgSuccess("已发起确认流程");
       })
     },

ui/src/views/pssr/overhaulValve/index.vue

@@ -39,6 +39,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulValve:add']"
         >新增
         </el-button>
@@ -50,6 +51,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulValve:edit']"
         >修改
         </el-button>
@@ -61,6 +63,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulValve:remove']"
         >删除
         </el-button>
@@ -71,6 +74,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulValve:edit']"
         >导入
         </el-button>
@@ -81,6 +85,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulValve:export']"
         >导出
         </el-button>
@@ -92,8 +97,20 @@
           size="mini"
           :disabled="subStatus!=0"
           @click="handleApprove"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulValve:edit']"
-        >确认内容
+        >发起审批
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-check"
+          size="mini"
+          v-if="isApprove==1"
+          @click="handleConfirmApprove"
+          v-hasPermi="['pssr:overhaulValve:edit']"
+        >确认
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -104,7 +121,8 @@
     </div>
     <el-table v-loading="loading" :data="overhaulValveList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="升级改型更换/更换/维修" align="center" prop="changeType" :show-overflow-tooltip="true"
                        width="180"/>
       <el-table-column label="连接形式" align="center" prop="connectionForm" :show-overflow-tooltip="true" width="180"/>
@@ -129,10 +147,11 @@
           <span>{{ parseTime(scope.row.doneDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认人" align="center" prop="identifyingPerson" :show-overflow-tooltip="true"
+      <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"
                        width="180"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
+                       class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -283,6 +302,7 @@ import {
   delOverhaulValve,
   exportOverhaulValve,
   getOverhaulValve,
+  handleConfirmApprove,
   importTemplate,
   listOverhaulValve,
   updateOverhaulValve
@@ -401,6 +421,9 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 250
     })
+    if (this.isApprove != 0) {
+      this.queryParams.identifyingPerson = 1;
+    }
     this.getList();
     this.getTreeselect();
     listUserNoPage({}).then(res => {
@@ -417,6 +440,20 @@ export default {
     })
   },
   methods: {
+    checkSelectable(row) {
+      console.log(this.isApprove)
+      return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0
+    },
+    handleConfirmApprove() {
+      let data = {
+        ids: this.ids,
+        subId: this.subId,
+      }
+      handleConfirmApprove(data).then(res => {
+        this.msgSuccess("确认成功");
+        this.getList()
+      })
+    },
     /** 查询检修项目-阀门列表 */
     getList() {
       this.loading = true;
@@ -579,7 +616,7 @@ export default {
 
     /** 确认按钮操作*/
     handleApprove() {
-      doApprove(this.subId).then(res=>{
+      doApprove(this.subId).then(res => {
         this.msgSuccess("已发起确认流程");
       })
     },

ui/src/views/pssr/subitem/index.vue

@@ -1,133 +1,133 @@
 <template>
   <div class="app-container">
-    <div v-if="serialNumber=='01'">
+    <div v-if="sn=='01'">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="管道" name="first">
-          <overhaul-pipe :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <overhaul-pipe :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="泵" name="second">
-          <overhaul-pump :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <overhaul-pump :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="换热器" name="third">
-          <overhaul-exchanger :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="塔罐" name="fourth">
-          <overhaul-tower :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <overhaul-tower :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="阀门" name="fifth">
-          <overhaul-valve :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <overhaul-valve :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="过滤器" name="sixth">
-          <overhaul-filter :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <overhaul-filter :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div v-if="serialNumber=='02'">
-      <programme :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='02'">
+      <programme :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='03'">
-      <blind :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='03'">
+      <blind :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='04'">
-      <airtight :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='04'">
+      <airtight :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='05'">
-      <protection :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='05'">
+      <protection :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='06'">
+    <div v-if="sn=='06'">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="安全阀" name="first">
-          <safety-valve :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <safety-valve :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="爆破片" name="second">
-          <safety-brust :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <safety-brust :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="呼吸阀" name="third">
-          <safety-breath :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <safety-breath :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="泄放阀" name="fourth">
-          <safety-bleed :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <safety-bleed :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="阻火器" name="fifth">
-          <safety-flamearrester :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <safety-flamearrester :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div v-if="serialNumber=='07'">
-      <public :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='07'">
+      <public :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='08'">
-      <material :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='08'">
+      <material :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='09'">
-      <hygiene :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='09'">
+      <hygiene :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='10'">
-      <cleaning :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='10'">
+      <cleaning :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='11'">
-      <circuit :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='11'">
+      <circuit :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='12'">
-      <patrol :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='12'">
+      <patrol :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='13'">
-      <patrol :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='13'">
+      <patrol :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='14'">
-      <torchvoc :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='14'">
+      <torchvoc :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='15'">
-      <patrol :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='15'">
+      <patrol :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='16'">
-      <nitrogen :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='16'">
+      <nitrogen :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='17'">
-      <lock :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='17'">
+      <lock :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='18'">
+    <div v-if="sn=='18'">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="机泵过滤器清理工作清单" name="first">
-          <pump-cleaning :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <pump-cleaning :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="机泵检修完成确认清单" name="second">
-          <pump-overhaul :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <pump-overhaul :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="机泵润滑油加注确认清单" name="third">
-          <pump-fill :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+          <pump-fill :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div v-if="serialNumber=='19'">
-      <frame :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='19'">
+      <frame :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='20'">
-      <pipe :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='20'">
+      <pipe :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='21'">
-      <instrument-calibration :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='21'">
+      <instrument-calibration :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='22'">
-      <instrument-test :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='22'">
+      <instrument-test :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='23'">
-      <alarm :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='23'">
+      <alarm :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='24'">
-      <gasdetector :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='24'">
+      <gasdetector :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='25'">
-      <lighting :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='25'">
+      <lighting :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='26'">
-      <motor :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='26'">
+      <motor :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='27'">
-      <franklinism :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='27'">
+      <franklinism :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
-    <div v-if="serialNumber=='28'">
-      <analyzer :sub-id="Number(subId)" :is-approve="Number(isApprove)"/>
+    <div v-if="sn=='28'">
+      <analyzer :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
   </div>
 </template>
@@ -223,19 +223,27 @@ export default {
     return {
       // 默认第一个Tab
       activeName: 'first',
+      si: null,
+      sn: '',
     }
   },
   created() {
+    console.log(this.subId)
+    console.log(this.serialNumber)
     const id = this.$route.params.subId
     const serialNumber = this.$route.params.serialNumber
     console.log(id)
     console.log(serialNumber)
     console.log(this.$route)
     if (typeof id !== 'undefined') {
-      this.subId = id
+      this.si = id
+    }else{
+      this.si = this.subId
     }
     if (typeof serialNumber !== 'undefined') {
-      this.serialNumber = serialNumber
+      this.sn = serialNumber
+    }else{
+      this.sn = this.serialNumber
     }
   },
   methods: {