pssr特种设备

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

@@ -361,7 +361,7 @@ public class TApproveDangerController extends BaseController {
                         TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
                         TPssrSubcontent tPssrSubcontent = tPssrSubcontentService.selectTPssrSubcontentById(t.getSubId());
                         t.setSn(tPssrSubcontent.getForShort());
-                        devProcess.setProcessName(pi.getProcessDefinitionName()+"_"+tPssrSubcontent.getUnitDes()+"_"+tPssrSubcontent.getItem());
+                        devProcess.setProcessName(pi.getProcessDefinitionName()+"_"+tPssrSubcontent.getUnit()+"_"+tPssrSubcontent.getItem());
                         devProcess.setApNo(t.getApNo());
                         devProcess.setApproveObject(t);
                     }
@@ -517,7 +517,7 @@ public class TApproveDangerController extends BaseController {
                     TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
                     TPssrSubcontent tPssrSubcontent = tPssrSubcontentService.selectTPssrSubcontentById(t.getSubId());
                     t.setSn(tPssrSubcontent.getForShort());
-                    devTask.setProcessName(pi.getProcessDefinitionName()+"_"+tPssrSubcontent.getUnitDes()+"_"+tPssrSubcontent.getItem());
+                    devTask.setProcessName(pi.getProcessDefinitionName()+"_"+tPssrSubcontent.getUnit()+"_"+tPssrSubcontent.getItem());
                     devTask.setApNo(t.getApNo());
                     devTask.setApproveObject(t);
                 }
@@ -672,7 +672,7 @@ public class TApproveDangerController extends BaseController {
                     TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
                     TPssrSubcontent tPssrSubcontent = tPssrSubcontentService.selectTPssrSubcontentById(t.getSubId());
                     t.setSn(tPssrSubcontent.getForShort());
-                    devProcess.setProcessName(pi.getProcessDefinitionName()+"_"+tPssrSubcontent.getUnitDes()+"_"+tPssrSubcontent.getItem());
+                    devProcess.setProcessName(pi.getProcessDefinitionName()+"_"+tPssrSubcontent.getUnit()+"_"+tPssrSubcontent.getItem());
                     SysUser user = sysUserService.selectUserById(Long.valueOf(t.getCreaterCode()));
                     devProcess.setApName(user.getNickName());
                     devProcess.setApNo(t.getApNo());

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

@@ -178,10 +178,9 @@ public class TPssrAirtightController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrAirtight.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrAirtight.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -179,10 +179,9 @@ public class TPssrAnalyzerController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrAnalyzer.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrAnalyzer.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -178,6 +178,9 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private ITPssrAlarmService tPssrAlarmService;
 
+    @Autowired
+    private ITPssrVesselService tPssrVesselService;
+
     /**
      * 查询pssr审批管理列表
      */
@@ -488,7 +491,7 @@ public class TPssrApproveController extends BaseController {
     }
 
     @PutMapping("/handleMgrApprove")
-    public AjaxResult handleMgrApprove(DevTask devTask) {
+    public AjaxResult handleMgrApprove(@RequestBody DevTask devTask) {
         TPssrApprove approve = devTask.gettPssrApprove();
         //使用任务服务完成任务(提交任务)
         String taskId = devTask.getTaskId();
@@ -505,11 +508,11 @@ public class TPssrApproveController extends BaseController {
 
         if (taskName.equals("所有装置经理")) {
             if (condition.equals("0")) {
-                if (aboveall.getPlantMgr() == getUserId()) {
+                if (userId.equals(aboveall.getPlantMgr().toString())) {
                     aboveall.setPlantConfirmdate(new Date());
-                } else if (aboveall.getCtmMgr() == getUserId()) {
+                } else if (userId.equals(aboveall.getCtmMgr().toString())) {
                     aboveall.setCtmConfirmdate(new Date());
-                } else if (aboveall.getCtaMgr() == getUserId()) {
+                } else if (userId.equals(aboveall.getCtaMgr().toString())) {
                     aboveall.setCtaConfirmdate(new Date());
                 }
             }
@@ -517,8 +520,7 @@ public class TPssrApproveController extends BaseController {
         if (taskName.equals("装置经理")) {
             if (condition.equals("0")) {
                 aboveall.setApproveStatus(2L);
-            } else if (condition.equals("1")) {
-                aboveall.setApproveStatus(0L);
+                aboveall.setConfirmationDate(new Date());
             }
         }
         tPssrAboveallService.updateTPssrAboveall(aboveall);
@@ -789,31 +791,46 @@ public class TPssrApproveController extends BaseController {
     // 管道审批流程发起申请
     public void doTzsbApprove(TPssrSubcontent sub) {
         String userId = getUserId().toString();
-        //修改状态
-        TPssrPipe tPssrPipe = new TPssrPipe();
-        tPssrPipe.setApproveStatus(0L);
-        tPssrPipe.setSubId(sub.getId());
-        Set<String> installer = new HashSet<>();
-        Set<String> remover = new HashSet<>();
-        for (TPssrPipe item : tPssrPipeService.selectTPssrPipeList(tPssrPipe)) {
-            item.setApproveStatus(1L);
-            item.setUpdatedate(new Date());
-            item.setUpdaterCode(userId);
-            tPssrPipeService.updateTPssrPipe(item);
-
-            // 安装人员
-            installer.add(item.getConfirmer1());
 
 
-            //拆除人员
-            remover.add(item.getConfirmer2());
+        TPssrPipe pipe = new TPssrPipe();
+        pipe.setSubId(sub.getId());
+        pipe.setApproveStatus(1L);
+        pipe.setUpdatedate(new Date());
+        pipe.setUpdaterCode(userId);
+        tPssrPipeService.updateAllBySubId(pipe);
+        TPssrVessel vessel = new TPssrVessel();
+        vessel.setSubId(sub.getId());
+        vessel.setApproveStatus(1L);
+        vessel.setUpdatedate(new Date());
+        vessel.setUpdaterCode(userId);
+        tPssrVesselService.updateAllBySubId(vessel);
+
+        //查询确认人
+        TPssrPipe entity = new TPssrPipe();
+        entity.setSubId(sub.getId());
+        entity.setApproveStatus(1L);
+        TPssrPipe tPssrPipe = tPssrPipeService.selectAllConfirmedPersonBySubId(entity);
+        String confirmer1s = null;
+        String confirmer2s = null;
+        if (tPssrPipe != null) {
+            confirmer1s = tPssrPipe.getConfirmer1();
+            confirmer2s = tPssrPipe.getConfirmer2();
+        }
+        logger.info("=======================confirmer1s:{}", confirmer1s);
+        logger.info("=======================confirmer2s:{}", confirmer2s);
 
+        Set<String> confirmerUsers1 = new HashSet<>();
+        Set<String> confirmerUsers2 = new HashSet<>();
+        if (StringUtils.isNotEmpty(confirmer1s)) {
+            confirmerUsers1.addAll(Arrays.asList(confirmer1s.split(",")));
+        }
+        if (StringUtils.isNotEmpty(confirmer2s)) {
+            confirmerUsers2.addAll(Arrays.asList(confirmer2s.split(",")));
         }
 
-        TPssrApprove exist = new TPssrApprove();
-        exist.setSubId(sub.getId());
-        List<TPssrApprove> tPssrApproves = tPssrApproveService.selectTPssrApproveList(exist);
-        if (CollectionUtil.isEmpty(tPssrApproves)) {
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(sub.getId());
+        if (tPssrApprove==null) {
             //新增审批数据
             TPssrApprove approve = new TPssrApprove();
             approve.setSubId(sub.getId());
@@ -824,22 +841,24 @@ public class TPssrApproveController extends BaseController {
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
 
-            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
+            pssr2confirm(approve, new ArrayList<>(confirmerUsers1), new ArrayList<>(confirmerUsers2), sub.getConfirm());
         } else {
             // 已存在流程时，删除旧流程，重新发起
-            TPssrApprove approve = tPssrApproves.get(0);
-            delProcess(approve.getProcessId(), "pssr2confirm");
+            delProcess(tPssrApprove.getProcessId(), "pssr2confirm");
+            entity.setApproveStatus(3L);
+            tPssrPipe = tPssrPipeService.selectAllConfirmedPersonBySubId(entity);
+            if (tPssrPipe != null) {
+                confirmer1s = tPssrPipe.getConfirmer1();
+                confirmer2s = tPssrPipe.getConfirmer2();
+            }
 
-            tPssrPipe = new TPssrPipe();
-            tPssrPipe.setApproveStatus(1L);
-            tPssrPipe.setSubId(sub.getId());
-            for (TPssrPipe item : tPssrPipeService.selectTPssrPipeList(tPssrPipe)) {
-                // 安装人员
-                installer.add(item.getConfirmer1());
-                //拆除人员
-                remover.add(item.getConfirmer2());
+            if (StringUtils.isNotEmpty(confirmer1s)) {
+                confirmerUsers1.addAll(Arrays.asList(confirmer1s.split(",")));
             }
-            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
+            if (StringUtils.isNotEmpty(confirmer2s)) {
+                confirmerUsers2.addAll(Arrays.asList(confirmer2s.split(",")));
+            }
+            pssr2confirm(tPssrApprove, new ArrayList<>(confirmerUsers1), new ArrayList<>(confirmerUsers2), sub.getConfirm());
         }
 
     }

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

@@ -169,10 +169,9 @@ public class TPssrBlindController extends BaseController {
         tPssrSubcontentService.updateTPssrSubcontent(tPssrSubcontent);
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrBlind.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrBlind.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -178,10 +178,9 @@ public class TPssrCircuitController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrCircuit.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrCircuit.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -178,10 +178,9 @@ public class TPssrCleaningController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrCleaning.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrCleaning.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -178,10 +178,9 @@ public class TPssrFrameController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrFrame.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrFrame.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -179,10 +179,9 @@ public class TPssrFranklinismController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrFranklinism.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrFranklinism.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -179,10 +179,9 @@ public class TPssrGasdetectorController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrGasdetector.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrGasdetector.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -178,10 +178,8 @@ public class TPssrHygieneController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrHygiene.getSubId());
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrHygiene.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -179,10 +179,9 @@ public class TPssrInstrumentCalibrationController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrInstrumentCalibration.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrInstrumentCalibration.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -178,10 +178,9 @@ public class TPssrLaboratoryController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrLaboratory.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrLaboratory.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -181,10 +181,9 @@ public class TPssrLightingController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrLighting.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrLighting.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -155,10 +155,9 @@ public class TPssrLockController extends BaseController {
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrLock.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrLock.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -190,10 +190,9 @@ public class TPssrMaterialController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrMaterial.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrMaterial.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -189,10 +189,9 @@ public class TPssrMaterialRawController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrMaterialRaw.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrMaterialRaw.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -199,10 +199,9 @@ public class TPssrMeasureController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrMeasure.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrMeasure.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -163,10 +163,9 @@ public class TPssrMocController extends BaseController {
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrMoc.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrMoc.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -177,10 +177,9 @@ public class TPssrMotorController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrMotor.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrMotor.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -179,10 +179,9 @@ public class TPssrNitrogenController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrNitrogen.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrNitrogen.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -159,10 +159,9 @@ public class TPssrOverhaulExchangerController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrOverhaulExchanger.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulExchanger.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -249,10 +249,9 @@ public class TPssrOverhaulFilterController extends BaseController
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrOverhaulFilter.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulFilter.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -233,10 +233,9 @@ public class TPssrOverhaulPipeController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrOverhaulPipe.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulPipe.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -235,10 +235,9 @@ public class TPssrOverhaulPumpController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrOverhaulPump.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulPump.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -248,10 +248,9 @@ public class TPssrOverhaulTowerController extends BaseController
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrOverhaulTower.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulTower.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -248,10 +248,9 @@ public class TPssrOverhaulValveController extends BaseController
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrOverhaulValve.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulValve.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -1,33 +1,32 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.util.List;
-
 import com.alibaba.fastjson.JSON;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.mapper.TPssrPipeMapper;
-import com.ruoyi.project.pssr.mapper.TPssrSubcontentMapper;
-import com.ruoyi.project.sems.domain.TSpecdevYlgd;
-import com.ruoyi.project.sems.mapper.TSpecdevYlgdMapper;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrPipe;
-import com.ruoyi.project.pssr.service.ITPssrPipeService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrPipe;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.mapper.TPssrPipeMapper;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrPipeService;
+import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.sems.domain.TSpecdevYlgd;
+import com.ruoyi.project.sems.mapper.TSpecdevYlgdMapper;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.impl.identity.Authentication;
+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.*;
 
 import javax.annotation.Resource;
+import java.util.*;
 
 /**
  * 管道Controller
@@ -37,23 +36,32 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("/pssr/pipe")
-public class TPssrPipeController extends BaseController
-{
+public class TPssrPipeController extends BaseController {
     @Autowired
     private ITPssrPipeService tPssrPipeService;
     @Resource
     private TSpecdevYlgdMapper tSpecdevYlgdMapper;
     @Resource
-    private TPssrSubcontentMapper tPssrSubcontentMapper;
-    @Resource
     private TPssrPipeMapper tPssrPipeMapper;
+
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
+    @Autowired
+    private RuntimeService runtimeService;
+
+    @Autowired
+    private HistoryService historyService;
+
+    @Autowired
+    private ITPssrSubcontentService tPssrSubcontentService;
+
     /**
      * 查询管道列表
      */
     @PreAuthorize("@ss.hasPermi('pssr:pipe:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrPipe tPssrPipe)
-    {
+    public TableDataInfo list(TPssrPipe tPssrPipe) {
         startPage();
         List<TPssrPipe> list = tPssrPipeService.selectTPssrPipeList(tPssrPipe);
         return getDataTable(list);
@@ -64,29 +72,35 @@ public class TPssrPipeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:pipe:add')")
     @GetMapping("/syncPipe")
-    public AjaxResult syncPipe(TPssrPipe tPssrPipe)
-    {
+    public AjaxResult syncPipe(TPssrPipe tPssrPipe) {
         TSpecdevYlgd tSpecdevYlgd = new TSpecdevYlgd();
-        TPssrSubcontent subcontent = tPssrSubcontentMapper.selectTPssrSubcontentById(tPssrPipe.getSubId());
-        tSpecdevYlgd.setPlantCode("BCC");
-        tSpecdevYlgd.setDevno("-" + subcontent.getUnit());
-        List<TSpecdevYlgd> list = tSpecdevYlgdMapper.selectTSpecdevYlgdListForPssr(tSpecdevYlgd);
-
+        TPssrSubcontent subcontent = tPssrSubcontentService.selectTPssrSubcontentById(tPssrPipe.getSubId());
+        List<TSpecdevYlgd> list = new ArrayList<>();
         //删除老数据
         tPssrPipeMapper.deleteTPssrPipeBySubId(tPssrPipe.getSubId());
-        for (TSpecdevYlgd t: list
-             ) {
-            TPssrPipe pipe = new TPssrPipe();
-            pipe.setUnit(subcontent.getUnit());
-            pipe.setPipelineName(t.getDevname());
-            pipe.setPipelineNo(t.getDevno());
-            pipe.setSubId(tPssrPipe.getSubId());
+        if (StringUtils.isNotEmpty(subcontent.getUnit())) {
+            for (String unit : subcontent.getUnit().split(",")) {
+                tSpecdevYlgd.setPlantCode("BCC");
+                tSpecdevYlgd.setDevno("-" + unit);
+                for (TSpecdevYlgd t : tSpecdevYlgdMapper.selectTSpecdevYlgdListForPssr(tSpecdevYlgd)) {
+                    TPssrPipe pipe = new TPssrPipe();
+                    pipe.setUnit(unit);
+                    pipe.setPipelineName(t.getDevname());
+                    pipe.setPipelineNo(t.getDevno());
+                    pipe.setSubId(tPssrPipe.getSubId());
+
+                    pipe.setChecked("√");
+                    pipe.setRequire("√");
+                    pipe.setValidity("√");
 
-            pipe.setChecked("√");
-            pipe.setRequire("√");
-            pipe.setValidity("√");
-            tPssrPipeService.insertTPssrPipe(pipe);
+                    pipe.setApproveStatus(0L);
+                    pipe.setCreatedate(new Date());
+                    pipe.setCreaterCode(getUserId().toString());
+                    tPssrPipeService.insertTPssrPipe(pipe);
+                }
+            }
         }
+
         return AjaxResult.success();
     }
 
@@ -97,8 +111,7 @@ public class TPssrPipeController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:pipe:export')")
     @Log(title = "管道", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrPipe tPssrPipe)
-    {
+    public AjaxResult export(TPssrPipe tPssrPipe) {
         List<TPssrPipe> list = tPssrPipeService.selectTPssrPipeList(tPssrPipe);
         ExcelUtil<TPssrPipe> util = new ExcelUtil<TPssrPipe>(TPssrPipe.class);
         return util.exportExcel(list, "pipe");
@@ -109,8 +122,7 @@ public class TPssrPipeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:pipe:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPssrPipeService.selectTPssrPipeById(id));
     }
 
@@ -120,8 +132,11 @@ public class TPssrPipeController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:pipe:add')")
     @Log(title = "管道", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrPipe tPssrPipe)
-    {
+    public AjaxResult add(@RequestBody TPssrPipe tPssrPipe) {
+
+        tPssrPipe.setApproveStatus(0L);
+        tPssrPipe.setCreatedate(new Date());
+        tPssrPipe.setCreaterCode(getUserId().toString());
         return toAjax(tPssrPipeService.insertTPssrPipe(tPssrPipe));
     }
 
@@ -131,8 +146,7 @@ public class TPssrPipeController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:pipe:edit')")
     @Log(title = "管道", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrPipe tPssrPipe)
-    {
+    public AjaxResult edit(@RequestBody TPssrPipe tPssrPipe) {
         return toAjax(tPssrPipeService.updateTPssrPipe(tPssrPipe));
     }
 
@@ -142,8 +156,7 @@ public class TPssrPipeController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:pipe:edit')")
     @Log(title = "管道批量修改", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
-    public AjaxResult editBatch(@RequestBody TPssrPipe tPssrPipe)
-    {
+    public AjaxResult editBatch(@RequestBody TPssrPipe tPssrPipe) {
         logger.info(JSON.toJSONString(tPssrPipe));
         return toAjax(tPssrPipeMapper.updateTPssrPipeByIds(tPssrPipe));
     }
@@ -153,9 +166,165 @@ public class TPssrPipeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:pipe:remove')")
     @Log(title = "管道", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrPipeService.deleteTPssrPipeByIds(ids));
     }
+
+    /**
+     * 确认压力管道
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:pipe:edit')")
+    @Log(title = "确认压力管道", businessType = BusinessType.UPDATE)
+    @PutMapping("/confirmPipe")
+    public AjaxResult confirmPipe(@RequestBody TPssrPipe tPssrPipe) {
+        long queryStatus = 0;
+        long approveStatus = 0;
+        Date date = null;
+        TPssrPipe pipe = new TPssrPipe();
+        if (tPssrPipe.getTaskType() == 4) {
+            //确认人1确认
+            queryStatus = 1;
+            approveStatus = 3;
+            pipe.setConfirmer1(getUserId().toString());
+            date = new Date();
+        } else if (tPssrPipe.getTaskType() == 5) {
+            //确认人2确认
+            queryStatus = 3;
+            approveStatus = 2;
+            pipe.setConfirmer2(getUserId().toString());
+            date = new Date();
+        }
+        if (tPssrPipe.getIds() != null && tPssrPipe.getIds().length > 0) {
+            for (Long id : tPssrPipe.getIds()) {
+                pipe = tPssrPipeService.selectTPssrPipeById(id);
+                if (pipe.getConfirmationDate() == null) {
+                    pipe.setConfirmationDate(new Date());
+                }
+                pipe.setApproveStatus(approveStatus);
+                pipe.setUpdatedate(new Date());
+                pipe.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrPipeService.updateTPssrPipe(pipe);
+            }
+        } else {
+            pipe.setSubId(tPssrPipe.getSubId());
+            pipe.setApproveStatus(queryStatus);
+            for (TPssrPipe item : tPssrPipeService.selectTPssrPipeList(pipe)) {
+                if (item.getConfirmationDate() == null) {
+                    item.setConfirmationDate(new Date());
+                }
+                item.setApproveStatus(approveStatus);
+                item.setUpdatedate(new Date());
+                item.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrPipeService.updateTPssrPipe(item);
+            }
+        }
+        //查询当前待审批的确认人
+
+        TPssrPipe entity = new TPssrPipe();
+        entity.setSubId(tPssrPipe.getSubId());
+        entity.setApproveStatus(queryStatus);
+        TPssrPipe pssrPipe = tPssrPipeService.selectAllConfirmedPersonBySubId(entity);
+        if (pssrPipe != null) {
+            //如果当前用户还有待审批任务
+            if (tPssrPipe.getTaskType() == 4 && StringUtils.isNotEmpty(pssrPipe.getConfirmer1())) {
+                if (pssrPipe.getConfirmer1().contains(getUserId().toString())) {
+                    return AjaxResult.success();
+                }
+            }
+
+            if (tPssrPipe.getTaskType() == 5 && StringUtils.isNotEmpty(pssrPipe.getConfirmer2())) {
+                if (pssrPipe.getConfirmer2().contains(getUserId().toString())) {
+                    return AjaxResult.success();
+                }
+            }
+        }
+        //无待审批任务结束当前用户流程
+        // 因为流程关系所以approve一定会有且只有一条数据
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPipe.getSubId());
+        TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
+        return AjaxResult.success();
+    }
+
+
+    /**
+     * 驳回压力管道
+     */
+    @PutMapping("/turnDownPipe")
+    public AjaxResult turnDownPipe(@RequestBody TPssrPipe tPssrPipe) {
+        if (tPssrPipe.getIds() != null) {
+            String userId = getUserId().toString();
+            // 修改已选择数据的状态
+            for (Long id : tPssrPipe.getIds()) {
+                TPssrPipe blind = new TPssrPipe();
+                blind.setId(id);
+                blind.setApproveStatus(1L);
+                blind.setUpdatedate(new Date());
+                blind.setUpdaterCode(getUserId().toString());
+                tPssrPipeService.updateTPssrPipe(blind);
+            }
+            // 查询当前流程
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPipe.getSubId());
+
+            try {
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
+                historyService.deleteHistoricProcessInstance(approve.getProcessId());
+            } catch (Exception e) {
+                logger.info("无运行时流程");
+            }
+
+            // 驳回 查询所有待审批的人员
+
+            //查询确认人
+            TPssrPipe entity = new TPssrPipe();
+            entity.setSubId(tPssrPipe.getSubId());
+            entity.setApproveStatus(1L);
+            TPssrPipe pssrPipe = tPssrPipeService.selectAllConfirmedPersonBySubId(entity);
+            String confirmer1s = null;
+            String confirmer2s = null;
+            if (pssrPipe != null) {
+                confirmer1s = pssrPipe.getConfirmer1();
+                confirmer2s = pssrPipe.getConfirmer2();
+            }
+            logger.info("=======================confirmer1s:{}", confirmer1s);
+            logger.info("=======================confirmer2s:{}", confirmer2s);
+
+            Set<String> confirmerUsers1 = new HashSet<>();
+            Set<String> confirmerUsers2 = new HashSet<>();
+            if (StringUtils.isNotEmpty(confirmer1s)) {
+                confirmerUsers1.addAll(Arrays.asList(confirmer1s.split(",")));
+            }
+            if (StringUtils.isNotEmpty(confirmer2s)) {
+                confirmerUsers2.addAll(Arrays.asList(confirmer2s.split(",")));
+            }
+
+            // 开始申请流程
+            long businessKey = approve.getApproveId();
+            //开始工作流、监听
+            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
+            Map<String, Object> variables = new HashMap<>();
+            variables.put("applyUser", userId);
+            variables.put("confirmUsers1", new ArrayList<>(confirmerUsers1));
+            variables.put("confirmUsers2", new ArrayList<>(confirmerUsers2));
+            variables.put("chargePerson", approve.getSubCharge());
+            //采用key来启动流程定义并设置流程变量，返回流程实例
+            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
+
+            // 修改审批表和sub表
+            approve.setProcessId(pi.getProcessInstanceId());
+            approve.setApproveStatus(1L);
+            approve.setUpdatedate(new Date());
+            approve.setUpdaterCode(getUserId().toString());
+            tPssrApproveService.updateTPssrApprove(approve);
+
+            TPssrSubcontent subcontent = new TPssrSubcontent();
+            subcontent.setId(approve.getSubId());
+            subcontent.setApproveStatus(1L);
+            subcontent.setUpdatedate(new Date());
+            subcontent.setUpdaterCode(getUserId().toString());
+            tPssrSubcontentService.updateTPssrSubcontent(subcontent);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
+    }
 }

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

@@ -178,10 +178,9 @@ public class TPssrPowerController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrPower.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPower.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -181,10 +181,9 @@ public class TPssrProtectionController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrProtection.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrProtection.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -178,10 +178,9 @@ public class TPssrPublicController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrPublic.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPublic.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -182,10 +182,9 @@ public class TPssrPumpCleaningController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrPumpCleaning.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpCleaning.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -180,10 +180,9 @@ public class TPssrPumpFillController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrPumpFill.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpFill.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -185,10 +185,9 @@ public class TPssrPumpOverhaulController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrPumpOverhaul.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpOverhaul.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -119,10 +119,9 @@ public class TPssrSafetyController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrSafetyBleed.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBleed.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
@@ -194,10 +193,9 @@ public class TPssrSafetyController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrSafetyBreath.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBreath.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
@@ -269,10 +267,9 @@ public class TPssrSafetyController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrSafetyBrust.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBrust.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
@@ -344,10 +341,9 @@ public class TPssrSafetyController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrSafetyFlamearrester.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyFlamearrester.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
@@ -419,10 +415,9 @@ public class TPssrSafetyController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrSafetyValve.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyValve.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }

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

@@ -23,8 +23,7 @@ import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.impl.SysUserServiceImpl;
 import io.jsonwebtoken.lang.Assert;
 import org.activiti.engine.HistoryService;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.ProcessEngines;
+import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +35,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -61,6 +59,9 @@ public class TPssrSubcontentController extends BaseController {
     @Autowired
     private TPssrApproveController tPssrApproveController;
 
+    @Autowired
+    private RuntimeService runtimeService;
+
     @Autowired
     private HistoryService historyService;
 
@@ -233,7 +234,7 @@ public class TPssrSubcontentController extends BaseController {
         tableRenderData.setMergeRule(rule);
 
         // 准备表格数据和其他参数
-        params.put("unit", aboveall.getUnit() + "_" + aboveall.getUnitDes());
+        params.put("unit", aboveall.getUnit());
         params.put("subcontent", tableRenderData);
         params.put("plantMgr", plantMgr);
         params.put("confirmDate", DateUtils.dateTime(aboveall.getConfirmationDate()));
@@ -320,71 +321,25 @@ public class TPssrSubcontentController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pssr:subcontent:edit')")
     @Log(title = "开车条件确认", businessType = BusinessType.UPDATE)
-    @PutMapping("/handleApprove")
-    public AjaxResult handleApprove(@RequestBody TPssrSubcontent tPssrSubcontent) {
+    @PutMapping("/turnDownSubcontent")
+    public AjaxResult turnDownSubcontent(@RequestBody TPssrSubcontent tPssrSubcontent) {
         if (tPssrSubcontent.getIds() != null && tPssrSubcontent.getIds().size() > 0) {
             for (Long id : tPssrSubcontent.getIds()) {
-                TPssrSubcontent subcontent = new TPssrSubcontent();
-                subcontent.setId(id);
-                subcontent.setApproveStatus(tPssrSubcontent.getApproveStatus());
-                if (tPssrSubcontent.getApproveStatus() == 2) {
-                    subcontent.setConfirmationDate(new Date());
-                }
-                subcontent.setUpdatedate(new Date());
-                subcontent.setUpdaterCode(getUserId().toString());
-                tPssrSubcontentService.updateTPssrSubcontent(subcontent);
-            }
-        } else {
-            TPssrSubcontent pssrSubcontent = new TPssrSubcontent();
-            pssrSubcontent.setAboveallId(tPssrSubcontent.getAboveallId());
-            pssrSubcontent.setApproveStatus(1L);
-            for (TPssrSubcontent subcontent : tPssrSubcontentService.selectTPssrSubcontentList(pssrSubcontent)) {
-                subcontent.setApproveStatus(tPssrSubcontent.getApproveStatus());
-                if (tPssrSubcontent.getApproveStatus() == 2) {
-                    subcontent.setConfirmationDate(new Date());
-                }
-                subcontent.setUpdatedate(new Date());
-                subcontent.setUpdaterCode(getUserId().toString());
-                tPssrSubcontentService.updateTPssrSubcontent(subcontent);
+                tPssrApproveController.doApprove(id);
             }
-        }
-        TPssrApprove approve = tPssrApproveService.selectTPssrApproveByAboveallId(tPssrSubcontent.getAboveallId());
-        TPssrAboveall aboveall = tPssrAboveallService.selectTPssrAboveallById(tPssrSubcontent.getAboveallId());
-        Task task = taskService.createTaskQuery().processInstanceId(approve.getProcessId()).singleResult();
-
-        if (task.getName().equals("所有装置经理")) {
-            if (aboveall.getPlantMgr() == getUserId()) {
-                aboveall.setPlantConfirmdate(new Date());
-            } else if (aboveall.getCtmMgr() == getUserId()) {
-                aboveall.setCtmConfirmdate(new Date());
-            } else if (aboveall.getCtaMgr() == getUserId()) {
-                aboveall.setCtaConfirmdate(new Date());
-            }
-        }
-
-        String condition = "0";
-        if (task.getName().equals("装置经理")) {
-            if (tPssrSubcontent.getApproveStatus() == 2) {
-                aboveall.setApproveStatus(2L);
-                condition = "0";
-            } else if (tPssrSubcontent.getApproveStatus() == 0) {
-                aboveall.setApproveStatus(0L);
-                condition = "1";
-                // 将选中的数据重新发起申请
-                for (Long id : tPssrSubcontent.getIds()) {
-                    tPssrApproveController.doApprove(id);
-                }
+            TPssrAboveall aboveall = new TPssrAboveall();
+            aboveall.setId(tPssrSubcontent.getAboveallId());
+            aboveall.setApproveStatus(0L);
+            tPssrAboveallService.updateTPssrAboveall(aboveall);
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveByAboveallId(tPssrSubcontent.getAboveallId());
+            try {
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssrMgrConfirm");
+                historyService.deleteHistoricProcessInstance(approve.getProcessId());
+            } catch (Exception e) {
+                logger.info("无运行时流程");
             }
+            return AjaxResult.success();
         }
-        tPssrAboveallService.updateTPssrAboveall(aboveall);
-        //处理流程节点
-        Map<String, Object> param = new HashMap<>();
-        param.put("condition", condition);
-        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-        TaskService taskService = processEngine.getTaskService();
-        //认领任务
-        processEngine.getTaskService().claim(task.getId(), getUserId().toString());
-        taskService.complete(task.getId(), param);
-        return AjaxResult.success();
+        return AjaxResult.error("请选择需要执行的流程");
     }
 }

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

@@ -180,10 +180,9 @@ public class TPssrTorchvocController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(tPssrTorchvoc.getSubId());
+        
         // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrTorchvoc.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
 

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

@@ -0,0 +1,330 @@
+package com.ruoyi.project.pssr.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+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.*;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrPipeService;
+import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.ITPssrVesselService;
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
+import com.ruoyi.project.sems.mapper.TSpecdevYlrqMapper;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.impl.identity.Authentication;
+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.*;
+
+import java.util.*;
+
+/**
+ * 压力容器Controller
+ *
+ * @author ssy
+ * @date 2024-11-07
+ */
+@RestController
+@RequestMapping("/pssr/vessel")
+public class TPssrVesselController extends BaseController {
+    @Autowired
+    private ITPssrVesselService tPssrVesselService;
+
+    @Autowired
+    private ITPssrSubcontentService tPssrSubcontentService;
+    @Autowired
+    private TSpecdevYlrqMapper tSpecdevYlrqMapper;
+
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
+    @Autowired
+    private RuntimeService runtimeService;
+
+    @Autowired
+    private HistoryService historyService;
+
+    @Autowired
+    private ITPssrPipeService tPssrPipeService;
+
+    /**
+     * 查询压力容器列表
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:vessel:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TPssrVessel tPssrVessel) {
+        startPage();
+        List<TPssrVessel> list = tPssrVesselService.selectTPssrVesselList(tPssrVessel);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出压力容器列表
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:vessel:export')")
+    @Log(title = "压力容器", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPssrVessel tPssrVessel) {
+        List<TPssrVessel> list = tPssrVesselService.selectTPssrVesselList(tPssrVessel);
+        ExcelUtil<TPssrVessel> util = new ExcelUtil<TPssrVessel>(TPssrVessel.class);
+        return util.exportExcel(list, "vessel");
+    }
+
+    /**
+     * 获取压力容器详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:vessel:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(tPssrVesselService.selectTPssrVesselById(id));
+    }
+
+    /**
+     * 新增压力容器
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:vessel:add')")
+    @Log(title = "压力容器", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPssrVessel tPssrVessel) {
+
+        tPssrVessel.setApproveStatus(0L);
+        tPssrVessel.setCreatedate(new Date());
+        tPssrVessel.setCreaterCode(getUserId().toString());
+        return toAjax(tPssrVesselService.insertTPssrVessel(tPssrVessel));
+    }
+
+    /**
+     * 修改压力容器
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:vessel:edit')")
+    @Log(title = "压力容器", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPssrVessel tPssrVessel) {
+        return toAjax(tPssrVesselService.updateTPssrVessel(tPssrVessel));
+    }
+
+    /**
+     * 删除压力容器
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:vessel:remove')")
+    @Log(title = "压力容器", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(tPssrVesselService.deleteTPssrVesselByIds(ids));
+    }
+
+    /**
+     * 批量修改压力容器
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:vessel:edit')")
+    @Log(title = "压力容器修改", businessType = BusinessType.UPDATE)
+    @PutMapping("/editBatch")
+    public AjaxResult editBatch(@RequestBody TPssrVessel tPssrVessel) {
+        logger.info(JSON.toJSONString(tPssrVessel));
+        return toAjax(tPssrVesselService.updateTPssrVesselByIds(tPssrVessel));
+    }
+
+
+    /**
+     * 查询压力容器列表
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:vessel:add')")
+    @GetMapping("/syncVessel")
+    public AjaxResult syncVessel(TPssrVessel tPssrVessel) {
+        TSpecdevYlrq tSpecdevYlrq = new TSpecdevYlrq();
+        TPssrSubcontent subcontent = tPssrSubcontentService.selectTPssrSubcontentById(tPssrVessel.getSubId());
+        //删除老数据
+        tPssrVesselService.deleteTPssrVesselBySubId(tPssrVessel.getSubId());
+        List<TSpecdevYlrq> list = new ArrayList<>();
+        if (StringUtils.isNotEmpty(subcontent.getUnit())) {
+            for (String unit : subcontent.getUnit().split(",")) {
+                tSpecdevYlrq.setPlantCode("BCC");
+                tSpecdevYlrq.setDevno("-" + unit);
+                for (TSpecdevYlrq t : tSpecdevYlrqMapper.selectTSpecdevYlrqListForPssr(tSpecdevYlrq)) {
+                    TPssrVessel vessel = new TPssrVessel();
+                    vessel.setUnit(unit);
+                    vessel.setVesselName(t.getDevname());
+                    vessel.setVesselNo(t.getDevno());
+                    vessel.setSubId(tPssrVessel.getSubId());
+
+                    vessel.setChecked("√");
+                    vessel.setRequire("√");
+                    vessel.setValidity("√");
+
+                    vessel.setApproveStatus(0L);
+                    vessel.setCreatedate(new Date());
+                    vessel.setCreaterCode(getUserId().toString());
+                    tPssrVesselService.insertTPssrVessel(vessel);
+                }
+            }
+        }
+        return AjaxResult.success();
+    }
+
+
+    /**
+     * 确认压力容器
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:vessel:edit')")
+    @Log(title = "确认压力容器", businessType = BusinessType.UPDATE)
+    @PutMapping("/confirmVessel")
+    public AjaxResult confirmVessel(@RequestBody TPssrVessel tPssrVessel) {
+        long queryStatus = 0;
+        long approveStatus = 0;
+        Date date = null;
+        TPssrVessel vessel = new TPssrVessel();
+        if (tPssrVessel.getTaskType() == 4) {
+            //确认人1确认
+            queryStatus = 1;
+            approveStatus = 3;
+            vessel.setConfirmer1(getUserId().toString());
+            date = new Date();
+        } else if (tPssrVessel.getTaskType() == 5) {
+            //确认人2确认
+            queryStatus = 3;
+            approveStatus = 2;
+            vessel.setConfirmer2(getUserId().toString());
+            date = new Date();
+        }
+        if (tPssrVessel.getIds() != null && tPssrVessel.getIds().length > 0) {
+            for (Long id : tPssrVessel.getIds()) {
+                vessel = tPssrVesselService.selectTPssrVesselById(id);
+                if (vessel.getConfirmationDate() == null) {
+                    vessel.setConfirmationDate(new Date());
+                }
+                vessel.setApproveStatus(approveStatus);
+                vessel.setUpdatedate(new Date());
+                vessel.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrVesselService.updateTPssrVessel(vessel);
+            }
+        } else {
+            vessel.setSubId(tPssrVessel.getSubId());
+            vessel.setApproveStatus(queryStatus);
+            for (TPssrVessel item : tPssrVesselService.selectTPssrVesselList(vessel)) {
+                if (item.getConfirmationDate() == null) {
+                    item.setConfirmationDate(new Date());
+                }
+                item.setApproveStatus(approveStatus);
+                item.setUpdatedate(new Date());
+                item.setUpdaterCode(String.valueOf(getUserId()));
+                tPssrVesselService.updateTPssrVessel(item);
+            }
+        }
+        //查询当前待审批的确认人
+        TPssrPipe entity = new TPssrPipe();
+        entity.setSubId(tPssrVessel.getSubId());
+        entity.setApproveStatus(queryStatus);
+        TPssrPipe tPssrPipe = tPssrPipeService.selectAllConfirmedPersonBySubId(entity);
+        if (tPssrPipe != null) {
+            //如果当前用户还有待审批任务
+            if (tPssrVessel.getTaskType() == 4 && StringUtils.isNotEmpty(tPssrPipe.getConfirmer1())) {
+                if (tPssrPipe.getConfirmer1().contains(getUserId().toString())) {
+                    return AjaxResult.success();
+                }
+            }
+
+            if (tPssrVessel.getTaskType() == 5 && StringUtils.isNotEmpty(tPssrPipe.getConfirmer2())) {
+                if (tPssrPipe.getConfirmer2().contains(getUserId().toString())) {
+                    return AjaxResult.success();
+                }
+            }
+        }
+        //无待审批任务结束当前用户流程
+        
+        // 因为流程关系所以approve一定会有且只有一条数据
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrVessel.getSubId());
+        TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
+        return AjaxResult.success();
+    }
+
+
+
+    /**
+     * 驳回压力容器
+     */
+    @PutMapping("/turnDownVessel")
+    public AjaxResult turnDownVessel(@RequestBody TPssrVessel tPssrVessel) {
+        if (tPssrVessel.getIds() != null) {
+            String userId = getUserId().toString();
+            // 修改已选择数据的状态
+            for (Long id : tPssrVessel.getIds()) {
+                TPssrVessel blind = new TPssrVessel();
+                blind.setId(id);
+                blind.setApproveStatus(1L);
+                blind.setUpdatedate(new Date());
+                blind.setUpdaterCode(getUserId().toString());
+                tPssrVesselService.updateTPssrVessel(blind);
+            }
+            // 查询当前流程
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrVessel.getSubId());
+
+            try {
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
+                historyService.deleteHistoricProcessInstance(approve.getProcessId());
+            } catch (Exception e) {
+                logger.info("无运行时流程");
+            }
+
+            // 驳回 查询所有待审批的人员
+
+            //查询确认人
+            TPssrPipe entity = new TPssrPipe();
+            entity.setSubId(tPssrVessel.getSubId());
+            entity.setApproveStatus(1L);
+            TPssrPipe tPssrPipe = tPssrPipeService.selectAllConfirmedPersonBySubId(entity);
+            String confirmer1s = null;
+            String confirmer2s = null;
+            if (tPssrPipe != null) {
+                confirmer1s = tPssrPipe.getConfirmer1();
+                confirmer2s = tPssrPipe.getConfirmer2();
+            }
+            logger.info("=======================confirmer1s:{}", confirmer1s);
+            logger.info("=======================confirmer2s:{}", confirmer2s);
+
+            Set<String> confirmerUsers1 = new HashSet<>();
+            Set<String> confirmerUsers2 = new HashSet<>();
+            if (StringUtils.isNotEmpty(confirmer1s)) {
+                confirmerUsers1.addAll(Arrays.asList(confirmer1s.split(",")));
+            }
+            if (StringUtils.isNotEmpty(confirmer2s)) {
+                confirmerUsers2.addAll(Arrays.asList(confirmer2s.split(",")));
+            }
+
+            // 开始申请流程
+            long businessKey = approve.getApproveId();
+            //开始工作流、监听
+            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
+            Map<String, Object> variables = new HashMap<>();
+            variables.put("applyUser", userId);
+            variables.put("confirmUsers1", new ArrayList<>(confirmerUsers1));
+            variables.put("confirmUsers2", new ArrayList<>(confirmerUsers2));
+            variables.put("chargePerson", approve.getSubCharge());
+            //采用key来启动流程定义并设置流程变量，返回流程实例
+            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
+
+            // 修改审批表和sub表
+            approve.setProcessId(pi.getProcessInstanceId());
+            approve.setApproveStatus(1L);
+            approve.setUpdatedate(new Date());
+            approve.setUpdaterCode(getUserId().toString());
+            tPssrApproveService.updateTPssrApprove(approve);
+
+            TPssrSubcontent subcontent = new TPssrSubcontent();
+            subcontent.setId(approve.getSubId());
+            subcontent.setApproveStatus(1L);
+            subcontent.setUpdatedate(new Date());
+            subcontent.setUpdaterCode(getUserId().toString());
+            tPssrSubcontentService.updateTPssrSubcontent(subcontent);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
+    }
+}

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

@@ -110,6 +110,15 @@ public class TPssrPipe extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private Long taskType;
+
+    public Long getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(Long taskType) {
+        this.taskType = taskType;
+    }
 
     public void setId(Long id)
     {

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

@@ -0,0 +1,336 @@
+package com.ruoyi.project.pssr.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 压力容器对象 t_pssr_vessel
+ *
+ * @author ssy
+ * @date 2024-11-07
+ */
+public class TPssrVessel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
+    /** 单元号 */
+    @Excel(name = "单元号")
+    private String unit;
+
+    /** 容器名称 */
+    @Excel(name = "容器名称")
+    private String vesselName;
+
+    /** 容器编号 */
+    @Excel(name = "容器编号")
+    private String vesselNo;
+
+    /** 已经检验(是/否) */
+    @Excel(name = "已经检验(是/否)")
+    private String checked;
+
+    /** 符合要求(是/否) */
+    @Excel(name = "符合要求(是/否)")
+    private String require;
+
+    /** 在有效期内(是/否) */
+    @Excel(name = "在有效期内(是/否)")
+    private String validity;
+
+    /** 确认人1 */
+    @Excel(name = "确认人1")
+    private String confirmer1;
+
+    /** 确认人2 */
+    @Excel(name = "确认人2")
+    private String confirmer2;
+
+    /** 时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date confirmationDate;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 从表id */
+    @Excel(name = "从表id")
+    private Long subId;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 审批id */
+    @Excel(name = "审批id")
+    private Long approveId;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+    private String deptName;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    private Long[] ids;
+
+    private Long taskType;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
+    public Long getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(Long taskType) {
+        this.taskType = taskType;
+    }
+
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setVesselName(String vesselName)
+    {
+        this.vesselName = vesselName;
+    }
+
+    public String getVesselName()
+    {
+        return vesselName;
+    }
+    public void setVesselNo(String vesselNo)
+    {
+        this.vesselNo = vesselNo;
+    }
+
+    public String getVesselNo()
+    {
+        return vesselNo;
+    }
+    public void setChecked(String checked)
+    {
+        this.checked = checked;
+    }
+
+    public String getChecked()
+    {
+        return checked;
+    }
+    public void setRequire(String require)
+    {
+        this.require = require;
+    }
+
+    public String getRequire()
+    {
+        return require;
+    }
+    public void setValidity(String validity)
+    {
+        this.validity = validity;
+    }
+
+    public String getValidity()
+    {
+        return validity;
+    }
+    public void setConfirmer1(String confirmer1)
+    {
+        this.confirmer1 = confirmer1;
+    }
+
+    public String getConfirmer1()
+    {
+        return confirmer1;
+    }
+    public void setConfirmer2(String confirmer2)
+    {
+        this.confirmer2 = confirmer2;
+    }
+
+    public String getConfirmer2()
+    {
+        return confirmer2;
+    }
+    public void setConfirmationDate(Date confirmationDate)
+    {
+        this.confirmationDate = confirmationDate;
+    }
+
+    public Date getConfirmationDate()
+    {
+        return confirmationDate;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setSubId(Long subId)
+    {
+        this.subId = subId;
+    }
+
+    public Long getSubId()
+    {
+        return subId;
+    }
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setApproveId(Long approveId)
+    {
+        this.approveId = approveId;
+    }
+
+    public Long getApproveId()
+    {
+        return approveId;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("approveStatus", getApproveStatus())
+            .append("unit", getUnit())
+            .append("vesselName", getVesselName())
+            .append("vesselNo", getVesselNo())
+            .append("checked", getChecked())
+            .append("require", getRequire())
+            .append("validity", getValidity())
+            .append("confirmer1", getConfirmer1())
+            .append("confirmer2", getConfirmer2())
+            .append("confirmationDate", getConfirmationDate())
+            .append("remarks", getRemarks())
+            .append("subId", getSubId())
+            .append("id", getId())
+            .append("approveId", getApproveId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

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

@@ -64,4 +64,8 @@ public interface TPssrPipeMapper
     void deleteTPssrPipeBySubId(Long subId);
 
     int updateTPssrPipeByIds(TPssrPipe tPssrPipe);
+
+    int updateAllBySubId(TPssrPipe pipe);
+
+    TPssrPipe selectAllConfirmedPersonBySubId(TPssrPipe entity);
 }

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

@@ -0,0 +1,70 @@
+package com.ruoyi.project.pssr.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.pssr.domain.TPssrVessel;
+import com.ruoyi.project.pssr.domain.TPssrVessel;
+
+/**
+ * 压力容器Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-11-07
+ */
+public interface TPssrVesselMapper 
+{
+    /**
+     * 查询压力容器
+     * 
+     * @param id 压力容器ID
+     * @return 压力容器
+     */
+    public TPssrVessel selectTPssrVesselById(Long id);
+
+    /**
+     * 查询压力容器列表
+     * 
+     * @param tPssrVessel 压力容器
+     * @return 压力容器集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TPssrVessel> selectTPssrVesselList(TPssrVessel tPssrVessel);
+
+    /**
+     * 新增压力容器
+     * 
+     * @param tPssrVessel 压力容器
+     * @return 结果
+     */
+    public int insertTPssrVessel(TPssrVessel tPssrVessel);
+
+    /**
+     * 修改压力容器
+     * 
+     * @param tPssrVessel 压力容器
+     * @return 结果
+     */
+    public int updateTPssrVessel(TPssrVessel tPssrVessel);
+
+    /**
+     * 删除压力容器
+     * 
+     * @param id 压力容器ID
+     * @return 结果
+     */
+    public int deleteTPssrVesselById(Long id);
+
+    /**
+     * 批量删除压力容器
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPssrVesselByIds(Long[] ids);
+
+    int updateAllBySubId(TPssrVessel vessel);
+
+    void deleteTPssrVesselBySubId(Long subId);
+
+    int updateTPssrVesselByIds(TPssrVessel tPssrVessel);
+}

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

@@ -58,4 +58,8 @@ public interface ITPssrPipeService
      * @return 结果
      */
     public int deleteTPssrPipeById(Long id);
+
+    int updateAllBySubId(TPssrPipe pipe);
+
+    TPssrPipe selectAllConfirmedPersonBySubId(TPssrPipe entity);
 }

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

@@ -0,0 +1,73 @@
+package com.ruoyi.project.pssr.service;
+
+import com.ruoyi.project.pssr.domain.TPssrVessel;
+import com.ruoyi.project.pssr.domain.TPssrVessel;
+
+import java.util.List;
+
+/**
+ * 压力容器Service接口
+ *
+ * @author ssy
+ * @date 2024-11-07
+ */
+public interface ITPssrVesselService {
+    /**
+     * 查询压力容器
+     *
+     * @param id 压力容器ID
+     * @return 压力容器
+     */
+    public TPssrVessel selectTPssrVesselById(Long id);
+
+    /**
+     * 查询压力容器列表
+     *
+     * @param tPssrVessel 压力容器
+     * @return 压力容器集合
+     */
+    public List<TPssrVessel> selectTPssrVesselList(TPssrVessel tPssrVessel);
+
+    /**
+     * 新增压力容器
+     *
+     * @param tPssrVessel 压力容器
+     * @return 结果
+     */
+    public int insertTPssrVessel(TPssrVessel tPssrVessel);
+
+    /**
+     * 修改压力容器
+     *
+     * @param tPssrVessel 压力容器
+     * @return 结果
+     */
+    public int updateTPssrVessel(TPssrVessel tPssrVessel);
+
+    /**
+     * 批量删除压力容器
+     *
+     * @param ids 需要删除的压力容器ID
+     * @return 结果
+     */
+    public int deleteTPssrVesselByIds(Long[] ids);
+
+    /**
+     * 删除压力容器信息
+     *
+     * @param id 压力容器ID
+     * @return 结果
+     */
+    public int deleteTPssrVesselById(Long id);
+
+    /**
+     * 根据子项ID更新所有相关的压力容器信息
+     *
+     */
+    int updateAllBySubId(TPssrVessel vessel);
+
+
+    int updateTPssrVesselByIds(TPssrVessel vessel);
+
+    void deleteTPssrVesselBySubId(Long subId);
+}

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

@@ -90,4 +90,14 @@ public class TPssrPipeServiceImpl implements ITPssrPipeService
     {
         return tPssrPipeMapper.deleteTPssrPipeById(id);
     }
+
+    @Override
+    public int updateAllBySubId(TPssrPipe pipe) {
+        return tPssrPipeMapper.updateAllBySubId(pipe);
+    }
+
+    @Override
+    public TPssrPipe selectAllConfirmedPersonBySubId(TPssrPipe entity) {
+        return tPssrPipeMapper.selectAllConfirmedPersonBySubId(entity);
+    }
 }

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

@@ -0,0 +1,107 @@
+package com.ruoyi.project.pssr.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.pssr.mapper.TPssrVesselMapper;
+import com.ruoyi.project.pssr.domain.TPssrVessel;
+import com.ruoyi.project.pssr.service.ITPssrVesselService;
+
+/**
+ * 压力容器Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-11-07
+ */
+@Service
+public class TPssrVesselServiceImpl implements ITPssrVesselService
+{
+    @Autowired
+    private TPssrVesselMapper tPssrVesselMapper;
+
+    /**
+     * 查询压力容器
+     *
+     * @param id 压力容器ID
+     * @return 压力容器
+     */
+    @Override
+    public TPssrVessel selectTPssrVesselById(Long id)
+    {
+        return tPssrVesselMapper.selectTPssrVesselById(id);
+    }
+
+    /**
+     * 查询压力容器列表
+     *
+     * @param tPssrVessel 压力容器
+     * @return 压力容器
+     */
+    @Override
+    public List<TPssrVessel> selectTPssrVesselList(TPssrVessel tPssrVessel)
+    {
+        return tPssrVesselMapper.selectTPssrVesselList(tPssrVessel);
+    }
+
+    /**
+     * 新增压力容器
+     *
+     * @param tPssrVessel 压力容器
+     * @return 结果
+     */
+    @Override
+    public int insertTPssrVessel(TPssrVessel tPssrVessel)
+    {
+        return tPssrVesselMapper.insertTPssrVessel(tPssrVessel);
+    }
+
+    /**
+     * 修改压力容器
+     *
+     * @param tPssrVessel 压力容器
+     * @return 结果
+     */
+    @Override
+    public int updateTPssrVessel(TPssrVessel tPssrVessel)
+    {
+        return tPssrVesselMapper.updateTPssrVessel(tPssrVessel);
+    }
+
+    /**
+     * 批量删除压力容器
+     *
+     * @param ids 需要删除的压力容器ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPssrVesselByIds(Long[] ids)
+    {
+        return tPssrVesselMapper.deleteTPssrVesselByIds(ids);
+    }
+
+    @Override
+    public int updateTPssrVesselByIds(TPssrVessel vessel) {
+        return tPssrVesselMapper.updateTPssrVesselByIds(vessel);
+    }
+
+    @Override
+    public void deleteTPssrVesselBySubId(Long subId) {
+        tPssrVesselMapper.deleteTPssrVesselBySubId(subId);
+    }
+
+    /**
+     * 删除压力容器信息
+     *
+     * @param id 压力容器ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPssrVesselById(Long id)
+    {
+        return tPssrVesselMapper.deleteTPssrVesselById(id);
+    }
+
+    @Override
+    public int updateAllBySubId(TPssrVessel vessel) {
+        return tPssrVesselMapper.updateAllBySubId(vessel);}
+}

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevYlrqMapper.java

@@ -83,4 +83,6 @@ public interface TSpecdevYlrqMapper extends BaseMapper<TSpecdevYlrq> {
     List<TSpecdevYlrq> selectExpiredYlrq(Integer month);
 
     void updateTSpecdevYlrqByIds(TSpecdevYlrq tSpecdevYlrq);
+
+    List<TSpecdevYlrq> selectTSpecdevYlrqListForPssr(TSpecdevYlrq tSpecdevYlrq);
 }

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

@@ -65,6 +65,32 @@
         where id = #{id}
     </select>
 
+    <select id="selectAllConfirmedPersonBySubId" parameterType="TPssrPipe" resultMap="TPssrPipeResult">
+        SELECT
+        LISTAGG(CONFIRMER1, ',') WITHIN GROUP (ORDER BY CONFIRMER1) AS CONFIRMER1,
+        LISTAGG(CONFIRMER2, ',') WITHIN GROUP (ORDER BY CONFIRMER2) AS CONFIRMER2
+        FROM (
+        SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM t_pssr_pipe WHERE sub_id = #{subId}
+        <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
+
+        UNION
+        SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM t_pssr_vessel WHERE sub_id = #{subId}
+        <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
+        )
+
+    </select>
+
+
+    <update id="updateAllBySubId" parameterType="TPssrPipe">
+        update t_pssr_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>
+
     <insert id="insertTPssrPipe" parameterType="TPssrPipe">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_pipe.NEXTVAL as id FROM DUAL

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

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.pssr.mapper.TPssrVesselMapper">
+    
+    <resultMap type="TPssrVessel" id="TPssrVesselResult">
+        <result property="approveStatus"    column="approve_status"    />
+        <result property="unit"    column="unit"    />
+        <result property="vesselName"    column="vessel_name"    />
+        <result property="vesselNo"    column="vessel_no"    />
+        <result property="checked"    column="checked"    />
+        <result property="require"    column="require"    />
+        <result property="validity"    column="validity"    />
+        <result property="confirmer1"    column="confirmer1"    />
+        <result property="confirmer2"    column="confirmer2"    />
+        <result property="confirmationDate"    column="confirmation_date"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="subId"    column="sub_id"    />
+        <result property="id"    column="id"    />
+        <result property="approveId"    column="approve_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTPssrVesselVo">
+        select d.approve_status, d.unit, d.vessel_name, d.vessel_no, d.checked, d.require, d.validity, d.confirmer1, d.confirmer2, d.confirmation_date, d.remarks, d.sub_id, d.id, d.approve_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id ,s.dept_name from t_pssr_vessel d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTPssrVesselList" parameterType="TPssrVessel" resultMap="TPssrVesselResult">
+        <include refid="selectTPssrVesselVo"/>
+        <where>  
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="vesselName != null  and vesselName != ''"> and vessel_name like concat(concat('%', #{vesselName}), '%')</if>
+            <if test="vesselNo != null  and vesselNo != ''"> and vessel_no = #{vesselNo}</if>
+            <if test="checked != null  and checked != ''"> and checked = #{checked}</if>
+            <if test="require != null  and require != ''"> and require = #{require}</if>
+            <if test="validity != null  and validity != ''"> and validity = #{validity}</if>
+            <if test="confirmer1 != null  and confirmer1 != ''"> and confirmer1 = #{confirmer1}</if>
+            <if test="confirmer2 != null  and confirmer2 != ''"> and confirmer2 = #{confirmer2}</if>
+            <if test="confirmationDate != null "> and confirmation_date = #{confirmationDate}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="subId != null "> and sub_id = #{subId}</if>
+            <if test="approveId != null "> and approve_id = #{approveId}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTPssrVesselById" parameterType="Long" resultMap="TPssrVesselResult">
+        <include refid="selectTPssrVesselVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTPssrVessel" parameterType="TPssrVessel">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_pssr_vessel.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_pssr_vessel
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="approveStatus != null">approve_status,</if>
+            <if test="unit != null">unit,</if>
+            <if test="vesselName != null">vessel_name,</if>
+            <if test="vesselNo != null">vessel_no,</if>
+            <if test="checked != null">checked,</if>
+            <if test="require != null">require,</if>
+            <if test="validity != null">validity,</if>
+            <if test="confirmer1 != null">confirmer1,</if>
+            <if test="confirmer2 != null">confirmer2,</if>
+            <if test="confirmationDate != null">confirmation_date,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="subId != null">sub_id,</if>
+            <if test="id != null">id,</if>
+            <if test="approveId != null">approve_id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="vesselName != null">#{vesselName},</if>
+            <if test="vesselNo != null">#{vesselNo},</if>
+            <if test="checked != null">#{checked},</if>
+            <if test="require != null">#{require},</if>
+            <if test="validity != null">#{validity},</if>
+            <if test="confirmer1 != null">#{confirmer1},</if>
+            <if test="confirmer2 != null">#{confirmer2},</if>
+            <if test="confirmationDate != null">#{confirmationDate},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="subId != null">#{subId},</if>
+            <if test="id != null">#{id},</if>
+            <if test="approveId != null">#{approveId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAllBySubId" parameterType="TPssrVessel">
+        update t_pssr_vessel
+        <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="updateTPssrVessel" parameterType="TPssrVessel">
+        update t_pssr_vessel
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="vesselName != null">vessel_name = #{vesselName},</if>
+            <if test="vesselNo != null">vessel_no = #{vesselNo},</if>
+            <if test="checked != null">checked = #{checked},</if>
+            <if test="require != null">require = #{require},</if>
+            <if test="validity != null">validity = #{validity},</if>
+            <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
+            <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="subId != null">sub_id = #{subId},</if>
+            <if test="approveId != null">approve_id = #{approveId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTPssrVesselById" parameterType="Long">
+        update t_pssr_vessel set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTPssrVesselByIds" parameterType="String">
+        update t_pssr_vessel set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="deleteTPssrVesselBySubId" parameterType="Long">
+        update t_pssr_vessel set del_flag = 2 where sub_id = #{subId}
+    </update>
+
+    <update id="updateTPssrVesselByIds" parameterType="TPssrVessel">
+        update t_pssr_vessel
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
+            <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

master/src/main/resources/mybatis/sems/TSpecdevYlrqMapper.xml

@@ -525,4 +525,67 @@
         </trim>
         where id = #{id}
     </update>
+
+    <select id="selectTSpecdevYlrqListForPssr" parameterType="Integer" resultMap="TSpecdevYlrqResult">
+        select d.id,
+        d.plant_code,
+        d.unit,
+        d.devname,
+        d.factory_no,
+        d.devno,
+        d.submitdate,
+        d.status,
+        d.del_flag,
+        d.creater_code,
+        d.createdate,
+        d.updater_code,
+        d.updatedate,
+        d.dept_id,
+        d.remarks,
+        d.remarks2,
+        d.approve_status,
+        d.regno,
+        d.useno,
+        d.warn_date,
+        d.warn_cycle,
+        d.next_warn_date,
+        d.warn_flag,
+        d.plant_maint,
+        d.engineer,
+        d.vessel_type,
+        d.is_key,
+        d.create_unit,
+        d.nation,
+        d.out_size,
+        d.material,
+        d.medium,
+        d.des_pressure,
+        d.des_temp,
+        d.opt_pressure,
+        d.opt_temp,
+        d.check_unit,
+        d.report_no,
+        d.is_danger,
+        d.is_overlife,
+        d.safe_class,
+        d.approve_time,
+        d.change_time,
+        d.des_year,
+        d.year_warn_date,
+        d.check_conclusion,
+        d.year_next_warn_date,
+        d.year_report_no,
+        d.is_repeat
+        from t_specdev_ylrq d
+        <where>
+            <if test="plantCode != null  and plantCode != ''">and plant_code = #{plantCode} </if>
+            <if test="unit != null  and unit != ''">and unit like concat(concat('%', #{unit}), '%') </if>
+            <if test="devname != null  and devname != ''">and devname like concat(concat('%', #{devname}), '%')</if>
+            <if test="devno != null  and devno != ''">and devno like concat(concat('%', #{devno}), '%') </if>
+            <if test="submitdate != null ">and submitdate = #{submitdate}</if>
+            and DEL_FLAG = 0
+            and STATUS = 1
+        </where>
+        order by d.plant_code asc
+    </select>
 </mapper>

ui/src/api/pssr/approve.js

@@ -68,3 +68,13 @@ export function handlePssrApprove(data) {
     data: data
   })
 }
+
+
+// pssr经理处理审批
+export function handleMgrApprove(data) {
+  return request({
+    url: '/pssr/approve/handleMgrApprove',
+    method: 'put',
+    data: data
+  })
+}

ui/src/api/pssr/pipe.js

@@ -8,6 +8,23 @@ export function listPipe(query) {
     params: query
   })
 }
+// 确认PIPE完成确认清单
+export function handleConfirmPipe(data) {
+  return request({
+    url: '/pssr/pipe/confirmPipe',
+    method: 'put',
+    data: data
+  })
+}
+
+// 驳回PIPE完成确认清单
+export function handleTurnDownPipe(data) {
+  return request({
+    url: '/pssr/pipe/turnDownPipe',
+    method: 'put',
+    data: data
+  })
+}
 
 // 查询管道列表
 export function syncPipe(query) {

ui/src/api/pssr/subcontent.js

@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+// 驳回开车条件确认列表
+export function handleTurnDownSubcontent(data) {
+  return request({
+    url: '/pssr/subcontent/turnDownSubcontent',
+    method: 'put',
+    data: data
+  })
+}
+
 // 查询开车条件确认列表
 export function listSubcontent(query) {
   return request({
@@ -50,4 +59,4 @@ export function exportSubcontent(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/api/pssr/vessel.js

@@ -0,0 +1,90 @@
+import request from '@/utils/request'
+
+
+// 确认VESSEL完成确认清单
+export function handleConfirmVessel(data) {
+  return request({
+    url: '/pssr/vessel/confirmVessel',
+    method: 'put',
+    data: data
+  })
+}
+
+// 驳回VESSEL完成确认清单
+export function handleTurnDownVessel(data) {
+  return request({
+    url: '/pssr/vessel/turnDownVessel',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询管道列表
+export function syncVessel(query) {
+  return request({
+    url: '/pssr/vessel/syncVessel',
+    method: 'get',
+    params: query
+  })
+}
+
+// 修改管道
+export function updateVesselBatch(data) {
+  return request({
+    url: '/pssr/vessel/editBatch',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询压力容器列表
+export function listVessel(query) {
+  return request({
+    url: '/pssr/vessel/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询压力容器详细
+export function getVessel(id) {
+  return request({
+    url: '/pssr/vessel/' + id,
+    method: 'get'
+  })
+}
+
+// 新增压力容器
+export function addVessel(data) {
+  return request({
+    url: '/pssr/vessel',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改压力容器
+export function updateVessel(data) {
+  return request({
+    url: '/pssr/vessel',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除压力容器
+export function delVessel(id) {
+  return request({
+    url: '/pssr/vessel/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出压力容器
+export function exportVessel(query) {
+  return request({
+    url: '/pssr/vessel/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/router/index.js

@@ -657,7 +657,7 @@ export const constantRoutes = [
         path: 'subcontent/:aboveallId',
         component: () => import('@/views/pssr/subcontent'),
         name: 'Subcontent',
-        meta: {title: '开车条件检查内容', noCache: false},
+        meta: {title: '开车条件检查内容', noCache: true},
         hidden: true
       },
       {

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

@@ -1,6 +1,10 @@
 <template>
   <div>
-    <subcontent :aboveall-id="aboveallId"/>
+    <subcontent :aboveall-id="Number(aboveallId)" :is-approve="Number(2)" :client-height="Number(350)"/>
+    <div  style="text-align: center">
+      <el-button v-if="!this.taskForm.taskId == ''" type="primary"
+                 @click="dataFormSubmit(0)">通过</el-button>
+    </div>
     <el-card shadow="always" class="mb20 mt20 mr20 m20">
       <div slot="header" class="clearfix">
         <span>流转详情</span>
@@ -22,7 +26,7 @@
 
 <script>
 import {getHistorylist} from "@/api/ehs/approvedanger";
-import {handlePssrApprove, listApprove} from "@/api/pssr/approve";
+import {handleMgrApprove, listApprove} from "@/api/pssr/approve";
 import Subcontent from "@/views/pssr/subcontent/index.vue";
 
 export default {
@@ -60,7 +64,7 @@ export default {
   },
   created() {
     console.log(this.$route)
-    this.init(this.$route.query.aboveallId,this.$route.query.taskId,this.$route.query.processId, this.$route.query.taskName)
+    this.init(this.$route.query.aboveallId, this.$route.query.taskId, this.$route.query.processId, this.$route.query.taskName)
   },
   methods: {
     init(id, taskId, processId, taskName) {
@@ -75,7 +79,6 @@ export default {
         this.taskForm.tPssrApprove = res.rows[0];
         console.log(this.taskForm)
       })
-      console.log(this.isApprove)
     },
     getHistorylist() {
       getHistorylist({processId: this.taskForm.processId}).then(response => {
@@ -89,7 +92,7 @@ export default {
     },
     dataFormSubmit(val) {
       this.taskForm.condition = val;
-      handlePssrApprove(this.taskForm).then(res => {
+      handleMgrApprove(this.taskForm).then(res => {
         this.msgSuccess("审核成功");
         this.visible = false;
         this.$emit('refreshDataList')

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

@@ -458,10 +458,7 @@ export default {
             this.$refs.dsdtNopassDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
           })
         } else if (row.processName.includes("PSSR装置经理审批")) {
-          this.pssrMgrApproveDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.pssrMgrApproveDetail.init(row.approveObject.aboveallId, row.taskId, row.processId, row.taskName)
-          })
+          this.$router.push({name: 'mgrApprove', query: {aboveallId:row.approveObject.aboveallId, taskId:row.taskId, processId:row.processId, taskName:row.taskName}});
         } else if (row.processName.includes("PSSR") && !row.processName.includes("PSSR装置经理审批")) {
           this.pssrApproveDetailVisible = true
           this.$nextTick(() => {

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

@@ -293,10 +293,7 @@
             this.$refs.dsdtNopassDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
           })
         } else if (row.processName.includes("PSSR装置经理审批")) {
-          this.pssrMgrApproveDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.pssrMgrApproveDetail.init(row.approveObject.aboveallId, row.taskId, row.processId, row.taskName)
-          })
+          this.$router.push({name: 'mgrApprove', query: {aboveallId:row.approveObject.aboveallId, taskId:row.taskId, processId:row.processId, taskName:row.taskName}});
         } else if (row.processName.includes("PSSR") && !row.processName.includes("PSSR装置经理审批")) {
           this.pssrApproveDetailVisible = true
           this.$nextTick(() => {

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

@@ -28,43 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="已经检验(是/否)" prop="checked">
-        <el-input
-          v-model="queryParams.checked"
-          placeholder="请输入已经检验(是/否)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="符合要求(是/否)" prop="require">
-        <el-input
-          v-model="queryParams.require"
-          placeholder="请输入符合要求(是/否)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="在有效期内(是/否)" prop="validity">
-        <el-input
-          v-model="queryParams.validity"
-          placeholder="请输入在有效期内(是/否)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="时间" prop="confirmationDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.confirmationDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择时间">
-        </el-date-picker>
-      </el-form-item>
-
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -79,7 +42,9 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['pssr:pipe:add']"
-        >新增</el-button>
+          v-if="isApprove==0"
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -89,7 +54,9 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['pssr:pipe:edit']"
-        >修改</el-button>
+          v-if="isApprove==0"
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -99,34 +66,31 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['pssr:pipe:remove']"
-        >删除</el-button>
+          v-if="isApprove==0"
+        >删除
+        </el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['pssr:pipe:edit']"
-            >导入</el-button>
-        </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          icon="el-icon-download"
+          type="info"
+          icon="el-icon-upload2"
           size="mini"
-          @click="handleExport"
-          v-hasPermi="['pssr:pipe:export']"
-        >导出</el-button>
+          @click="handleImport"
+          v-hasPermi="['pssr:pipe:edit']"
+          v-if="isApprove==0"
+        >导入
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          icon="el-icon-plus"
+          type="warning"
+          icon="el-icon-download"
           size="mini"
-          @click="handleSync"
-          v-hasPermi="['pssr:pipe:add']"
-        >同步特种设备数据</el-button>
+          @click="handleExport"
+          v-hasPermi="['pssr:pipe:export']"
+          v-if="isApprove==0"
+        >导出
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -135,7 +99,7 @@
           size="mini"
           @click="handleApprove"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:overhaulExchanger:edit']"
+          v-hasPermi="['pssr:pipe:edit']"
         >发起审批
         </el-button>
       </el-col>
@@ -144,12 +108,34 @@
           type="primary"
           icon="el-icon-check"
           size="mini"
-          v-if="isApprove==1"
+          v-if="isApprove==4||isApprove==5"
           @click="handleConfirmApprove"
-          v-hasPermi="['pssr:overhaulExchanger:edit']"
+          v-hasPermi="['pssr:pipe:edit']"
         >确认
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-refresh-left"
+          size="mini"
+          v-if="isApprove==2"
+          :disabled="multiple"
+          @click="handleTurnDown"
+          v-hasPermi="['pssr:pipe:edit']"
+        >驳回
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleSync"
+          v-hasPermi="['pssr:pipe:add']"
+        >同步特种设备数据
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -158,28 +144,50 @@
           :disabled="multiple"
           @click="handleBatch"
           v-hasPermi="['pssr:pipe:edit']"
-        >批量操作</el-button>
+        >批量操作
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="pipeList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="pipeList" @selection-change="handleSelectionChange" :height="clientHeight"
+              border>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="100">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
+          <el-tag v-if="scope.row.approveStatus==1" type="warning">待确认</el-tag>
+          <el-tag v-if="scope.row.approveStatus==3" type="success">已确认1</el-tag>
+          <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="管道名称" align="center" prop="pipelineName" :show-overflow-tooltip="true"/>
       <el-table-column label="管道编号" align="center" prop="pipelineNo" :show-overflow-tooltip="true"/>
-      <el-table-column label="已经检验(是/否)" align="center" prop="checked" :show-overflow-tooltip="true"/>
-      <el-table-column label="符合要求(是/否)" align="center" prop="require" :show-overflow-tooltip="true"/>
-      <el-table-column label="在有效期内(是/否)" align="center" prop="validity" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true"/>
+      <el-table-column label="检查内容" align="center">
+        <el-table-column label="已经检验(是/否)" align="center" prop="checked" :show-overflow-tooltip="true"/>
+        <el-table-column label="符合要求(是/否)" align="center" prop="require" :show-overflow-tooltip="true"/>
+        <el-table-column label="在有效期内(是/否)" align="center" prop="validity" :show-overflow-tooltip="true"/>
+      </el-table-column>
+      <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true"
+                       width="150">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirmer1) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true"
+                       width="150">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirmer2) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="确认时间" align="center" prop="confirmationDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{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" width="120" v-if="isApprove==0" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -187,14 +195,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['pssr:pipe:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['pssr:pipe:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -211,39 +221,51 @@
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="单元号" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单元号" />
+          <el-input v-model="form.unit" placeholder="请输入单元号"/>
         </el-form-item>
         <el-form-item label="管道名称" prop="pipelineName">
-          <el-input v-model="form.pipelineName" placeholder="请输入管道名称" />
+          <el-input v-model="form.pipelineName" placeholder="请输入管道名称"/>
         </el-form-item>
         <el-form-item label="管道编号" prop="pipelineNo">
-          <el-input v-model="form.pipelineNo" placeholder="请输入管道编号" />
+          <el-input v-model="form.pipelineNo" placeholder="请输入管道编号"/>
         </el-form-item>
         <el-form-item label="已经检验(是/否)" prop="checked">
-          <el-input v-model="form.checked" placeholder="请输入已经检验(是/否)" />
+          <el-input v-model="form.checked" placeholder="请输入已经检验(是/否)"/>
         </el-form-item>
         <el-form-item label="符合要求(是/否)" prop="require">
-          <el-input v-model="form.require" placeholder="请输入符合要求(是/否)" />
+          <el-input v-model="form.require" placeholder="请输入符合要求(是/否)"/>
         </el-form-item>
         <el-form-item label="在有效期内(是/否)" prop="validity">
-          <el-input v-model="form.validity" placeholder="请输入在有效期内(是/否)" />
+          <el-input v-model="form.validity" placeholder="请输入在有效期内(是/否)"/>
         </el-form-item>
         <el-form-item label="确认人1" prop="confirmer1">
-          <el-input v-model="form.confirmer1" placeholder="请输入确认人1" />
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="确认人2" prop="confirmer2">
-          <el-input v-model="form.confirmer2" placeholder="请输入确认人2" />
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="时间确认" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择时间">
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" />
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -254,15 +276,27 @@
 
     <!-- 添加或修改管道对话框 -->
     <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
-      <el-form ref="form" :model="form"  label-width="80px">
+      <el-form ref="form" :model="form" label-width="80px">
         <el-form-item>
           <span>已选择 {{ ids.length }} 条数据</span>
         </el-form-item>
         <el-form-item label="确认人1" prop="confirmer1">
-          <el-input v-model="form.confirmer1" placeholder="请输入确认人1" />
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="确认人2" prop="confirmer2">
-          <el-input v-model="form.confirmer2" placeholder="请输入确认人2" />
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="时间确认" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
@@ -273,7 +307,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" />
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -281,52 +315,66 @@
         <el-button @click="cancelBatch">取 消</el-button>
       </div>
     </el-dialog>
-      <!-- 用户导入对话框 -->
-      <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处，或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
+               append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-checkbox v-model="upload.updateSupport"/>
+          是否更新已经存在的用户数据
+          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listPipe,syncPipe, getPipe, delPipe, addPipe, updatePipe, exportPipe, importTemplate,updatePipeBatch} from "@/api/pssr/pipe";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addPipe,
+  delPipe,
+  exportPipe,
+  getPipe,
+  handleConfirmPipe,
+  handleTurnDownPipe,
+  importTemplate,
+  listPipe,
+  syncPipe,
+  updatePipe,
+  updatePipeBatch
+} from "@/api/pssr/pipe";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {handleConfirmApprove} from "@/api/pssr/blind";
+import {listUserNoPage} from "@/api/system/user";
 
 export default {
-  dicts:['pssr_approve_status'],
+  dicts: ['pssr_approve_status'],
   name: "Pipe",
-  components: { Treeselect },
+  components: {Treeselect},
   props: {
     subId: {
       type: Number,
@@ -339,6 +387,7 @@ export default {
   },
   data() {
     return {
+      userOptions: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -357,25 +406,25 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
-      clientHeight:300,
+      clientHeight: 300,
       // 是否显示弹出层
       open: false,
       openBatch: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层（用户导入）
-            open: false,
-            // 弹出层标题（用户导入）
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/pssr/pipe/importData"
-        },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/pssr/pipe/importData"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -401,26 +450,25 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {}
     };
   },
   watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
-    const id = this.$route.params.subId
-    const serialNumber = this.$route.params.serialNumber
-    this.subId = id
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight - 350
-      })
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 350
+    })
     this.getList();
     this.getTreeselect();
+    listUserNoPage({}).then(res => {
+      this.userOptions = res.data
+    });
   },
   methods: {
     /** 查询管道列表 */
@@ -432,12 +480,12 @@ export default {
         this.loading = false;
       });
     },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -481,7 +529,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -490,7 +538,7 @@ export default {
       this.open = true;
       this.title = "添加管道";
     },
-    handleBatch(){
+    handleBatch() {
       this.reset();
       this.openBatch = true
     },
@@ -503,17 +551,17 @@ export default {
     submitFormBatch() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-            this.form.ids = this.ids
-            updatePipeBatch(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+          this.form.ids = this.ids
+          updatePipeBatch(this.form).then(response => {
+            this.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
         }
       });
     },
     //同步特种设备数据
-    handleSync(){
+    handleSync() {
       this.loading = true;
       syncPipe(this.queryParams).then(response => {
         this.pipeList = response.rows;
@@ -555,15 +603,55 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delPipe(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delPipe(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有管道数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportPipe(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        this.download(response.msg);
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
     },
     /** 确认按钮操作*/
     handleApprove() {
@@ -572,59 +660,45 @@ export default {
         this.getList();
       })
     },
-    checkSelectable(row) {
-      return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0
-    },
     handleConfirmApprove() {
       let data = {
         ids: this.ids,
         subId: this.subId,
+        taskType: this.isApprove
       }
-      handleConfirmApprove(data).then(res => {
+      handleConfirmPipe(data).then(res => {
         this.msgSuccess("确认成功");
         this.getList()
+        this.$emit('refreshHisList');
       })
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有管道数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportPipe(queryParams);
-        }).then(response => {
-          this.download(response.msg);
+    handleTurnDown(val) {
+      this.$prompt('请输入驳回原因', '提示', {
+        confirmButtonText: '确认驳回',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
+        let data = {
+          ids: this.ids,
+          subId: this.subId,
+          remarks: value
+        }
+        handleTurnDownPipe(data).then(res => {
+          this.msgSuccess("驳回成功");
         })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消驳回'
+        });
+      });
     },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
+    userFormat(userId) {
+      for (let item of this.userOptions) {
+        if (item.userId == userId) {
+          return item.nickName
+        }
       }
+    },
   }
 };
 </script>

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

@@ -77,6 +77,18 @@
               >导入
               </el-button>
             </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-refresh-left"
+          size="mini"
+          v-if="isApprove==2"
+          :disabled="multiple"
+          @click="handleTurnDown"
+          v-hasPermi="['pssr:subcontent:edit']"
+        >驳回
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -91,11 +103,11 @@
     </el-row>
 
     <el-table v-loading="loading" :data="subcontentList" @selection-change="handleSelectionChange"
-              :height="clientHeight" border>
+              :height="ch" border>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" align="center" prop="serialNumber" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="项目" align="center" prop="item" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="开车条件检查内容" align="center" prop="content" :show-overflow-tooltip="true" width="480"/>
+      <el-table-column label="开车条件检查内容" align="center" prop="content" :show-overflow-tooltip="true" width="700"/>
       <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="110">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus"
@@ -103,7 +115,7 @@
         </template>
       </el-table-column>
       <el-table-column label="确认人" align="center" prop="confirmName" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="180">
+      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -211,7 +223,7 @@ import {
   addSubcontent,
   delSubcontent,
   exportSubcontent,
-  getSubcontent,
+  getSubcontent, handleTurnDownSubcontent,
   importTemplate,
   listSubcontent,
   updateSubcontent
@@ -221,6 +233,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {handleTurnDownPumpCleaning} from "@/api/pssr/pumpCleaning";
 
 export default {
   dicts: ['pssr_approve_status'],
@@ -236,9 +249,14 @@ export default {
       type: Number,
       default: 0
     },
+    clientHeight: {
+      type: Number,
+      default: 300
+    }
   },
   data() {
     return {
+      ch :this.clientHeight,
       userOptions: [],
       // 遮罩层
       loading: true,
@@ -258,7 +276,6 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
-      clientHeight: 300,
       // 是否显示弹出层
       open: false,
       // 用户导入参数
@@ -309,7 +326,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
+      this.ch = document.body.clientHeight - 250
     })
     const id = this.$route.params.aboveallId || this.aboveallId
     if (typeof id !== 'undefined') {
@@ -322,6 +339,26 @@ export default {
     });
   },
   methods: {
+    handleTurnDown(val) {
+      this.$prompt('请输入驳回原因', '提示', {
+        confirmButtonText: '确认驳回',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
+        let data = {
+          ids: this.ids,
+          aboveallId: this.aboveallId,
+          remarks: value
+        }
+        handleTurnDownSubcontent(data).then(res => {
+          this.msgSuccess("驳回成功");
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消驳回'
+        });
+      });
+    },
     getTagType(val) {
       if (val == 0) {
         return ''

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

@@ -118,7 +118,14 @@
       <frame :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='tzsb'">
-      <pipe :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="压力管道" name="first">
+          <pipe :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+        </el-tab-pane>
+        <el-tab-pane label="压力容器" name="second">
+          <vessel :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+        </el-tab-pane>
+      </el-tabs>
     </div>
     <div v-if="sn=='ybjy'">
       <instrument-calibration :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
@@ -205,10 +212,12 @@ import Power from "@/views/pssr/power/index.vue";
 import Moc from "@/views/pssr/moc/index.vue";
 import Measure from "@/views/pssr/measure/index.vue";
 import MaterialRaw from "@/views/pssr/materialRaw/index.vue";
+import Vessel from "@/views/pssr/vessel/index.vue";
 
 export default {
   name: "Subitem",
   components: {
+    Vessel,
     MaterialRaw,
     Measure,
     Moc,
@@ -270,13 +279,8 @@ export default {
   },
   created() {
     this.sn = ''
-
-
     const id = this.$route.params.subId
     const serialNumber = this.$route.params.serialNumber
-
-
-
     if (typeof id !== 'undefined') {
       this.si = id
     } else {

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

@@ -0,0 +1,714 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="单元号" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入单元号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="容器名称" prop="vesselName">
+        <el-input
+          v-model="queryParams.vesselName"
+          placeholder="请输入容器名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="容器编号" prop="vesselNo">
+        <el-input
+          v-model="queryParams.vesselNo"
+          placeholder="请输入容器编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['pssr:vessel:add']"
+          v-if="isApprove==0"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['pssr:vessel:edit']"
+          v-if="isApprove==0"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['pssr:vessel:remove']"
+          v-if="isApprove==0"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['pssr:vessel:edit']"
+          v-if="isApprove==0"
+        >导入
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['pssr:vessel:export']"
+          v-if="isApprove==0"
+        >导出
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-s-promotion"
+          size="mini"
+          @click="handleApprove"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:vessel:edit']"
+        >发起审批
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-check"
+          size="mini"
+          v-if="isApprove==4||isApprove==5"
+          @click="handleConfirmApprove"
+          v-hasPermi="['pssr:vessel:edit']"
+        >确认
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-refresh-left"
+          size="mini"
+          v-if="isApprove==2"
+          :disabled="multiple"
+          @click="handleTurnDown"
+          v-hasPermi="['pssr:vessel:edit']"
+        >驳回
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleSync"
+          v-hasPermi="['pssr:vessel:add']"
+        >同步特种设备数据
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-hasPermi="['pssr:vessel:edit']"
+        >批量操作
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="vesselList" @selection-change="handleSelectionChange" :height="clientHeight"
+              border>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="100">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
+          <el-tag v-if="scope.row.approveStatus==1" type="warning">待确认</el-tag>
+          <el-tag v-if="scope.row.approveStatus==3" type="success">已确认1</el-tag>
+          <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="容器名称" align="center" prop="vesselName" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="容器编号" align="center" prop="vesselNo" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="检查内容" align="center">
+        <el-table-column label="已经检验(是/否)" align="center" prop="checked" :show-overflow-tooltip="true"
+                         width="180"/>
+        <el-table-column label="符合要求(是/否)" align="center" prop="require" :show-overflow-tooltip="true"
+                         width="180"/>
+        <el-table-column label="在有效期内(是/否)" align="center" prop="validity" :show-overflow-tooltip="true"
+                         width="180"/>
+      </el-table-column>
+      <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true"
+                       width="150">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirmer1) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true"
+                       width="150">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirmer2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="时间" align="center" prop="confirmationDate" width="150">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.confirmationDate, '{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" v-if="isApprove==0" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['pssr:vessel:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['pssr:vessel:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改压力容器对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="单元号" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单元号"/>
+        </el-form-item>
+        <el-form-item label="容器名称" prop="vesselName">
+          <el-input v-model="form.vesselName" placeholder="请输入容器名称"/>
+        </el-form-item>
+        <el-form-item label="容器编号" prop="vesselNo">
+          <el-input v-model="form.vesselNo" placeholder="请输入容器编号"/>
+        </el-form-item>
+        <el-form-item label="已经检验(是/否)">
+          <el-radio-group v-model="form.checked">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="符合要求(是/否)">
+          <el-radio-group v-model="form.require">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="在有效期内(是/否)">
+          <el-radio-group v-model="form.validity">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-checkbox v-model="upload.updateSupport"/>
+          是否更新已经存在的用户数据
+          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>  <!-- 添加或修改管道对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间确认" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  addVessel,
+  delVessel,
+  exportVessel,
+  getVessel,
+  handleConfirmVessel,
+  handleTurnDownVessel,
+  importTemplate,
+  listVessel,
+  syncVessel,
+  updateVessel,
+  updateVesselBatch
+} from "@/api/pssr/vessel";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {doApprove} from "@/api/pssr/approve";
+import {listUserNoPage} from "@/api/system/user";
+
+export default {
+  name: "Vessel",
+  components: {Treeselect},
+  props: {
+    subId: {
+      type: Number,
+      default: 0
+    },
+    isApprove: {
+      type: Number,
+      default: 0
+    },
+  },
+  data() {
+    return {
+      userOptions: [],
+      openBatch: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 压力容器表格数据
+      vesselList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight: 300,
+      // 是否显示弹出层
+      open: false,
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/pssr/vessel/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        approveStatus: null,
+        unit: null,
+        vesselName: null,
+        vesselNo: null,
+        checked: null,
+        require: null,
+        validity: null,
+        confirmer1: null,
+        confirmer2: null,
+        confirmationDate: null,
+        remarks: null,
+        subId: this.subId,
+        approveId: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {}
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 250
+    })
+    this.getList();
+    this.getTreeselect();
+    listUserNoPage({}).then(res => {
+      this.userOptions = res.data
+    });
+  },
+  methods: {
+    /** 查询压力容器列表 */
+    getList() {
+      this.loading = true;
+      listVessel(this.queryParams).then(response => {
+        this.vesselList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        approveStatus: 0,
+        unit: null,
+        vesselName: null,
+        vesselNo: null,
+        checked: null,
+        require: null,
+        validity: null,
+        confirmer1: null,
+        confirmer2: null,
+        confirmationDate: null,
+        remarks: null,
+        subId: this.subId,
+        id: null,
+        approveId: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加压力容器";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getVessel(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改压力容器";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateVessel(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addVessel(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delVessel(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有压力容器数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportVessel(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        this.download(response.msg);
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    /** 确认按钮操作*/
+    handleApprove() {
+      doApprove(this.subId).then(res => {
+        this.msgSuccess("已发起确认流程");
+        this.getList();
+      })
+    },
+    handleConfirmApprove() {
+      let data = {
+        ids: this.ids,
+        subId: this.subId,
+        taskType: this.isApprove
+      }
+      handleConfirmVessel(data).then(res => {
+        this.msgSuccess("确认成功");
+        this.getList()
+        this.$emit('refreshHisList');
+      })
+    },
+    handleTurnDown(val) {
+      this.$prompt('请输入驳回原因', '提示', {
+        confirmButtonText: '确认驳回',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
+        let data = {
+          ids: this.ids,
+          subId: this.subId,
+          remarks: value
+        }
+        handleTurnDownVessel(data).then(res => {
+          this.msgSuccess("驳回成功");
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消驳回'
+        });
+      });
+    },
+    userFormat(userId) {
+      for (let item of this.userOptions) {
+        if (item.userId == userId) {
+          return item.nickName
+        }
+      }
+    },
+    handleBatch() {
+      this.reset();
+      this.openBatch = true
+    },
+    // 取消按钮
+    cancelBatch() {
+      this.openBatch = false;
+      this.reset();
+    },
+    /** 提交按钮 */
+    submitFormBatch() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.ids = this.ids
+          updateVesselBatch(this.form).then(response => {
+            this.msgSuccess("修改成功");
+            this.openBatch = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    //同步特种设备数据
+    handleSync() {
+      this.loading = true;
+      syncVessel(this.queryParams).then(response => {
+        this.pipeList = response.rows;
+        this.total = response.total;
+        this.getList();
+      });
+    },
+  }
+};
+</script>