PSSR审批确认人验证

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

@@ -158,6 +158,27 @@ public class TPssrAirtightController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:airtight:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrAirtight tPssrAirtight) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrAirtight.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrAirtight.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrAirtight.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrAirtight> list = tPssrAirtightService.selectTPssrAirtightList(tPssrAirtight);
         list.forEach(item -> {
@@ -274,16 +295,19 @@ public class TPssrAirtightController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrAirtight lock = new TPssrAirtight();
         if (tPssrAirtight.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrAirtight.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrAirtight.getIds() != null && tPssrAirtight.getIds().length > 0) {
@@ -299,7 +323,6 @@ public class TPssrAirtightController extends BaseController {
                 tPssrAirtightService.updateTPssrAirtight(item);
             }
         } else {
-            TPssrAirtight lock = new TPssrAirtight();
             lock.setSubId(tPssrAirtight.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrAirtight item : tPssrAirtightService.selectTPssrAirtightList(lock)) {

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

@@ -150,6 +150,27 @@ public class TPssrAnalyzerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:analyzer:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrAnalyzer tPssrAnalyzer) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrAnalyzer.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrAnalyzer.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrAnalyzer.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrAnalyzer> list = tPssrAnalyzerService.selectTPssrAnalyzerList(tPssrAnalyzer);
         list.forEach(item -> {
@@ -308,16 +329,19 @@ public class TPssrAnalyzerController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrAnalyzer lock = new TPssrAnalyzer();
         if (tPssrAnalyzer.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrAnalyzer.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrAnalyzer.getIds() != null && tPssrAnalyzer.getIds().length > 0) {
@@ -330,7 +354,6 @@ public class TPssrAnalyzerController extends BaseController {
                 tPssrAnalyzerService.updateTPssrAnalyzer(item);
             }
         } else {
-            TPssrAnalyzer lock = new TPssrAnalyzer();
             lock.setSubId(tPssrAnalyzer.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrAnalyzer item : tPssrAnalyzerService.selectTPssrAnalyzerList(lock)) {

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

@@ -168,6 +168,27 @@ public class TPssrBlindController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:blind:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrBlind tPssrBlind) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrBlind.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrBlind.setInConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrBlind.setInConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrBlind> list = tPssrBlindService.selectTPssrBlindList(tPssrBlind);
         if (list.size() > 0) {
@@ -384,8 +405,10 @@ public class TPssrBlindController extends BaseController {
             blind.setCurrentUser(getUserId().toString());
             if (tPssrBlind.getTaskType() == 4) {
                 blind.setApproveStatus(1L);
+                blind.setInConfirm1(getUserId().toString());
             } else if (tPssrBlind.getTaskType() == 5) {
                 blind.setApproveStatus(3L);
+                blind.setInConfirm2(getUserId().toString());
             }
             for (TPssrBlind item : tPssrBlindService.selectTPssrBlindList(blind)) {
                 if (tPssrBlind.getTaskType() == 4) {

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

@@ -161,6 +161,27 @@ public class TPssrCircuitController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:circuit:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrCircuit tPssrCircuit) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrCircuit.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrCircuit.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrCircuit.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrCircuit> list = tPssrCircuitService.selectTPssrCircuitList(tPssrCircuit);
         list.forEach(item -> {
@@ -354,16 +375,19 @@ public class TPssrCircuitController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrCircuit lock = new TPssrCircuit();
         if (tPssrCircuit.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrCircuit.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrCircuit.getIds() != null && tPssrCircuit.getIds().length > 0) {
@@ -376,7 +400,6 @@ public class TPssrCircuitController extends BaseController {
                 tPssrCircuitService.updateTPssrCircuit(item);
             }
         } else {
-            TPssrCircuit lock = new TPssrCircuit();
             lock.setSubId(tPssrCircuit.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrCircuit item : tPssrCircuitService.selectTPssrCircuitList(lock)) {

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

@@ -154,6 +154,27 @@ public class TPssrCleaningController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:cleaning:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrCleaning tPssrCleaning) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrCleaning.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrCleaning.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrCleaning.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrCleaning> list = tPssrCleaningService.selectTPssrCleaningList(tPssrCleaning);
         list.forEach(item -> {
@@ -422,16 +443,19 @@ public class TPssrCleaningController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrCleaning lock = new TPssrCleaning();
         if (tPssrCleaning.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrCleaning.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrCleaning.getIds() != null && tPssrCleaning.getIds().length > 0) {
@@ -444,7 +468,6 @@ public class TPssrCleaningController extends BaseController {
                 tPssrCleaningService.updateTPssrCleaning(item);
             }
         } else {
-            TPssrCleaning lock = new TPssrCleaning();
             lock.setSubId(tPssrCleaning.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrCleaning item : tPssrCleaningService.selectTPssrCleaningList(lock)) {

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

@@ -166,6 +166,27 @@ public class TPssrFrameController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:frame:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrFrame tPssrFrame) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrFrame.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrFrame.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrFrame.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrFrame> list = tPssrFrameService.selectTPssrFrameList(tPssrFrame);
         list.forEach(item -> {
@@ -328,16 +349,19 @@ public class TPssrFrameController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrFrame lock = new TPssrFrame();
         if (tPssrFrame.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrFrame.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrFrame.getIds() != null && tPssrFrame.getIds().length > 0) {
@@ -350,7 +374,6 @@ public class TPssrFrameController extends BaseController {
                 tPssrFrameService.updateTPssrFrame(item);
             }
         } else {
-            TPssrFrame lock = new TPssrFrame();
             lock.setSubId(tPssrFrame.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrFrame item : tPssrFrameService.selectTPssrFrameList(lock)) {

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

@@ -154,6 +154,27 @@ public class TPssrFranklinismController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:franklinism:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrFranklinism tPssrFranklinism) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrFranklinism.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrFranklinism.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrFranklinism.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrFranklinism> list = tPssrFranklinismService.selectTPssrFranklinismList(tPssrFranklinism);
         list.forEach(item -> {
@@ -311,16 +332,19 @@ public class TPssrFranklinismController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrFranklinism lock = new TPssrFranklinism();
         if (tPssrFranklinism.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrFranklinism.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrFranklinism.getIds() != null && tPssrFranklinism.getIds().length > 0) {
@@ -333,7 +357,6 @@ public class TPssrFranklinismController extends BaseController {
                 tPssrFranklinismService.updateTPssrFranklinism(item);
             }
         } else {
-            TPssrFranklinism lock = new TPssrFranklinism();
             lock.setSubId(tPssrFranklinism.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrFranklinism item : tPssrFranklinismService.selectTPssrFranklinismList(lock)) {

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

@@ -146,6 +146,27 @@ public class TPssrGasdetectorController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:gasdetector:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrGasdetector tPssrGasdetector) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrGasdetector.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrGasdetector.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrGasdetector.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrGasdetector> list = tPssrGasdetectorService.selectTPssrGasdetectorList(tPssrGasdetector);
         list.forEach(item -> {
@@ -304,16 +325,19 @@ public class TPssrGasdetectorController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrGasdetector lock = new TPssrGasdetector();
         if (tPssrGasdetector.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrGasdetector.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrGasdetector.getIds() != null && tPssrGasdetector.getIds().length > 0) {
@@ -326,7 +350,6 @@ public class TPssrGasdetectorController extends BaseController {
                 tPssrGasdetectorService.updateTPssrGasdetector(item);
             }
         } else {
-            TPssrGasdetector lock = new TPssrGasdetector();
             lock.setSubId(tPssrGasdetector.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrGasdetector item : tPssrGasdetectorService.selectTPssrGasdetectorList(lock)) {

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

@@ -154,6 +154,27 @@ public class TPssrHygieneController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:hygiene:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrHygiene tPssrHygiene) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrHygiene.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrHygiene.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrHygiene.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrHygiene> list = tPssrHygieneService.selectTPssrHygieneList(tPssrHygiene);
         list.forEach(item -> {
@@ -312,16 +333,19 @@ public class TPssrHygieneController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrHygiene lock = new TPssrHygiene();
         if (tPssrHygiene.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrHygiene.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrHygiene.getIds() != null && tPssrHygiene.getIds().length > 0) {
@@ -334,7 +358,6 @@ public class TPssrHygieneController extends BaseController {
                 tPssrHygieneService.updateTPssrHygiene(item);
             }
         } else {
-            TPssrHygiene lock = new TPssrHygiene();
             lock.setSubId(tPssrHygiene.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrHygiene item : tPssrHygieneService.selectTPssrHygieneList(lock)) {

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

@@ -162,6 +162,27 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrInstrumentCalibration tPssrInstrumentCalibration) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrInstrumentCalibration.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrInstrumentCalibration.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrInstrumentCalibration.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrInstrumentCalibration> list = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(tPssrInstrumentCalibration);
         list.forEach(item -> {

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

@@ -150,6 +150,27 @@ public class TPssrLaboratoryController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:laboratory:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrLaboratory tPssrLaboratory) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrLaboratory.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrLaboratory.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrLaboratory.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrLaboratory> list = tPssrLaboratoryService.selectTPssrLaboratoryList(tPssrLaboratory);
         list.forEach(item -> {
@@ -311,16 +332,19 @@ public class TPssrLaboratoryController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrLaboratory lock = new TPssrLaboratory();
         if (tPssrLaboratory.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrLaboratory.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrLaboratory.getIds() != null && tPssrLaboratory.getIds().length > 0) {
@@ -333,7 +357,6 @@ public class TPssrLaboratoryController extends BaseController {
                 tPssrLaboratoryService.updateTPssrLaboratory(item);
             }
         } else {
-            TPssrLaboratory lock = new TPssrLaboratory();
             lock.setSubId(tPssrLaboratory.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrLaboratory item : tPssrLaboratoryService.selectTPssrLaboratoryList(lock)) {

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

@@ -72,6 +72,27 @@ public class TPssrLightingController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:lighting:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrLighting tPssrLighting) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrLighting.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrLighting.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrLighting.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrLighting> list = tPssrLightingService.selectTPssrLightingList(tPssrLighting);
         list.forEach(item -> {
@@ -237,16 +258,19 @@ public class TPssrLightingController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrLighting lock = new TPssrLighting();
         if (tPssrLighting.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrLighting.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrLighting.getIds() != null && tPssrLighting.getIds().length > 0) {
@@ -259,7 +283,6 @@ public class TPssrLightingController extends BaseController {
                 tPssrLightingService.updateTPssrLighting(item);
             }
         } else {
-            TPssrLighting lock = new TPssrLighting();
             lock.setSubId(tPssrLighting.getSubId());
             lock.setApproveStatus(queryStatus);
             lock.setLightingType(tPssrLighting.getLightingType());

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

@@ -80,6 +80,27 @@ public class TPssrLockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:lock:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrLock tPssrLock) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrLock.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrLock.setLockeder(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrLock.setConfirm(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrLock> list = tPssrLockService.selectTPssrLockList(tPssrLock);
         list.forEach(item -> {
@@ -284,16 +305,19 @@ public class TPssrLockController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrLock lock = new TPssrLock();
         if (tPssrLock.getTaskType() == 4) {
             //上锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setLockeder(getUserId().toString());
         } else if (tPssrLock.getTaskType() == 5) {
             //确认人确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm(getUserId().toString());
         }
         // 修改锁开锁关状态
         if (tPssrLock.getIds() != null && tPssrLock.getIds().length > 0) {
@@ -306,7 +330,6 @@ public class TPssrLockController extends BaseController {
                 tPssrLockService.updateTPssrLock(item);
             }
         } else {
-            TPssrLock lock = new TPssrLock();
             lock.setSubId(tPssrLock.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrLock item : tPssrLockService.selectTPssrLockList(lock)) {

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

@@ -15,10 +15,10 @@ import com.ruoyi.project.pssr.mapper.TPssrMaterialMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -83,6 +83,27 @@ public class TPssrMaterialController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:material:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrMaterial tPssrMaterial) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMaterial.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrMaterial.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrMaterial.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrMaterial> list = tPssrMaterialService.selectTPssrMaterialList(tPssrMaterial);
         list.forEach(item -> {
@@ -352,6 +373,7 @@ public class TPssrMaterialController extends BaseController {
         } else {
             material.setSubId(tPssrMaterial.getSubId());
             material.setApproveStatus(1L);
+            material.setConfirm1(getUserId().toString());
             for (TPssrMaterial item : tPssrMaterialService.selectTPssrMaterialList(material)) {
                 item.setConfirmationDate(new Date());
                 item.setApproveStatus(2L);

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

@@ -14,10 +14,10 @@ import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.mapper.TPssrMaterialRawMapper;
 import com.ruoyi.project.pssr.service.*;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -64,6 +64,27 @@ public class TPssrMaterialRawController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:materialRaw:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrMaterialRaw tPssrMaterialRaw) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMaterialRaw.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrMaterialRaw.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrMaterialRaw.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrMaterialRaw> list = tPssrMaterialRawService.selectTPssrMaterialRawList(tPssrMaterialRaw);
         list.forEach(item -> {
@@ -170,6 +191,7 @@ public class TPssrMaterialRawController extends BaseController {
         } else {
             materialRaw.setSubId(tPssrMaterialRaw.getSubId());
             materialRaw.setApproveStatus(1L);
+            materialRaw.setConfirm1(getUserId().toString());
             for (TPssrMaterialRaw item : tPssrMaterialRawService.selectTPssrMaterialRawList(materialRaw)) {
                 item.setConfirmationDate(new Date());
                 item.setApproveStatus(2L);

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

@@ -18,10 +18,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -156,6 +156,27 @@ public class TPssrMeasureController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:measure:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrMeasure tPssrMeasure) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMeasure.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrMeasure.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrMeasure.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrMeasure> list = tPssrMeasureService.selectTPssrMeasureList(tPssrMeasure);
         list.forEach(item -> {

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

@@ -83,6 +83,27 @@ public class TPssrMocController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:moc:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrMoc tPssrMoc) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMoc.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrMoc.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrMoc.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrMoc> list = tPssrMocService.selectTPssrMocList(tPssrMoc);
         list.forEach(item -> {
@@ -303,16 +324,19 @@ public class TPssrMocController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrMoc lock = new TPssrMoc();
         if (tPssrMoc.getTaskType() == 4) {
             //确认人1确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrMoc.getTaskType() == 5) {
             //确认人2确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrMoc.getIds() != null && tPssrMoc.getIds().length > 0) {
@@ -325,7 +349,6 @@ public class TPssrMocController extends BaseController {
                 tPssrMocService.updateTPssrMoc(item);
             }
         } else {
-            TPssrMoc lock = new TPssrMoc();
             lock.setSubId(tPssrMoc.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrMoc item : tPssrMocService.selectTPssrMocList(lock)) {

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

@@ -149,6 +149,27 @@ public class TPssrMotorController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:motor:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrMotor tPssrMotor) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMotor.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrMotor.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrMotor.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrMotor> list = tPssrMotorService.selectTPssrMotorList(tPssrMotor);
         list.forEach(item -> {
@@ -306,16 +327,19 @@ public class TPssrMotorController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrMotor lock = new TPssrMotor();
         if (tPssrMotor.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrMotor.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrMotor.getIds() != null && tPssrMotor.getIds().length > 0) {
@@ -328,7 +352,6 @@ public class TPssrMotorController extends BaseController {
                 tPssrMotorService.updateTPssrMotor(item);
             }
         } else {
-            TPssrMotor lock = new TPssrMotor();
             lock.setSubId(tPssrMotor.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrMotor item : tPssrMotorService.selectTPssrMotorList(lock)) {

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

@@ -156,6 +156,27 @@ public class TPssrNitrogenController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:nitrogen:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrNitrogen tPssrNitrogen) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrNitrogen.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrNitrogen.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrNitrogen.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrNitrogen> list = tPssrNitrogenService.selectTPssrNitrogenList(tPssrNitrogen);
         list.forEach(item -> {
@@ -362,16 +383,19 @@ public class TPssrNitrogenController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrNitrogen lock = new TPssrNitrogen();
         if (tPssrNitrogen.getTaskType() == 4) {
             //确认人1确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrNitrogen.getTaskType() == 5) {
             //确认人2确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrNitrogen.getIds() != null && tPssrNitrogen.getIds().length > 0) {
@@ -387,7 +411,6 @@ public class TPssrNitrogenController extends BaseController {
                 tPssrNitrogenService.updateTPssrNitrogen(item);
             }
         } else {
-            TPssrNitrogen lock = new TPssrNitrogen();
             lock.setSubId(tPssrNitrogen.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrNitrogen item : tPssrNitrogenService.selectTPssrNitrogenList(lock)) {

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

@@ -21,10 +21,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -89,6 +89,25 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:overhaulExchanger:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulExchanger tPssrOverhaulExchanger) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulExchanger.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人")){
+                        tPssrOverhaulExchanger.setConfirmedPerson(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         if ("1".equals(tPssrOverhaulExchanger.getConfirmedPerson())) {
             tPssrOverhaulExchanger.setConfirmedPerson(getUserId().toString());
         }

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

@@ -18,10 +18,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -246,6 +246,25 @@ public class TPssrOverhaulFilterController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:overhaulFilter:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulFilter tPssrOverhaulFilter) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulFilter.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人")){
+                        tPssrOverhaulFilter.setRespPerson(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         if ("1".equals(tPssrOverhaulFilter.getRespPerson())) {
             tPssrOverhaulFilter.setRespPerson(getUserId().toString());
         }

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

@@ -18,10 +18,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -241,6 +241,25 @@ public class TPssrOverhaulTowerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:overhaulTower:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulTower tPssrOverhaulTower) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulTower.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人")){
+                        tPssrOverhaulTower.setConfirmedPerson(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         if ("1".equals(tPssrOverhaulTower.getConfirmedPerson())) {
             tPssrOverhaulTower.setConfirmedPerson(getUserId().toString());
         }

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

@@ -18,10 +18,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -249,6 +249,25 @@ public class TPssrOverhaulValveController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:overhaulValve:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulValve tPssrOverhaulValve) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulValve.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人")){
+                        tPssrOverhaulValve.setIdentifyingPerson(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         if ("1".equals(tPssrOverhaulValve.getIdentifyingPerson())) {
             tPssrOverhaulValve.setIdentifyingPerson(getUserId().toString());
         }

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

@@ -21,10 +21,10 @@ import com.ruoyi.project.sems.domain.TSpecdevYlgd;
 import com.ruoyi.project.sems.mapper.TSpecdevYlgdMapper;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -86,6 +86,27 @@ public class TPssrPipeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:pipe:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrPipe tPssrPipe) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPipe.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrPipe.setConfirmer1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrPipe.setConfirmer2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrPipe> list = tPssrPipeService.selectTPssrPipeList(tPssrPipe);
         list.forEach(item -> {

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

@@ -74,6 +74,27 @@ public class TPssrPowerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:power:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrPower tPssrPower) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPower.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrPower.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrPower.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrPower> list = tPssrPowerService.selectTPssrPowerList(tPssrPower);
         list.forEach(item -> {
@@ -228,16 +249,19 @@ public class TPssrPowerController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrPower lock = new TPssrPower();
         if (tPssrPower.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrPower.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrPower.getIds() != null && tPssrPower.getIds().length > 0) {
@@ -250,7 +274,6 @@ public class TPssrPowerController extends BaseController {
                 tPssrPowerService.updateTPssrPower(item);
             }
         } else {
-            TPssrPower lock = new TPssrPower();
             lock.setSubId(tPssrPower.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrPower item : tPssrPowerService.selectTPssrPowerList(lock)) {

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

@@ -76,6 +76,27 @@ public class TPssrProgrammeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:programme:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrProgramme tPssrProgramme) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrProgramme.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrProgramme.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrProgramme.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrProgramme> list = tPssrProgrammeService.selectTPssrProgrammeList(tPssrProgramme);
         return getDataTable(list);
@@ -225,16 +246,19 @@ public class TPssrProgrammeController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrProgramme lock = new TPssrProgramme();
         if (tPssrProgramme.getTaskType() == 4) {
             //确认人1确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrProgramme.getTaskType() == 5) {
             //确认人2确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrProgramme.getIds() != null && tPssrProgramme.getIds().length > 0) {
@@ -244,7 +268,6 @@ public class TPssrProgrammeController extends BaseController {
                 tPssrProgrammeService.updateTPssrProgramme(item);
             }
         } else {
-            TPssrProgramme lock = new TPssrProgramme();
             lock.setSubId(tPssrProgramme.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrProgramme item : tPssrProgrammeService.selectTPssrProgrammeList(lock)) {

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

@@ -21,10 +21,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -162,6 +162,27 @@ public class TPssrProtectionController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:protection:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrProtection tPssrProtection) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrProtection.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrProtection.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrProtection.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrProtection> list = tPssrProtectionService.selectTPssrProtectionList(tPssrProtection);
         list.forEach(item -> {

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

@@ -75,6 +75,27 @@ public class TPssrPublicController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:public:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrPublic tPssrPublic) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPublic.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrPublic.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrPublic.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrPublic> list = tPssrPublicService.selectTPssrPublicList(tPssrPublic);
         list.forEach(item -> {
@@ -312,16 +333,19 @@ public class TPssrPublicController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrPublic lock = new TPssrPublic();
         if (tPssrPublic.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
+            lock.setConfirm1(getUserId().toString());
         } else if (tPssrPublic.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
             date = new Date();
+            lock.setConfirm2(getUserId().toString());
         }
         // 修改状态
         if (tPssrPublic.getIds() != null && tPssrPublic.getIds().length > 0) {
@@ -337,7 +361,6 @@ public class TPssrPublicController extends BaseController {
                 tPssrPublicService.updateTPssrPublic(item);
             }
         } else {
-            TPssrPublic lock = new TPssrPublic();
             lock.setSubId(tPssrPublic.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrPublic item : tPssrPublicService.selectTPssrPublicList(lock)) {

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

@@ -18,10 +18,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -159,6 +159,27 @@ public class TPssrPumpCleaningController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:pumpCleaning:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrPumpCleaning tPssrPumpCleaning) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpCleaning.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrPumpCleaning.setConfirmer1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrPumpCleaning.setConfirmer2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrPumpCleaning> list = tPssrPumpCleaningService.selectTPssrPumpCleaningList(tPssrPumpCleaning);
         list.forEach(item -> {

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

@@ -21,10 +21,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -159,6 +159,27 @@ public class TPssrPumpFillController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:pumpFill:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrPumpFill tPssrPumpFill) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpFill.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrPumpFill.setConfirmer1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrPumpFill.setConfirmer2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrPumpFill> list = tPssrPumpFillService.selectTPssrPumpFillList(tPssrPumpFill);
         list.forEach(item -> {

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

@@ -18,10 +18,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -157,6 +157,27 @@ public class TPssrPumpOverhaulController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:pumpOverhaul:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrPumpOverhaul tPssrPumpOverhaul) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpOverhaul.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrPumpOverhaul.setConfirmer1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrPumpOverhaul.setConfirmer2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrPumpOverhaul> list = tPssrPumpOverhaulService.selectTPssrPumpOverhaulList(tPssrPumpOverhaul);
         list.forEach(item -> {

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

@@ -10,8 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBleed;
 import com.ruoyi.project.pssr.mapper.TPssrSafetyBleedMapper;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBleedService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -19,6 +21,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.task.Task;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -66,6 +72,9 @@ public class TPssrSafetyBleedController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     /**
      * 批量导入
      */
@@ -145,6 +154,27 @@ public class TPssrSafetyBleedController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:safetyBleed:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrSafetyBleed tPssrSafetyBleed) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBleed.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrSafetyBleed.setConfirmer1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrSafetyBleed.setConfirmer2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrSafetyBleed> list = tPssrSafetyBleedService.selectTPssrSafetyBleedList(tPssrSafetyBleed);
         list.forEach(item -> {

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

@@ -10,8 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBreath;
 import com.ruoyi.project.pssr.mapper.TPssrSafetyBreathMapper;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBreathService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -19,6 +21,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.task.Task;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -66,6 +72,9 @@ public class TPssrSafetyBreathController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     /**
      * 批量导入
      */
@@ -145,6 +154,27 @@ public class TPssrSafetyBreathController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:safetyBreath:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrSafetyBreath tPssrSafetyBreath) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBreath.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrSafetyBreath.setConfirmer1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrSafetyBreath.setConfirmer2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrSafetyBreath> list = tPssrSafetyBreathService.selectTPssrSafetyBreathList(tPssrSafetyBreath);
         list.forEach(item -> {

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

@@ -10,8 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBrust;
 import com.ruoyi.project.pssr.mapper.TPssrSafetyBrustMapper;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBrustService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -19,6 +21,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.task.Task;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -35,7 +41,6 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * 安全设施-爆破片Controller
@@ -47,10 +52,13 @@ import java.util.UUID;
 @RequestMapping("/pssr/safetyBrust")
 public class TPssrSafetyBrustController extends BaseController {
     @Resource
-     private TPssrSafetyBrustMapper tPssrSafetyBrustMapper;
+    private TPssrSafetyBrustMapper tPssrSafetyBrustMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired
@@ -71,12 +79,11 @@ public class TPssrSafetyBrustController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pssr:safetyBrust:add')")
     @PostMapping("/importData")
-    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException
-    {
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TPssrSafetyBrust> list = new ArrayList<TPssrSafetyBrust>();
@@ -107,15 +114,15 @@ public class TPssrSafetyBrustController extends BaseController {
                     } else if (j == 3) {
                         entity.setInstallLocation(cellValue);
                     } else if (j == 4) {
-                    entity.setSetPressure(cellValue);
-                }
+                        entity.setSetPressure(cellValue);
+                    }
                 }
                 entity.setCreaterCode(userId.toString());
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
-                failRow.add(i+1);
+                failRow.add(i + 1);
             }
         }
         int successNumber = 0;
@@ -126,16 +133,16 @@ public class TPssrSafetyBrustController extends BaseController {
             try {
                 this.add(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
-                failRow.add(failNum+1);
+                failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
     }
 
@@ -145,6 +152,27 @@ public class TPssrSafetyBrustController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:safetyBrust:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrSafetyBrust tPssrSafetyBrust) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBrust.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")) {
+                        tPssrSafetyBrust.setConfirmer1(getUserId().toString());
+                    } else if (task.getName().equals("确认人2")) {
+                        tPssrSafetyBrust.setConfirmer2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}", e.getMessage());
+        }
         startPage();
         List<TPssrSafetyBrust> list = tPssrSafetyBrustService.selectTPssrSafetyBrustList(tPssrSafetyBrust);
         list.forEach(item -> {
@@ -222,7 +250,7 @@ public class TPssrSafetyBrustController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = "PSSR_14_安全设施_爆破片"  + ".xlsx";
+            filename = "PSSR_14_安全设施_爆破片" + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -241,8 +269,8 @@ public class TPssrSafetyBrustController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrSafetyBrust item = tPssrSafetyBrustService.selectTPssrSafetyBrustById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bt"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-bt"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-bt"));
         return AjaxResult.success(item);
     }
 
@@ -253,7 +281,7 @@ public class TPssrSafetyBrustController extends BaseController {
     @Log(title = "安全设施-爆破片", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyBrust tPssrSafetyBrust) {
-        if (StringUtils.isNotEmpty(tPssrSafetyBrust.getConfirmer1())&&tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())) {
+        if (StringUtils.isNotEmpty(tPssrSafetyBrust.getConfirmer1()) && tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyBrust.setApproveStatus(0L);
@@ -267,7 +295,7 @@ public class TPssrSafetyBrustController extends BaseController {
     @Log(title = "安全设施-爆破片", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBrust tPssrSafetyBrust) {
-        if (tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())){
+        if (tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrFileService.updateFileRelevance(tPssrSafetyBrust.getFileIds(), "aqss-bt", tPssrSafetyBrust.getId(), tPssrSafetyBrust.getSubId());
@@ -281,11 +309,12 @@ public class TPssrSafetyBrustController extends BaseController {
     @Log(title = "安全设施-爆破片", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrSafetyBrust tPssrSafetyBrust) {
-        if (tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())){
+        if (tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         return toAjax(tPssrSafetyBrustMapper.updateTPssrSafetyBrustByIds(tPssrSafetyBrust));
     }
+
     /**
      * 删除安全设施-爆破片
      */

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

@@ -10,8 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrSafetyFlamearrester;
 import com.ruoyi.project.pssr.mapper.TPssrSafetyFlamearresterMapper;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyFlamearresterService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -19,6 +21,10 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.task.Task;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -52,6 +58,9 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
 
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     @Autowired
     private ITPssrSafetyFlamearresterService tPssrSafetyFlamearresterService;
 
@@ -141,6 +150,27 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:safetyFlamearrester:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrSafetyFlamearrester tPssrSafetyFlamearrester) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyFlamearrester.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrSafetyFlamearrester.setConfirmer1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrSafetyFlamearrester.setConfirmer2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrSafetyFlamearrester> list = tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterList(tPssrSafetyFlamearrester);
         list.forEach(item -> {

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

@@ -9,13 +9,19 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrSafetyValve;
 import com.ruoyi.project.pssr.mapper.TPssrSafetyValveMapper;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyValveService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.task.Task;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -50,6 +56,9 @@ public class TPssrSafetyValveController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
 
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired
@@ -65,6 +74,27 @@ public class TPssrSafetyValveController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:safetyValve:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrSafetyValve tPssrSafetyValve) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyValve.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrSafetyValve.setConfirmer1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrSafetyValve.setConfirmer2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrSafetyValve> list = tPssrSafetyValveService.selectTPssrSafetyValveList(tPssrSafetyValve);
 

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

@@ -74,6 +74,27 @@ public class TPssrTorchvocController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:torchvoc:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrTorchvoc tPssrTorchvoc) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrTorchvoc.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrTorchvoc.setConfirm1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrTorchvoc.setConfirm2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrTorchvoc> list = tPssrTorchvocService.selectTPssrTorchvocList(tPssrTorchvoc);
         list.forEach(item -> {
@@ -237,15 +258,18 @@ public class TPssrTorchvocController extends BaseController {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;
+        TPssrTorchvoc lock = new TPssrTorchvoc();
         if (tPssrTorchvoc.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
+            lock.setConfirm1(getUserId().toString());
             date = new Date();
         } else if (tPssrTorchvoc.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 2;
+            lock.setConfirm2(getUserId().toString());
             date = new Date();
         }
         // 修改状态
@@ -266,7 +290,6 @@ public class TPssrTorchvocController extends BaseController {
                 tPssrTorchvocService.updateTPssrTorchvoc(item);
             }
         } else {
-            TPssrTorchvoc lock = new TPssrTorchvoc();
             lock.setSubId(tPssrTorchvoc.getSubId());
             lock.setApproveStatus(queryStatus);
             lock.setTorchvocType(tPssrTorchvoc.getTorchvocType());

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

@@ -18,10 +18,10 @@ import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 import com.ruoyi.project.sems.mapper.TSpecdevYlrqMapper;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -85,6 +85,27 @@ public class TPssrVesselController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:vessel:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrVessel tPssrVessel) {
+        try {
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrVessel.getSubId());
+            if (approve != null) {
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(getUserId().toString())
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                if (task != null) {
+                    if (task.getName().equals("确认人1")){
+                        tPssrVessel.setConfirmer1(getUserId().toString());
+                    }else if (task.getName().equals("确认人2")){
+                       tPssrVessel.setConfirmer2(getUserId().toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("待办确认人查询报错：{}",e.getMessage());
+        }
         startPage();
         List<TPssrVessel> list = tPssrVesselService.selectTPssrVesselList(tPssrVessel);
         list.forEach(item -> {

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

@@ -136,13 +136,13 @@
             @click="gotoSubIndex(scope.row)"
           >检查内容
           </el-button>
-          <el-button
-          size="mini"
-          type="text"
-          icon="el-icon-download"
-          @click="handleZip(scope.row)"
-          >打包
-          </el-button>
+<!--          <el-button-->
+<!--          size="mini"-->
+<!--          type="text"-->
+<!--          icon="el-icon-download"-->
+<!--          @click="handleZip(scope.row)"-->
+<!--          >打包-->
+<!--          </el-button>-->
           <!--<el-button-->
           <!--size="mini"-->
           <!--type="text"-->