待办任务流程信息完善

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

@@ -411,117 +411,121 @@ public class TApproveDangerController extends BaseController {
         }
         List<DevTask> list = new ArrayList<>();
         if (taskList.size() > 0) {
-            for (Task task : taskList) {
-                ProcessInstance pi = processEngine.getRuntimeService()/**表示正在执行的流程实例和执行对象*/
-                        .createProcessInstanceQuery()/**创建流程实例查询*/
-                        .processInstanceId(task.getProcessInstanceId())/**使用流程实例ID查询*/
-                        .singleResult();
-                logger.info("待办任务ID:" + task.getId());
-                logger.info("待办任务name:" + task.getName());
-                logger.info("待办任务创建时间:" + task.getCreateTime());
-                logger.info("待办任务办理人:" + task.getAssignee());
-                logger.info("流程实例ID:" + task.getProcessInstanceId());
-                logger.info("执行对象ID:" + task.getExecutionId());
-                logger.info(task.getTenantId());
-                logger.info(task.getCategory());
-                logger.info(task.getFormKey());
-                logger.info("流程实例Name:" + pi.getProcessDefinitionName());
-                DevTask devTask = new DevTask();
-                devTask.setTaskId(task.getId());
-                devTask.setTaskName(task.getName());
-                devTask.setTaskCreateTime(task.getCreateTime());
-                devTask.setProcessId(task.getProcessInstanceId());
-                devTask.setProcessName(pi.getProcessDefinitionName());
-                devTask.setProcessCreateTime(pi.getStartTime());
-                devTask.setBusinessKey(pi.getBusinessKey());
-                if (pi.getProcessDefinitionName().equals("重大隐患审批流程") || pi.getProcessDefinitionName().equals("普通隐患审批流程")) {
-                    TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.settApprove(approveDanger);
-                    devTask.setApNo(approveDanger.getApproveNo());
-                } else if (pi.getProcessDefinitionName().equals("事件审批流程")) {
-                    TApproveAccident approveAccident = tApproveAccidentService.selectTApproveAccidentById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.settApproveAccident(approveAccident);
-                    devTask.setApNo(approveAccident.getApproveNo());
-                } else if (pi.getProcessDefinitionName().equals("特种设备审核")) {
-                    TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.setSpecApprove(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("年度检查报告申请")) {
-                    TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.setSpecApprove(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("月度检查")) {
-                    TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.setSpecApprove(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("设备修改/删除审核") || pi.getProcessDefinitionName().equals("设备新增/删除审核")) {
-                    TApproveSpecModify approve = tApproveSpecModifyService.selectTApproveSpecModifyById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("设备修改/删除审核" + JSON.toJSONString(approve));
-                    devTask.setApproveSpecModify(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("专项培训计划审核")) {
-                    TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("专项培训计划审核" + JSON.toJSONString(approve));
-                    devTask.setApproveObj(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
-                    TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("设备维修审批流程" + JSON.toJSONString(approve));
-                    devTask.setApproveObj(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
-                    TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("设备变更申请" + JSON.toJSONString(approve));
-                    devTask.setApproveObj(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("可靠性管理申请")) {
-                    TKekaoApprove approve = tKekaoApproveService.selectTKekaoApproveById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("可靠性管理申请" + JSON.toJSONString(approve));
-                    devTask.setApproveObj(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("预约开票审批流程")) {
-                    TApproveReserveInvoice approve = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.setApproveObject(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("安全阀离线/切出申请流程")) {
-                    TApplyOfflinevalve approve = tApplyOfflinevalveService.selectTApplyOfflinevalveById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.setApproveObject(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("组织保护措施状态变更申请流程")) {
-                    TApplySafetychange approve = tApplySafetychangeService.selectTApplySafetychangeById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.setApproveObject(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("SAI开项申请流程")) {
-                    TSaiApply approve = tSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.setApproveObject(approve);
-                    devTask.setApNo(approve.getApNo());
-                } else if (pi.getProcessDefinitionName().equals("每周安全排查报告")) {
-                    TSpecWeekcheck t = tSpecWeekcheckService.selectTSpecWeekcheckById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.setApproveObject(t);
-                    devTask.setApNo(t.getId().toString());
-                } else if (pi.getProcessDefinitionName().equals("导师带徒经理审批")) {
-                    TTsApprove t = tTsApproveService.selectTTsApproveById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.setApNo(t.getApNo());
-                    devTask.setApproveObject(t);
-                } else if (pi.getProcessDefinitionName().equals("导师带徒学员成绩不合格审批")) {
-                    TTsApprove t = tTsApproveService.selectTTsApproveById(Long.parseLong(pi.getBusinessKey()));
-                    devTask.setApNo(t.getApNo());
-                    devTask.setApproveObject(t);
-                } else if (pi.getProcessDefinitionName().equals("PSSR装置经理审批")) {
-                    TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
-                    TPssrAboveall tPssrAboveall = tPssrAboveallService.selectTPssrAboveallById(t.getAboveallId());
-                    devTask.setProcessName(pi.getProcessDefinitionName()+"_"+tPssrAboveall.getUnit());
-                    devTask.setApNo(t.getApNo());
-                    devTask.setApproveObject(t);
-                }  else if (pi.getProcessDefinitionName().contains("PSSR")&&!pi.getProcessDefinitionName().equals("PSSR装置经理审批")) {
-                    TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
-                    TPssrSubcontent tPssrSubcontent = tPssrSubcontentService.selectTPssrSubcontentById(t.getSubId());
-                    t.setSn(tPssrSubcontent.getForShort());
-                    devTask.setProcessName(pi.getProcessDefinitionName()+"_"+tPssrSubcontent.getUnit()+"_"+tPssrSubcontent.getItem());
-                    devTask.setApNo(t.getApNo());
-                    devTask.setApproveObject(t);
+            try {
+                for (Task task : taskList) {
+                    ProcessInstance pi = processEngine.getRuntimeService()/**表示正在执行的流程实例和执行对象*/
+                            .createProcessInstanceQuery()/**创建流程实例查询*/
+                            .processInstanceId(task.getProcessInstanceId())/**使用流程实例ID查询*/
+                            .singleResult();
+                    logger.info("待办任务ID:" + task.getId());
+                    logger.info("待办任务name:" + task.getName());
+                    logger.info("待办任务创建时间:" + task.getCreateTime());
+                    logger.info("待办任务办理人:" + task.getAssignee());
+                    logger.info("流程实例ID:" + task.getProcessInstanceId());
+                    logger.info("执行对象ID:" + task.getExecutionId());
+                    logger.info(task.getTenantId());
+                    logger.info(task.getCategory());
+                    logger.info(task.getFormKey());
+                    logger.info("流程实例Name:" + pi.getProcessDefinitionName());
+                    DevTask devTask = new DevTask();
+                    devTask.setTaskId(task.getId());
+                    devTask.setTaskName(task.getName());
+                    devTask.setTaskCreateTime(task.getCreateTime());
+                    devTask.setProcessId(task.getProcessInstanceId());
+                    devTask.setProcessName(pi.getProcessDefinitionName());
+                    devTask.setProcessCreateTime(pi.getStartTime());
+                    devTask.setBusinessKey(pi.getBusinessKey());
+                    if (pi.getProcessDefinitionName().equals("重大隐患审批流程") || pi.getProcessDefinitionName().equals("普通隐患审批流程")) {
+                        TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.settApprove(approveDanger);
+                        devTask.setApNo(approveDanger.getApproveNo());
+                    } else if (pi.getProcessDefinitionName().equals("事件审批流程")) {
+                        TApproveAccident approveAccident = tApproveAccidentService.selectTApproveAccidentById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.settApproveAccident(approveAccident);
+                        devTask.setApNo(approveAccident.getApproveNo());
+                    } else if (pi.getProcessDefinitionName().equals("特种设备审核")) {
+                        TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setSpecApprove(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("年度检查报告申请")) {
+                        TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setSpecApprove(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("月度检查")) {
+                        TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setSpecApprove(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("设备修改/删除审核") || pi.getProcessDefinitionName().equals("设备新增/删除审核")) {
+                        TApproveSpecModify approve = tApproveSpecModifyService.selectTApproveSpecModifyById(Long.parseLong(pi.getBusinessKey()));
+                        logger.info("设备修改/删除审核" + JSON.toJSONString(approve));
+                        devTask.setApproveSpecModify(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("专项培训计划审核")) {
+                        TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
+                        logger.info("专项培训计划审核" + JSON.toJSONString(approve));
+                        devTask.setApproveObj(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
+                        TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
+                        logger.info("设备维修审批流程" + JSON.toJSONString(approve));
+                        devTask.setApproveObj(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
+                        TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
+                        logger.info("设备变更申请" + JSON.toJSONString(approve));
+                        devTask.setApproveObj(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("可靠性管理申请")) {
+                        TKekaoApprove approve = tKekaoApproveService.selectTKekaoApproveById(Long.parseLong(pi.getBusinessKey()));
+                        logger.info("可靠性管理申请" + JSON.toJSONString(approve));
+                        devTask.setApproveObj(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("预约开票审批流程")) {
+                        TApproveReserveInvoice approve = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setApproveObject(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("安全阀离线/切出申请流程")) {
+                        TApplyOfflinevalve approve = tApplyOfflinevalveService.selectTApplyOfflinevalveById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setApproveObject(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("组织保护措施状态变更申请流程")) {
+                        TApplySafetychange approve = tApplySafetychangeService.selectTApplySafetychangeById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setApproveObject(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("SAI开项申请流程")) {
+                        TSaiApply approve = tSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setApproveObject(approve);
+                        devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("每周安全排查报告")) {
+                        TSpecWeekcheck t = tSpecWeekcheckService.selectTSpecWeekcheckById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setApproveObject(t);
+                        devTask.setApNo(t.getId().toString());
+                    } else if (pi.getProcessDefinitionName().equals("导师带徒经理审批")) {
+                        TTsApprove t = tTsApproveService.selectTTsApproveById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setApNo(t.getApNo());
+                        devTask.setApproveObject(t);
+                    } else if (pi.getProcessDefinitionName().equals("导师带徒学员成绩不合格审批")) {
+                        TTsApprove t = tTsApproveService.selectTTsApproveById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setApNo(t.getApNo());
+                        devTask.setApproveObject(t);
+                    } else if (pi.getProcessDefinitionName().equals("PSSR装置经理审批")) {
+                        TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
+                        TPssrAboveall tPssrAboveall = tPssrAboveallService.selectTPssrAboveallById(t.getAboveallId());
+                        devTask.setProcessName(pi.getProcessDefinitionName()+"_"+tPssrAboveall.getUnit());
+                        devTask.setApNo(t.getApNo());
+                        devTask.setApproveObject(t);
+                    }  else if (pi.getProcessDefinitionName().contains("PSSR")&&!pi.getProcessDefinitionName().equals("PSSR装置经理审批")) {
+                        TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
+                        TPssrSubcontent tPssrSubcontent = tPssrSubcontentService.selectTPssrSubcontentById(t.getSubId());
+                        t.setSn(tPssrSubcontent.getForShort());
+                        devTask.setProcessName(pi.getProcessDefinitionName()+"_"+tPssrSubcontent.getUnit()+"_"+tPssrSubcontent.getItem());
+                        devTask.setApNo(t.getApNo());
+                        devTask.setApproveObject(t);
+                    }
+                    list.add(devTask);
                 }
-                list.add(devTask);
+            }catch (Exception e) {
+                e.printStackTrace();
             }
         }
         return getDataTable(list, count);

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

@@ -13,10 +13,8 @@ import com.ruoyi.project.pssr.domain.TPssrAirtight;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrAirtight;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrAirtightService;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
@@ -25,6 +23,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 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;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -52,6 +51,9 @@ import java.util.*;
 public class TPssrAirtightController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrAirtightService tPssrAirtightService;
 
@@ -70,6 +72,8 @@ public class TPssrAirtightController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
+    private String forShort = "qm";
+
     /**
      * 批量导入
      */
@@ -164,7 +168,9 @@ public class TPssrAirtightController extends BaseController {
         startPage();
         List<TPssrAirtight> list = tPssrAirtightService.selectTPssrAirtightList(tPssrAirtight);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "qm"));
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
         return getDataTable(list);
     }
@@ -187,7 +193,9 @@ public class TPssrAirtightController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrAirtight item = tPssrAirtightService.selectTPssrAirtightById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "qm"));
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);
     }
 
@@ -223,7 +231,7 @@ public class TPssrAirtightController extends BaseController {
     @Log(title = "气密", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrAirtight tPssrAirtight) {
-        tPssrFileService.updateFileRelevance(tPssrAirtight.getFileIds(), "qm", tPssrAirtight.getId(), tPssrAirtight.getSubId());
+        tPssrFileService.updateFileRelevance(tPssrAirtight.getFileIds(), forShort, tPssrAirtight.getId(), tPssrAirtight.getSubId());
         try {
             String initialPressure = tPssrAirtight.getInitialPressure();//初始压力
             String finalPressure = tPssrAirtight.getFinalPressure();//最终压力
@@ -323,20 +331,30 @@ public class TPssrAirtightController extends BaseController {
      * 驳回气密
      */
     @PutMapping("/turnDownAirtight")
-    public AjaxResult turnDownAirtight(@RequestBody TPssrAirtight tPssrAirtight) {
-        if (tPssrAirtight.getIds() != null) {
+    public AjaxResult turnDownAirtight(@RequestBody List<TPssrAirtight> tPssrAirtights) {
+        if (CollectionUtils.isNotEmpty(tPssrAirtights)) {
+            Long subId = tPssrAirtights.get(0).getSubId();
             String userId = getUserId().toString();
             // 修改已选择数据的状态
-            for (Long id : tPssrAirtight.getIds()) {
+            for (TPssrAirtight tPssrAirtight : tPssrAirtights) {
                 TPssrAirtight blind = new TPssrAirtight();
-                blind.setId(id);
+                blind.setId(tPssrAirtight.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrAirtightService.updateTPssrAirtight(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(tPssrAirtight.getSubId());
+                turndown.setItemId(tPssrAirtight.getId());
+                turndown.setReason(tPssrAirtight.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrAirtight.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -348,7 +366,7 @@ public class TPssrAirtightController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrAirtight blind = new TPssrAirtight();
-            blind.setSubId(tPssrAirtight.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -369,7 +387,7 @@ public class TPssrAirtightController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrAirtight.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -11,16 +11,15 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrAnalyzer;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrAnalyzerService;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 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.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -47,6 +46,9 @@ import java.util.*;
 public class TPssrAnalyzerController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrAnalyzerService tPssrAnalyzerService;
 
@@ -59,6 +61,8 @@ public class TPssrAnalyzerController extends BaseController {
     @Autowired
     private ISysUserService sysUserService;
 
+    private String forShort = "zxfxy";
+
 
     /**
      * 查询在线分析仪列表
@@ -69,7 +73,9 @@ public class TPssrAnalyzerController extends BaseController {
         startPage();
         List<TPssrAnalyzer> list = tPssrAnalyzerService.selectTPssrAnalyzerList(tPssrAnalyzer);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zxfxy"));
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
         return getDataTable(list);
     }
@@ -154,7 +160,9 @@ public class TPssrAnalyzerController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrAnalyzer item = tPssrAnalyzerService.selectTPssrAnalyzerById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zxfxy"));
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);
     }
 
@@ -176,7 +184,7 @@ public class TPssrAnalyzerController extends BaseController {
     @Log(title = "在线分析仪", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrAnalyzer tPssrAnalyzer) {
-        tPssrFileService.updateFileRelevance(tPssrAnalyzer.getFileIds(), "zxfxy", tPssrAnalyzer.getId(), tPssrAnalyzer.getSubId());
+        tPssrFileService.updateFileRelevance(tPssrAnalyzer.getFileIds(), forShort, tPssrAnalyzer.getId(), tPssrAnalyzer.getSubId());
         return toAjax(tPssrAnalyzerService.updateTPssrAnalyzer(tPssrAnalyzer));
     }
 
@@ -263,20 +271,30 @@ public class TPssrAnalyzerController extends BaseController {
      * 驳回在线分析仪
      */
     @PutMapping("/turnDownAnalyzer")
-    public AjaxResult turnDownAnalyzer(@RequestBody TPssrAnalyzer tPssrAnalyzer) {
-        if (tPssrAnalyzer.getIds() != null) {
+    public AjaxResult turnDownAnalyzer(@RequestBody List<TPssrAnalyzer> tPssrAnalyzer) {
+        if (CollectionUtils.isNotEmpty(tPssrAnalyzer)){
             String userId = getUserId().toString();
+            Long subId = tPssrAnalyzer.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrAnalyzer.getIds()) {
+            for (TPssrAnalyzer analyzer : tPssrAnalyzer) {
                 TPssrAnalyzer blind = new TPssrAnalyzer();
-                blind.setId(id);
+                blind.setId(analyzer.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrAnalyzerService.updateTPssrAnalyzer(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(analyzer.getSubId());
+                turndown.setItemId(analyzer.getId());
+                turndown.setReason(analyzer.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrAnalyzer.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -288,7 +306,7 @@ public class TPssrAnalyzerController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrAnalyzer blind = new TPssrAnalyzer();
-            blind.setSubId(tPssrAnalyzer.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -309,7 +327,7 @@ public class TPssrAnalyzerController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrAnalyzer.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -401,7 +401,7 @@ public class TPssrApproveController extends BaseController {
             forShorts.add("sjbg");
         } else if ("dj,aqss,sksgfmzt".contains(sub.getForShort())) {
             forShorts.add("mb");
-        } else if ("xcws,rsfh,xqf,txjk,qtjcy,hbss".contains(sub.getForShort())) {
+        } else if ("xcws,rsfh,xqf,txjk,bxsjcy,hbss".contains(sub.getForShort())) {
             forShorts.add("dj");
             forShorts.add("aqss");
             forShorts.add("sksgfmzt");
@@ -410,7 +410,7 @@ public class TPssrApproveController extends BaseController {
             forShorts.add("rsfh");
             forShorts.add("xqf");
             forShorts.add("txjk");
-            forShorts.add("qtjcy");
+            forShorts.add("bxsjcy");
             forShorts.add("hbss");
         } else if ("qm,dqzh".contains(sub.getForShort())) {
             forShorts.add("ssy");

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

@@ -8,14 +8,9 @@ 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.*;
 import com.ruoyi.project.pssr.domain.TPssrBlind;
-import com.ruoyi.project.pssr.domain.TPssrBlind;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrBlindService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
@@ -24,6 +19,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 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;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -50,6 +46,9 @@ import java.util.*;
 public class TPssrBlindController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrBlindService tPssrBlindService;
 
@@ -68,6 +67,8 @@ public class TPssrBlindController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
+    private String forShort = "mb";
+
     /**
      * 批量导入
      */
@@ -168,7 +169,9 @@ public class TPssrBlindController extends BaseController {
         startPage();
         List<TPssrBlind> list = tPssrBlindService.selectTPssrBlindList(tPssrBlind);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "mb"));
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
         return getDataTable(list);
     }
@@ -261,7 +264,9 @@ public class TPssrBlindController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrBlind item = tPssrBlindService.selectTPssrBlindById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "mb"));
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);
     }
 
@@ -283,7 +288,7 @@ public class TPssrBlindController extends BaseController {
     @Log(title = "盲板", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrBlind tPssrBlind) {
-        tPssrFileService.updateFileRelevance(tPssrBlind.getFileIds(), "mb", tPssrBlind.getId(), tPssrBlind.getSubId());
+        tPssrFileService.updateFileRelevance(tPssrBlind.getFileIds(), forShort, tPssrBlind.getId(), tPssrBlind.getSubId());
         return toAjax(tPssrBlindService.updateTPssrBlind(tPssrBlind));
     }
 
@@ -377,20 +382,30 @@ public class TPssrBlindController extends BaseController {
     }
 
     @PutMapping("/turnDownBlind")
-    public AjaxResult turnDownBlind(@RequestBody TPssrBlind tPssrBlind) {
-        if (tPssrBlind.getIds() != null) {
+    public AjaxResult turnDownBlind(@RequestBody List<TPssrBlind> tPssrBlind) {
+        if (CollectionUtils.isNotEmpty(tPssrBlind)){
             String userId = getUserId().toString();
+            Long subId = tPssrBlind.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrBlind.getIds()) {
+            for (TPssrBlind pssrBlind : tPssrBlind) {
                 TPssrBlind blind = new TPssrBlind();
-                blind.setId(id);
+                blind.setId(pssrBlind.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrBlindService.updateTPssrBlind(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(blind.getSubId());
+                turndown.setItemId(blind.getId());
+                turndown.setReason(blind.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrBlind.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -402,7 +417,7 @@ public class TPssrBlindController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrBlind blind = new TPssrBlind();
-            blind.setSubId(tPssrBlind.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -419,7 +434,7 @@ public class TPssrBlindController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrBlind.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -13,10 +13,8 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrCircuit;
 import com.ruoyi.project.pssr.domain.TPssrCircuit;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrCircuitService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
@@ -25,6 +23,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 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;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -51,6 +50,9 @@ import java.util.*;
 public class TPssrCircuitController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrCircuitService tPssrCircuitService;
 
@@ -62,6 +64,7 @@ public class TPssrCircuitController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "dj";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -168,6 +171,8 @@ public class TPssrCircuitController extends BaseController {
         List<TPssrCircuit> list = tPssrCircuitService.selectTPssrCircuitList(tPssrCircuit);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dj"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "dj"));
         });
         return getDataTable(list);
     }
@@ -259,6 +264,8 @@ public class TPssrCircuitController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrCircuit item = tPssrCircuitService.selectTPssrCircuitById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dj"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "dj"));
         return AjaxResult.success(item);
     }
 
@@ -366,20 +373,30 @@ public class TPssrCircuitController extends BaseController {
      * 驳回短接
      */
     @PutMapping("/turnDownCircuit")
-    public AjaxResult turnDownCircuit(@RequestBody TPssrCircuit tPssrCircuit) {
-        if (tPssrCircuit.getIds() != null) {
+    public AjaxResult turnDownCircuit(@RequestBody List<TPssrCircuit> tPssrCircuit) {
+        if (CollectionUtils.isNotEmpty(tPssrCircuit)) {
             String userId = getUserId().toString();
+            Long subId = tPssrCircuit.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrCircuit.getIds()) {
+            for (TPssrCircuit pssrCircuit : tPssrCircuit) {
                 TPssrCircuit blind = new TPssrCircuit();
-                blind.setId(id);
+                blind.setId(pssrCircuit.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrCircuitService.updateTPssrCircuit(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(pssrCircuit.getSubId());
+                turndown.setItemId(pssrCircuit.getId());
+                turndown.setReason(pssrCircuit.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrCircuit.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -391,7 +408,7 @@ public class TPssrCircuitController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrCircuit blind = new TPssrCircuit();
-            blind.setSubId(tPssrCircuit.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -412,7 +429,7 @@ public class TPssrCircuitController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrCircuit.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -9,14 +9,9 @@ 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.*;
 import com.ruoyi.project.pssr.domain.TPssrCleaning;
-import com.ruoyi.project.pssr.domain.TPssrCleaning;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrCleaningService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
@@ -25,6 +20,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 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;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -51,6 +47,9 @@ import java.util.*;
 public class TPssrCleaningController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrCleaningService tPssrCleaningService;
 
@@ -62,6 +61,7 @@ public class TPssrCleaningController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "sbqjd";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -158,6 +158,8 @@ public class TPssrCleaningController extends BaseController {
         List<TPssrCleaning> list = tPssrCleaningService.selectTPssrCleaningList(tPssrCleaning);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sbqjd"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sbqjd"));
         });
         return getDataTable(list);
     }
@@ -244,6 +246,8 @@ public class TPssrCleaningController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrCleaning item = tPssrCleaningService.selectTPssrCleaningById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sbqjd"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sbqjd"));
         return AjaxResult.success(item);
     }
 
@@ -351,20 +355,30 @@ public class TPssrCleaningController extends BaseController {
      * 驳回设备清洁
      */
     @PutMapping("/turnDownCleaning")
-    public AjaxResult turnDownCleaning(@RequestBody TPssrCleaning tPssrCleaning) {
-        if (tPssrCleaning.getIds() != null) {
+    public AjaxResult turnDownCleaning(@RequestBody List<TPssrCleaning> tPssrCleaning) {
+        if (CollectionUtils.isNotEmpty(tPssrCleaning)) {
             String userId = getUserId().toString();
+            Long subId = tPssrCleaning.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrCleaning.getIds()) {
+            for (TPssrCleaning item : tPssrCleaning) {
                 TPssrCleaning blind = new TPssrCleaning();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrCleaningService.updateTPssrCleaning(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrCleaning.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -376,7 +390,7 @@ public class TPssrCleaningController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrCleaning blind = new TPssrCleaning();
-            blind.setSubId(tPssrCleaning.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -397,7 +411,7 @@ public class TPssrCleaningController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrCleaning.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -11,16 +11,15 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrFrame;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrFrameService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 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.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -47,6 +46,9 @@ import java.util.*;
 public class TPssrFrameController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrFrameService tPssrFrameService;
 
@@ -58,6 +60,7 @@ public class TPssrFrameController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "zdj";
 
     /**
      * 查询支（吊）架列表
@@ -68,7 +71,9 @@ public class TPssrFrameController extends BaseController {
         startPage();
         List<TPssrFrame> list = tPssrFrameService.selectTPssrFrameList(tPssrFrame);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zdj"));
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
         return getDataTable(list);
     }
@@ -169,7 +174,9 @@ public class TPssrFrameController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrFrame item = tPssrFrameService.selectTPssrFrameById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zdj"));
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);
     }
 
@@ -191,7 +198,7 @@ public class TPssrFrameController extends BaseController {
     @Log(title = "支（吊）架", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrFrame tPssrFrame) {
-        tPssrFileService.updateFileRelevance(tPssrFrame.getFileIds(), "zdj", tPssrFrame.getId(), tPssrFrame.getSubId());
+        tPssrFileService.updateFileRelevance(tPssrFrame.getFileIds(), forShort, tPssrFrame.getId(), tPssrFrame.getSubId());
         return toAjax(tPssrFrameService.updateTPssrFrame(tPssrFrame));
     }
 
@@ -277,20 +284,30 @@ public class TPssrFrameController extends BaseController {
      * 驳回支（吊）架
      */
     @PutMapping("/turnDownFrame")
-    public AjaxResult turnDownFrame(@RequestBody TPssrFrame tPssrFrame) {
-        if (tPssrFrame.getIds() != null) {
+    public AjaxResult turnDownFrame(@RequestBody List<TPssrFrame> tPssrFrame) {
+        if (CollectionUtils.isNotEmpty(tPssrFrame)) {
             String userId = getUserId().toString();
+            Long subId = tPssrFrame.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrFrame.getIds()) {
+            for (TPssrFrame item : tPssrFrame) {
                 TPssrFrame blind = new TPssrFrame();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrFrameService.updateTPssrFrame(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrFrame.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -302,7 +319,7 @@ public class TPssrFrameController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrFrame blind = new TPssrFrame();
-            blind.setSubId(tPssrFrame.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -323,7 +340,7 @@ public class TPssrFrameController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrFrame.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -11,16 +11,15 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrFranklinism;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrFranklinismService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 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.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -47,6 +46,9 @@ import java.util.*;
 public class TPssrFranklinismController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrFranklinismService tPssrFranklinismService;
 
@@ -58,6 +60,7 @@ public class TPssrFranklinismController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "jdjdkj";
 
 
     /**
@@ -70,6 +73,8 @@ public class TPssrFranklinismController extends BaseController {
         List<TPssrFranklinism> list = tPssrFranklinismService.selectTPssrFranklinismList(tPssrFranklinism);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jdjdkj"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jdjdkj"));
         });
         return getDataTable(list);
     }
@@ -153,6 +158,8 @@ public class TPssrFranklinismController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrFranklinism item = tPssrFranklinismService.selectTPssrFranklinismById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jdjdkj"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jdjdkj"));
         return AjaxResult.success(item);
     }
 
@@ -261,20 +268,30 @@ public class TPssrFranklinismController extends BaseController {
      * 驳回静电接地，跨接
      */
     @PutMapping("/turnDownFranklinism")
-    public AjaxResult turnDownFranklinism(@RequestBody TPssrFranklinism tPssrFranklinism) {
-        if (tPssrFranklinism.getIds() != null) {
+    public AjaxResult turnDownFranklinism(@RequestBody List<TPssrFranklinism> tPssrFranklinism) {
+        if (CollectionUtils.isNotEmpty(tPssrFranklinism)) {
             String userId = getUserId().toString();
+            Long subId = tPssrFranklinism.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrFranklinism.getIds()) {
+            for (TPssrFranklinism item : tPssrFranklinism) {
                 TPssrFranklinism blind = new TPssrFranklinism();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrFranklinismService.updateTPssrFranklinism(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrFranklinism.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -286,7 +303,7 @@ public class TPssrFranklinismController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrFranklinism blind = new TPssrFranklinism();
-            blind.setSubId(tPssrFranklinism.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -307,7 +324,7 @@ public class TPssrFranklinismController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrFranklinism.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -11,16 +11,15 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrGasdetector;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrGasdetectorService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 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.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -47,6 +46,9 @@ import java.util.*;
 public class TPssrGasdetectorController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrGasdetectorService tPssrGasdetectorService;
 
@@ -58,6 +60,7 @@ public class TPssrGasdetectorController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "qtjcy";
 
 
     /**
@@ -70,6 +73,8 @@ public class TPssrGasdetectorController extends BaseController {
         List<TPssrGasdetector> list = tPssrGasdetectorService.selectTPssrGasdetectorList(tPssrGasdetector);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "qtjcy"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "qtjcy"));
         });
         return getDataTable(list);
     }
@@ -155,6 +160,8 @@ public class TPssrGasdetectorController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrGasdetector item = tPssrGasdetectorService.selectTPssrGasdetectorById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "qtjcy"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "qtjcy"));
         return AjaxResult.success(item);
     }
 
@@ -263,20 +270,30 @@ public class TPssrGasdetectorController extends BaseController {
      * 驳回气体检测器
      */
     @PutMapping("/turnDownGasdetector")
-    public AjaxResult turnDownGasdetector(@RequestBody TPssrGasdetector tPssrGasdetector) {
-        if (tPssrGasdetector.getIds() != null) {
+    public AjaxResult turnDownGasdetector(@RequestBody List<TPssrGasdetector> tPssrGasdetector) {
+        if (CollectionUtils.isNotEmpty(tPssrGasdetector)) {
             String userId = getUserId().toString();
+            Long subId = tPssrGasdetector.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrGasdetector.getIds()) {
+            for (TPssrGasdetector item : tPssrGasdetector) {
                 TPssrGasdetector blind = new TPssrGasdetector();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrGasdetectorService.updateTPssrGasdetector(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrGasdetector.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -288,7 +305,7 @@ public class TPssrGasdetectorController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrGasdetector blind = new TPssrGasdetector();
-            blind.setSubId(tPssrGasdetector.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -309,7 +326,7 @@ public class TPssrGasdetectorController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrGasdetector.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -12,10 +12,8 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrHygiene;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrHygieneService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
@@ -24,6 +22,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 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;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -50,6 +49,9 @@ import java.util.*;
 public class TPssrHygieneController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrHygieneService tPssrHygieneService;
 
@@ -61,6 +63,7 @@ public class TPssrHygieneController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "xcws";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -336,20 +339,30 @@ public class TPssrHygieneController extends BaseController {
      * 驳回现场卫生
      */
     @PutMapping("/turnDownHygiene")
-    public AjaxResult turnDownHygiene(@RequestBody TPssrHygiene tPssrHygiene) {
-        if (tPssrHygiene.getIds() != null) {
+    public AjaxResult turnDownHygiene(@RequestBody List<TPssrHygiene> tPssrHygiene) {
+        if (CollectionUtils.isNotEmpty(tPssrHygiene)) {
             String userId = getUserId().toString();
+            Long subId = tPssrHygiene.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrHygiene.getIds()) {
+            for (TPssrHygiene item : tPssrHygiene) {
                 TPssrHygiene blind = new TPssrHygiene();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrHygieneService.updateTPssrHygiene(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrHygiene.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -361,7 +374,7 @@ public class TPssrHygieneController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrHygiene blind = new TPssrHygiene();
-            blind.setSubId(tPssrHygiene.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -382,7 +395,7 @@ public class TPssrHygieneController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrHygiene.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -11,16 +11,15 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrInstrumentCalibration;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrInstrumentCalibrationService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 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.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -47,6 +46,9 @@ import java.util.*;
 public class TPssrInstrumentCalibrationController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrInstrumentCalibrationService tPssrInstrumentCalibrationService;
 
@@ -58,6 +60,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "ybjy";
 
 
     /**
@@ -70,6 +73,8 @@ public class TPssrInstrumentCalibrationController extends BaseController {
         List<TPssrInstrumentCalibration> list = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(tPssrInstrumentCalibration);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ybjy"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ybjy"));
         });
         return getDataTable(list);
     }
@@ -156,6 +161,8 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrInstrumentCalibration item = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ybjy"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ybjy"));
         return AjaxResult.success(item);
     }
 
@@ -264,20 +271,30 @@ public class TPssrInstrumentCalibrationController extends BaseController {
      * 驳回仪表校验
      */
     @PutMapping("/turnDownInstrumentCalibration")
-    public AjaxResult turnDownInstrumentCalibration(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
-        if (tPssrInstrumentCalibration.getIds() != null) {
+    public AjaxResult turnDownInstrumentCalibration(@RequestBody List<TPssrInstrumentCalibration> tPssrInstrumentCalibration) {
+        if (CollectionUtils.isNotEmpty(tPssrInstrumentCalibration)) {
             String userId = getUserId().toString();
+            Long subId = tPssrInstrumentCalibration.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrInstrumentCalibration.getIds()) {
+            for (TPssrInstrumentCalibration item : tPssrInstrumentCalibration) {
                 TPssrInstrumentCalibration blind = new TPssrInstrumentCalibration();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrInstrumentCalibration.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -289,7 +306,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrInstrumentCalibration blind = new TPssrInstrumentCalibration();
-            blind.setSubId(tPssrInstrumentCalibration.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -310,7 +327,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrInstrumentCalibration.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -11,12 +11,9 @@ 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.TPssrLaboratory;
-import com.ruoyi.project.pssr.domain.TPssrLaboratory;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrLaboratoryService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
@@ -25,6 +22,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 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;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -51,6 +49,9 @@ import java.util.*;
 public class TPssrLaboratoryController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrLaboratoryService tPssrLaboratoryService;
 
@@ -62,6 +63,7 @@ public class TPssrLaboratoryController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "sys";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -347,20 +349,30 @@ public class TPssrLaboratoryController extends BaseController {
      * 驳回实验室
      */
     @PutMapping("/turnDownLaboratory")
-    public AjaxResult turnDownLaboratory(@RequestBody TPssrLaboratory tPssrLaboratory) {
-        if (tPssrLaboratory.getIds() != null) {
+    public AjaxResult turnDownLaboratory(@RequestBody List<TPssrLaboratory> tPssrLaboratory) {
+        if (CollectionUtils.isNotEmpty(tPssrLaboratory)) {
             String userId = getUserId().toString();
+            Long subId = tPssrLaboratory.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrLaboratory.getIds()) {
+            for (TPssrLaboratory item : tPssrLaboratory) {
                 TPssrLaboratory blind = new TPssrLaboratory();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrLaboratoryService.updateTPssrLaboratory(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrLaboratory.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -372,7 +384,7 @@ public class TPssrLaboratoryController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrLaboratory blind = new TPssrLaboratory();
-            blind.setSubId(tPssrLaboratory.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -393,7 +405,7 @@ public class TPssrLaboratoryController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrLaboratory.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -11,17 +11,15 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrLighting;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrLighting;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrLightingService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 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.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -48,6 +46,9 @@ import java.util.*;
 public class TPssrLightingController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrLightingService tPssrLightingService;
 
@@ -59,6 +60,7 @@ public class TPssrLightingController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "zmdbr";
 
     /**
      * 查询照明列表
@@ -70,6 +72,8 @@ public class TPssrLightingController extends BaseController {
         List<TPssrLighting> list = tPssrLightingService.selectTPssrLightingList(tPssrLighting);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zmdbr"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "zmdbr"));
         });
         return getDataTable(list);
     }
@@ -157,6 +161,8 @@ public class TPssrLightingController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrLighting item = tPssrLightingService.selectTPssrLightingById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zmdbr"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "zmdbr"));
         return AjaxResult.success(item);
     }
 
@@ -266,20 +272,30 @@ public class TPssrLightingController extends BaseController {
      * 驳回照明，电伴热
      */
     @PutMapping("/turnDownLighting")
-    public AjaxResult turnDownLighting(@RequestBody TPssrLighting tPssrLighting) {
-        if (tPssrLighting.getIds() != null) {
+    public AjaxResult turnDownLighting(@RequestBody List<TPssrLighting> tPssrLighting) {
+        if (CollectionUtils.isNotEmpty(tPssrLighting)) {
             String userId = getUserId().toString();
+            Long subId = tPssrLighting.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrLighting.getIds()) {
+            for (TPssrLighting item : tPssrLighting) {
                 TPssrLighting blind = new TPssrLighting();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrLightingService.updateTPssrLighting(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrLighting.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -291,7 +307,7 @@ public class TPssrLightingController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrLighting blind = new TPssrLighting();
-            blind.setSubId(tPssrLighting.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -312,7 +328,7 @@ public class TPssrLightingController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrLighting.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -14,6 +14,7 @@ import com.ruoyi.project.apply.service.ITApplyLockService;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrLock;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -48,6 +49,9 @@ import java.util.*;
 public class TPssrLockController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrLockService tPssrLockService;
 
@@ -65,6 +69,7 @@ public class TPssrLockController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "sksgfmzt";
 
     /**
      * 查询锁开锁关阀门状态列表
@@ -76,6 +81,8 @@ public class TPssrLockController extends BaseController {
         List<TPssrLock> list = tPssrLockService.selectTPssrLockList(tPssrLock);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sksgfmzt"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sksgfmzt"));
         });
         return getDataTable(list);
     }
@@ -171,6 +178,8 @@ public class TPssrLockController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrLock item = tPssrLockService.selectTPssrLockById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sksgfmzt"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sksgfmzt"));
         return AjaxResult.success(item);
     }
 
@@ -320,20 +329,30 @@ public class TPssrLockController extends BaseController {
      * 驳回设计变更
      */
     @PutMapping("/turnDownLock")
-    public AjaxResult turnDownLock(@RequestBody TPssrLock tPssrLock) {
-        if (tPssrLock.getIds() != null) {
+    public AjaxResult turnDownLock(@RequestBody List<TPssrLock> tPssrLock) {
+        if (CollectionUtils.isNotEmpty(tPssrLock)) {
             String userId = getUserId().toString();
+            Long subId = tPssrLock.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrLock.getIds()) {
+            for (TPssrLock item : tPssrLock) {
                 TPssrLock blind = new TPssrLock();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrLockService.updateTPssrLock(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrLock.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -345,7 +364,7 @@ public class TPssrLockController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrLock blind = new TPssrLock();
-            blind.setSubId(tPssrLock.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> confirm1 = new HashSet<>();
             Set<String> confirm2 = new HashSet<>();
@@ -366,7 +385,7 @@ public class TPssrLockController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(confirm2));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrLock.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -19,6 +19,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -50,6 +51,9 @@ import java.util.*;
 public class TPssrMaterialController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrMaterialService tPssrMaterialService;
 
@@ -69,6 +73,7 @@ public class TPssrMaterialController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "yfl";
 
     @Autowired
     private ITPssrMaterialRawService tPssrMaterialRawService;
@@ -84,6 +89,8 @@ public class TPssrMaterialController extends BaseController {
         List<TPssrMaterial> list = tPssrMaterialService.selectTPssrMaterialList(tPssrMaterial);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl"));
         });
         return getDataTable(list);
     }
@@ -270,6 +277,8 @@ public class TPssrMaterialController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMaterial item = tPssrMaterialService.selectTPssrMaterialById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl"));
         return AjaxResult.success(item);
     }
 
@@ -380,20 +389,30 @@ public class TPssrMaterialController extends BaseController {
      * 驳回人身防护
      */
     @PutMapping("/turnDownMaterial")
-    public AjaxResult turnDownMaterial(@RequestBody TPssrMaterial tPssrMaterial) {
-        if (tPssrMaterial.getIds() != null) {
+    public AjaxResult turnDownMaterial(@RequestBody List<TPssrMaterial> tPssrMaterial) {
+        if (CollectionUtils.isNotEmpty(tPssrMaterial)) {
             String userId = getUserId().toString();
+            Long subId = tPssrMaterial.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrMaterial.getIds()) {
+            for (TPssrMaterial item : tPssrMaterial) {
                 TPssrMaterial blind = new TPssrMaterial();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrMaterialService.updateTPssrMaterial(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMaterial.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
@@ -405,7 +424,7 @@ public class TPssrMaterialController extends BaseController {
             // 驳回 查询所有待审批的人员
             // 查询确认人
             TPssrMaterial entity = new TPssrMaterial();
-            entity.setSubId(tPssrMaterial.getSubId());
+            entity.setSubId(subId);
             entity.setApproveStatus(1L);
             TPssrMaterial PssrMaterial = tPssrMaterialService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;

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

@@ -10,15 +10,14 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrMaterialRaw;
 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.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrMaterialRawService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.*;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -37,6 +36,9 @@ import java.util.*;
 public class TPssrMaterialRawController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrMaterialRawService tPssrMaterialRawService;
 
@@ -53,6 +55,7 @@ public class TPssrMaterialRawController extends BaseController {
     private HistoryService historyService;
     @Resource
     private TPssrMaterialRawMapper tPssrMaterialRawMapper;
+    private String forShort = "yfl-raw";
 
     /**
      * 查询原料列表
@@ -64,6 +67,8 @@ public class TPssrMaterialRawController extends BaseController {
         List<TPssrMaterialRaw> list = tPssrMaterialRawService.selectTPssrMaterialRawList(tPssrMaterialRaw);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl-raw"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl-raw"));
         });
         return getDataTable(list);
     }
@@ -88,6 +93,8 @@ public class TPssrMaterialRawController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMaterialRaw item = tPssrMaterialRawService.selectTPssrMaterialRawById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl-raw"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl-raw"));
         return AjaxResult.success(item);
     }
 
@@ -197,20 +204,30 @@ public class TPssrMaterialRawController extends BaseController {
      * 驳回人身防护
      */
     @PutMapping("/turnDownMaterialRaw")
-    public AjaxResult turnDownMaterialRaw(@RequestBody TPssrMaterialRaw tPssrMaterialRaw) {
-        if (tPssrMaterialRaw.getIds() != null) {
+    public AjaxResult turnDownMaterialRaw(@RequestBody List<TPssrMaterialRaw> tPssrMaterialRaw) {
+        if (CollectionUtils.isNotEmpty(tPssrMaterialRaw)) {
             String userId = getUserId().toString();
+            Long subId = tPssrMaterialRaw.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrMaterialRaw.getIds()) {
+            for (TPssrMaterialRaw item : tPssrMaterialRaw) {
                 TPssrMaterialRaw blind = new TPssrMaterialRaw();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrMaterialRawService.updateTPssrMaterialRaw(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMaterialRaw.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
@@ -222,7 +239,7 @@ public class TPssrMaterialRawController extends BaseController {
             // 驳回 查询所有待审批的人员
             // 查询确认人
             TPssrMaterialRaw entity = new TPssrMaterialRaw();
-            entity.setSubId(tPssrMaterialRaw.getSubId());
+            entity.setSubId(subId);
             entity.setApproveStatus(1L);
             TPssrMaterialRaw PssrMaterialRaw = tPssrMaterialRawService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;

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

@@ -21,6 +21,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -48,6 +49,9 @@ import java.util.*;
 public class TPssrMeasureController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrMeasureService tPssrMeasureService;
     @Autowired
@@ -69,6 +73,7 @@ public class TPssrMeasureController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "rsfh-m";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -167,6 +172,8 @@ public class TPssrMeasureController extends BaseController {
         List<TPssrMeasure> list = tPssrMeasureService.selectTPssrMeasureList(tPssrMeasure);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh-m"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "rsfh-m"));
         });
         return getDataTable(list);
     }
@@ -253,6 +260,8 @@ public class TPssrMeasureController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMeasure item = tPssrMeasureService.selectTPssrMeasureById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh-m"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "rsfh-m"));
         return AjaxResult.success(item);
     }
 
@@ -380,20 +389,30 @@ public class TPssrMeasureController extends BaseController {
      * 驳回人身防护
      */
     @PutMapping("/turnDownMeasure")
-    public AjaxResult turnDownMeasure(@RequestBody TPssrMeasure tPssrMeasure) {
-        if (tPssrMeasure.getIds() != null) {
+    public AjaxResult turnDownMeasure(@RequestBody List<TPssrMeasure> tPssrMeasure) {
+        if (CollectionUtils.isNotEmpty(tPssrMeasure)) {
             String userId = getUserId().toString();
+            Long subId = tPssrMeasure.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrMeasure.getIds()) {
+            for (TPssrMeasure item : tPssrMeasure) {
                 TPssrMeasure blind = new TPssrMeasure();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrMeasureService.updateTPssrMeasure(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMeasure.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -405,7 +424,7 @@ public class TPssrMeasureController extends BaseController {
             // 驳回 查询所有待审批的人员
             // 查询确认人
             TPssrProtection entity = new TPssrProtection();
-            entity.setSubId(tPssrMeasure.getSubId());
+            entity.setSubId(subId);
             entity.setApproveStatus(1L);
             TPssrProtection tPssrProtection = tPssrProtectionService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;

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

@@ -14,10 +14,8 @@ import com.ruoyi.project.process.service.ITMocService;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrMoc;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrMocService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDictDataService;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -53,6 +51,9 @@ public class TPssrMocController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
 
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
+
     @Autowired
     private ITPssrMocService tPssrMocService;
 
@@ -67,6 +68,7 @@ public class TPssrMocController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "sjbg";
 
     @Autowired
     private ISysDictDataService sysDictDataService;
@@ -80,7 +82,9 @@ public class TPssrMocController extends BaseController {
         startPage();
         List<TPssrMoc> list = tPssrMocService.selectTPssrMocList(tPssrMoc);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sjbg"));
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
         return getDataTable(list);
     }
@@ -167,7 +171,9 @@ public class TPssrMocController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMoc item = tPssrMocService.selectTPssrMocById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sjbg"));
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);
     }
 
@@ -230,7 +236,7 @@ public class TPssrMocController extends BaseController {
     @Log(title = "MOC完成确认清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMoc tPssrMoc) {
-        tPssrFileService.updateFileRelevance(tPssrMoc.getFileIds(), "sjbg", tPssrMoc.getId(), tPssrMoc.getSubId());
+        tPssrFileService.updateFileRelevance(tPssrMoc.getFileIds(), forShort, tPssrMoc.getId(), tPssrMoc.getSubId());
         return toAjax(tPssrMocService.updateTPssrMoc(tPssrMoc));
     }
 
@@ -317,20 +323,30 @@ public class TPssrMocController extends BaseController {
      * 驳回设计变更
      */
     @PutMapping("/turnDownMoc")
-    public AjaxResult turnDownMoc(@RequestBody TPssrMoc tPssrMoc) {
-        if (tPssrMoc.getIds() != null) {
+    public AjaxResult turnDownMoc(@RequestBody List<TPssrMoc> tPssrMoc) {
+        if (CollectionUtils.isNotEmpty(tPssrMoc)) {
             String userId = getUserId().toString();
+            Long subId = tPssrMoc.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrMoc.getIds()) {
+            for (TPssrMoc item : tPssrMoc) {
                 TPssrMoc blind = new TPssrMoc();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrMocService.updateTPssrMoc(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMoc.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -342,7 +358,7 @@ public class TPssrMocController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrMoc blind = new TPssrMoc();
-            blind.setSubId(tPssrMoc.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> confirm1 = new HashSet<>();
             Set<String> confirm2 = new HashSet<>();
@@ -363,7 +379,7 @@ public class TPssrMocController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(confirm2));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrMoc.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -11,16 +11,15 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrMotor;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrMotorService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 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.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -47,6 +46,9 @@ import java.util.*;
 public class TPssrMotorController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrMotorService tPssrMotorService;
 
@@ -58,6 +60,7 @@ public class TPssrMotorController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "djsb";
 
 
     /**
@@ -70,6 +73,8 @@ public class TPssrMotorController extends BaseController {
         List<TPssrMotor> list = tPssrMotorService.selectTPssrMotorList(tPssrMotor);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "djsb"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "djsb"));
         });
         return getDataTable(list);
     }
@@ -155,6 +160,8 @@ public class TPssrMotorController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMotor item = tPssrMotorService.selectTPssrMotorById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "djsb"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "djsb"));
         return AjaxResult.success(item);
     }
 
@@ -262,20 +269,30 @@ public class TPssrMotorController extends BaseController {
      * 驳回临时电源
      */
     @PutMapping("/turnDownMotor")
-    public AjaxResult turnDownMotor(@RequestBody TPssrMotor tPssrMotor) {
-        if (tPssrMotor.getIds() != null) {
+    public AjaxResult turnDownMotor(@RequestBody List<TPssrMotor> tPssrMotor) {
+        if (CollectionUtils.isNotEmpty(tPssrMotor)) {
             String userId = getUserId().toString();
+            Long subId = tPssrMotor.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrMotor.getIds()) {
+            for (TPssrMotor item : tPssrMotor) {
                 TPssrMotor blind = new TPssrMotor();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrMotorService.updateTPssrMotor(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMotor.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -287,7 +304,7 @@ public class TPssrMotorController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrMotor blind = new TPssrMotor();
-            blind.setSubId(tPssrMotor.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -308,7 +325,7 @@ public class TPssrMotorController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrMotor.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -13,10 +13,8 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrNitrogen;
 import com.ruoyi.project.pssr.domain.TPssrNitrogen;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrNitrogenService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
@@ -25,6 +23,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 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;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -52,6 +51,9 @@ import java.util.*;
 public class TPssrNitrogenController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrNitrogenService tPssrNitrogenService;
 
@@ -63,6 +65,7 @@ public class TPssrNitrogenController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "dqzh";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -163,6 +166,8 @@ public class TPssrNitrogenController extends BaseController {
         List<TPssrNitrogen> list = tPssrNitrogenService.selectTPssrNitrogenList(tPssrNitrogen);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dqzh"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "dqzh"));
         });
         return getDataTable(list);
     }
@@ -251,6 +256,8 @@ public class TPssrNitrogenController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrNitrogen item = tPssrNitrogenService.selectTPssrNitrogenById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dqzh"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "dqzh"));
         return AjaxResult.success(item);
     }
 
@@ -395,20 +402,30 @@ public class TPssrNitrogenController extends BaseController {
      */
     @PutMapping("/turnDownNitrogen")
     @Log(title = "氮气置换驳回", businessType = BusinessType.UPDATE)
-    public AjaxResult turnDownNitrogen(@RequestBody TPssrNitrogen tPssrNitrogen) {
-        if (tPssrNitrogen.getIds() != null) {
+    public AjaxResult turnDownNitrogen(@RequestBody List<TPssrNitrogen> tPssrNitrogen) {
+        if (CollectionUtils.isNotEmpty(tPssrNitrogen)) {
             String userId = getUserId().toString();
+            Long subId = tPssrNitrogen.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrNitrogen.getIds()) {
+            for (TPssrNitrogen item : tPssrNitrogen) {
                 TPssrNitrogen blind = new TPssrNitrogen();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrNitrogenService.updateTPssrNitrogen(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrNitrogen.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -420,7 +437,7 @@ public class TPssrNitrogenController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrNitrogen blind = new TPssrNitrogen();
-            blind.setSubId(tPssrNitrogen.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> confirm1 = new HashSet<>();
             Set<String> confirm2 = new HashSet<>();
@@ -441,7 +458,7 @@ public class TPssrNitrogenController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(confirm2));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrNitrogen.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -13,10 +13,8 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
@@ -25,6 +23,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -51,6 +50,9 @@ import java.util.*;
 public class TPssrOverhaulExchangerController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrOverhaulExchangerService tPssrOverhaulExchangerService;
 
@@ -68,6 +70,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "jxxm-hrq";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -88,6 +91,8 @@ public class TPssrOverhaulExchangerController extends BaseController {
         List<TPssrOverhaulExchanger> list = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerList(tPssrOverhaulExchanger);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
         });
         return getDataTable(list);
     }
@@ -184,6 +189,8 @@ public class TPssrOverhaulExchangerController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulExchanger item = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
         return AjaxResult.success(item);
     }
 
@@ -274,20 +281,30 @@ public class TPssrOverhaulExchangerController extends BaseController {
     }
 
     @PutMapping("/turnDownExchanger")
-    public AjaxResult turnDownExchanger(@RequestBody TPssrOverhaulExchanger tPssrOverhaulExchanger) {
-        if (tPssrOverhaulExchanger.getIds() != null) {
+    public AjaxResult turnDownExchanger(@RequestBody List<TPssrOverhaulExchanger> tPssrOverhaulExchanger) {
+        if (CollectionUtils.isNotEmpty(tPssrOverhaulExchanger)) {
             String userId = getUserId().toString();
+            Long subId = tPssrOverhaulExchanger.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrOverhaulExchanger.getIds()) {
+            for (TPssrOverhaulExchanger item : tPssrOverhaulExchanger) {
                 TPssrOverhaulExchanger blind = new TPssrOverhaulExchanger();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrOverhaulExchangerService.updateTPssrOverhaulExchanger(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulExchanger.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");

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

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulFilter;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -23,6 +20,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -49,6 +47,9 @@ import java.util.*;
 public class TPssrOverhaulFilterController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrOverhaulFilterService tPssrOverhaulFilterService;
 
@@ -69,6 +70,7 @@ public class TPssrOverhaulFilterController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "jxxm-glq";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -156,20 +158,31 @@ public class TPssrOverhaulFilterController extends BaseController {
     }
 
     @PutMapping("/turnDownFilter")
-    public AjaxResult turnDownFilter(@RequestBody TPssrOverhaulFilter tPssrOverhaulFilter) {
-        if (tPssrOverhaulFilter.getIds() != null) {
+    public AjaxResult turnDownFilter(@RequestBody List<TPssrOverhaulFilter> tPssrOverhaulFilter) {
+
+        if (CollectionUtils.isNotEmpty(tPssrOverhaulFilter)) {
             String userId = getUserId().toString();
+            Long subId = tPssrOverhaulFilter.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrOverhaulFilter.getIds()) {
+            for (TPssrOverhaulFilter item : tPssrOverhaulFilter) {
                 TPssrOverhaulFilter blind = new TPssrOverhaulFilter();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrOverhaulFilterService.updateTPssrOverhaulFilter(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulFilter.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
@@ -239,6 +252,8 @@ public class TPssrOverhaulFilterController extends BaseController {
         List<TPssrOverhaulFilter> list = tPssrOverhaulFilterService.selectTPssrOverhaulFilterList(tPssrOverhaulFilter);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-glq"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-glq"));
         });
         return getDataTable(list);
     }
@@ -322,6 +337,8 @@ public class TPssrOverhaulFilterController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulFilter item = tPssrOverhaulFilterService.selectTPssrOverhaulFilterById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-glq"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-glq"));
         return AjaxResult.success(item);
     }
 

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

@@ -7,15 +7,13 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulPipe;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -33,6 +31,9 @@ import java.util.*;
 public class TPssrOverhaulPipeController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrOverhaulPipeService tPssrOverhaulPipeService;
 
@@ -50,22 +51,33 @@ public class TPssrOverhaulPipeController extends BaseController {
 
     @Autowired
     private ITPssrSubcontentService tPssrSubcontentService;
+    private String forShort = "";
 
     @PutMapping("/turnDownPipe")
-    public AjaxResult turnDownPipe(@RequestBody TPssrOverhaulPipe tPssrOverhaulPipe) {
-        if (tPssrOverhaulPipe.getIds() != null) {
+    public AjaxResult turnDownPipe(@RequestBody List<TPssrOverhaulPipe> tPssrOverhaulPipe) {
+        if (CollectionUtils.isNotEmpty(tPssrOverhaulPipe)) {
             String userId = getUserId().toString();
+            Long subId = tPssrOverhaulPipe.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrOverhaulPipe.getIds()) {
+            for (TPssrOverhaulPipe item : tPssrOverhaulPipe) {
                 TPssrOverhaulPipe blind = new TPssrOverhaulPipe();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrOverhaulPipeService.updateTPssrOverhaulPipe(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulPipe.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
@@ -135,6 +147,8 @@ public class TPssrOverhaulPipeController extends BaseController {
         List<TPssrOverhaulPipe> list = tPssrOverhaulPipeService.selectTPssrOverhaulPipeList(tPssrOverhaulPipe);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-gx"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-gx"));
         });
         return getDataTable(list);
     }
@@ -159,6 +173,8 @@ public class TPssrOverhaulPipeController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulPipe item = tPssrOverhaulPipeService.selectTPssrOverhaulPipeById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-gx"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-gx"));
         return AjaxResult.success(item);
     }
 

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

@@ -7,15 +7,13 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulPump;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -33,6 +31,9 @@ import java.util.*;
 public class TPssrOverhaulPumpController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrOverhaulPumpService tPssrOverhaulPumpService;
 
@@ -50,23 +51,34 @@ public class TPssrOverhaulPumpController extends BaseController {
 
     @Autowired
     private ITPssrSubcontentService tPssrSubcontentService;
+    private String forShort = "jxxm-b";
 
 
     @PutMapping("/turnDownPump")
-    public AjaxResult turnDownPump(@RequestBody TPssrOverhaulPump tPssrOverhaulPump) {
-        if (tPssrOverhaulPump.getIds() != null) {
+    public AjaxResult turnDownPump(@RequestBody List<TPssrOverhaulPump> tPssrOverhaulPump) {
+        if (CollectionUtils.isNotEmpty(tPssrOverhaulPump)) {
             String userId = getUserId().toString();
+            Long subId = tPssrOverhaulPump.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrOverhaulPump.getIds()) {
+            for (TPssrOverhaulPump item : tPssrOverhaulPump) {
                 TPssrOverhaulPump blind = new TPssrOverhaulPump();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrOverhaulPumpService.updateTPssrOverhaulPump(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulPump.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
@@ -137,6 +149,8 @@ public class TPssrOverhaulPumpController extends BaseController {
         List<TPssrOverhaulPump> list = tPssrOverhaulPumpService.selectTPssrOverhaulPumpList(tPssrOverhaulPump);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-b"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-b"));
         });
         return getDataTable(list);
     }
@@ -161,6 +175,8 @@ public class TPssrOverhaulPumpController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulPump item = tPssrOverhaulPumpService.selectTPssrOverhaulPumpById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-b"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-b"));
         return AjaxResult.success(item);
     }
 

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

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulTower;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -23,6 +20,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -47,8 +45,11 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/overhaulTower")
 public class TPssrOverhaulTowerController extends BaseController {
-    @Autowired
+        @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrOverhaulTowerService tPssrOverhaulTowerService;
 
@@ -69,6 +70,7 @@ public class TPssrOverhaulTowerController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "jxxm-tg";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -150,20 +152,30 @@ public class TPssrOverhaulTowerController extends BaseController {
     }
 
     @PutMapping("/turnDownTower")
-    public AjaxResult turnDownTower(@RequestBody TPssrOverhaulTower tPssrOverhaulTower) {
-        if (tPssrOverhaulTower.getIds() != null) {
+    public AjaxResult turnDownTower(@RequestBody List<TPssrOverhaulTower> tPssrOverhaulTower) {
+        if (CollectionUtils.isNotEmpty(tPssrOverhaulTower)) {
             String userId = getUserId().toString();
+            Long subId = tPssrOverhaulTower.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrOverhaulTower.getIds()) {
+            for (TPssrOverhaulTower item : tPssrOverhaulTower) {
                 TPssrOverhaulTower blind = new TPssrOverhaulTower();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrOverhaulTowerService.updateTPssrOverhaulTower(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulTower.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
@@ -233,6 +245,8 @@ public class TPssrOverhaulTowerController extends BaseController {
         List<TPssrOverhaulTower> list = tPssrOverhaulTowerService.selectTPssrOverhaulTowerList(tPssrOverhaulTower);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-tg"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-tg"));
         });
         return getDataTable(list);
     }
@@ -313,6 +327,8 @@ public class TPssrOverhaulTowerController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulTower item = tPssrOverhaulTowerService.selectTPssrOverhaulTowerById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-tg"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-tg"));
         return AjaxResult.success(item);
     }
 

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

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulValve;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -23,6 +20,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -49,6 +47,9 @@ import java.util.*;
 public class TPssrOverhaulValveController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrOverhaulValveService tPssrOverhaulValveService;
 
@@ -69,6 +70,7 @@ public class TPssrOverhaulValveController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "jxxm-fm";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -158,20 +160,31 @@ public class TPssrOverhaulValveController extends BaseController {
     }
 
     @PutMapping("/turnDownValve")
-    public AjaxResult turnDownValve(@RequestBody TPssrOverhaulValve tPssrOverhaulValve) {
-        if (tPssrOverhaulValve.getIds() != null) {
+    public AjaxResult turnDownValve(@RequestBody List<TPssrOverhaulValve> tPssrOverhaulValve) {
+
+        if (CollectionUtils.isNotEmpty(tPssrOverhaulValve)) {
             String userId = getUserId().toString();
+            Long subId = tPssrOverhaulValve.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrOverhaulValve.getIds()) {
+            for (TPssrOverhaulValve item : tPssrOverhaulValve) {
                 TPssrOverhaulValve blind = new TPssrOverhaulValve();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrOverhaulValveService.updateTPssrOverhaulValve(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulValve.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
@@ -241,6 +254,8 @@ public class TPssrOverhaulValveController extends BaseController {
         List<TPssrOverhaulValve> list = tPssrOverhaulValveService.selectTPssrOverhaulValveList(tPssrOverhaulValve);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-fm"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-fm"));
         });
         return getDataTable(list);
     }
@@ -325,6 +340,8 @@ public class TPssrOverhaulValveController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulValve item = tPssrOverhaulValveService.selectTPssrOverhaulValveById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-fm"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-fm"));
         return AjaxResult.success(item);
     }
 

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

@@ -10,15 +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.*;
 import com.ruoyi.project.pssr.domain.TPssrPipe;
-import com.ruoyi.project.pssr.domain.TPssrPipe;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.mapper.TPssrPipeMapper;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrPipeService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.sems.domain.TSpecdevYlgd;
 import com.ruoyi.project.sems.mapper.TSpecdevYlgdMapper;
 import com.ruoyi.project.system.domain.SysUser;
@@ -27,6 +22,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -54,6 +50,9 @@ import java.util.*;
 public class TPssrPipeController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrPipeService tPssrPipeService;
     @Resource
@@ -75,6 +74,7 @@ public class TPssrPipeController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "ylgd";
 
     /**
      * 查询管道列表
@@ -86,6 +86,8 @@ public class TPssrPipeController extends BaseController {
         List<TPssrPipe> list = tPssrPipeService.selectTPssrPipeList(tPssrPipe);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylgd"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ylgd"));
         });
         return getDataTable(list);
     }
@@ -210,6 +212,8 @@ public class TPssrPipeController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPipe item = tPssrPipeService.selectTPssrPipeById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylgd"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ylgd"));
         return AjaxResult.success(item);
     }
 
@@ -339,20 +343,30 @@ public class TPssrPipeController extends BaseController {
      * 驳回压力管道
      */
     @PutMapping("/turnDownPipe")
-    public AjaxResult turnDownPipe(@RequestBody TPssrPipe tPssrPipe) {
-        if (tPssrPipe.getIds() != null) {
+    public AjaxResult turnDownPipe(@RequestBody List<TPssrPipe> tPssrPipe) {
+        if (CollectionUtils.isNotEmpty(tPssrPipe)) {
             String userId = getUserId().toString();
+            Long subId = tPssrPipe.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrPipe.getIds()) {
+            for (TPssrPipe item : tPssrPipe) {
                 TPssrPipe blind = new TPssrPipe();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrPipeService.updateTPssrPipe(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPipe.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -365,7 +379,7 @@ public class TPssrPipeController extends BaseController {
 
             //查询确认人
             TPssrPipe entity = new TPssrPipe();
-            entity.setSubId(tPssrPipe.getSubId());
+            entity.setSubId(subId);
             entity.setApproveStatus(1L);
             TPssrPipe pssrPipe = tPssrPipeService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;

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

@@ -11,16 +11,15 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPower;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrPowerService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 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.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -47,6 +46,9 @@ import java.util.*;
 public class TPssrPowerController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrPowerService tPssrPowerService;
 
@@ -58,6 +60,7 @@ public class TPssrPowerController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "lsdy";
 
 
     /**
@@ -70,6 +73,8 @@ public class TPssrPowerController extends BaseController {
         List<TPssrPower> list = tPssrPowerService.selectTPssrPowerList(tPssrPower);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "lsdy"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "lsdy"));
         });
         return getDataTable(list);
     }
@@ -153,6 +158,8 @@ public class TPssrPowerController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPower item = tPssrPowerService.selectTPssrPowerById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "lsdy"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "lsdy"));
         return AjaxResult.success(item);
     }
 
@@ -260,20 +267,30 @@ public class TPssrPowerController extends BaseController {
      * 驳回临时电源
      */
     @PutMapping("/turnDownPower")
-    public AjaxResult turnDownPower(@RequestBody TPssrPower tPssrPower) {
-        if (tPssrPower.getIds() != null) {
+    public AjaxResult turnDownPower(@RequestBody List<TPssrPower> tPssrPower) {
+        if (CollectionUtils.isNotEmpty(tPssrPower)) {
             String userId = getUserId().toString();
+            Long subId = tPssrPower.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrPower.getIds()) {
+            for (TPssrPower item : tPssrPower) {
                 TPssrPower blind = new TPssrPower();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrPowerService.updateTPssrPower(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPower.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -285,7 +302,7 @@ public class TPssrPowerController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrPower blind = new TPssrPower();
-            blind.setSubId(tPssrPower.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -306,7 +323,7 @@ public class TPssrPowerController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrPower.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -12,16 +12,15 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrProgramme;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrProgrammeService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 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.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -49,6 +48,9 @@ import java.util.*;
 public class TPssrProgrammeController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrProgrammeService tPssrProgrammeService;
 
@@ -60,6 +62,7 @@ public class TPssrProgrammeController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "kgfa";
 
 
     /**
@@ -253,20 +256,30 @@ public class TPssrProgrammeController extends BaseController {
      * 驳回设计变更
      */
     @PutMapping("/turnDownProgramme")
-    public AjaxResult turnDownProgramme(@RequestBody TPssrProgramme tPssrProgramme) {
-        if (tPssrProgramme.getIds() != null) {
+    public AjaxResult turnDownProgramme(@RequestBody List<TPssrProgramme> tPssrProgramme) {
+        if (CollectionUtils.isNotEmpty(tPssrProgramme)) {
             String userId = getUserId().toString();
+            Long subId = tPssrProgramme.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrProgramme.getIds()) {
+            for (TPssrProgramme item : tPssrProgramme) {
                 TPssrProgramme blind = new TPssrProgramme();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrProgrammeService.updateTPssrProgramme(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrProgramme.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -278,7 +291,7 @@ public class TPssrProgrammeController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrProgramme blind = new TPssrProgramme();
-            blind.setSubId(tPssrProgramme.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> confirm1 = new HashSet<>();
             Set<String> confirm2 = new HashSet<>();
@@ -299,7 +312,7 @@ public class TPssrProgrammeController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(confirm2));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrProgramme.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -10,14 +10,8 @@ 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.TPssrHygiene;
-import com.ruoyi.project.pssr.domain.TPssrProtection;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrProtectionService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
@@ -26,6 +20,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -52,6 +47,9 @@ import java.util.*;
 public class TPssrProtectionController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrProtectionService tPssrProtectionService;
 
@@ -69,6 +67,7 @@ public class TPssrProtectionController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "rsfh";
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -159,6 +158,8 @@ public class TPssrProtectionController extends BaseController {
         List<TPssrProtection> list = tPssrProtectionService.selectTPssrProtectionList(tPssrProtection);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "rsfh"));
         });
         return getDataTable(list);
     }
@@ -241,6 +242,8 @@ public class TPssrProtectionController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrProtection item = tPssrProtectionService.selectTPssrProtectionById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "rsfh"));
         return AjaxResult.success(item);
     }
 
@@ -358,20 +361,30 @@ public class TPssrProtectionController extends BaseController {
      * 驳回人身防护
      */
     @PutMapping("/turnDownProtection")
-    public AjaxResult turnDownProtection(@RequestBody TPssrProtection tPssrProtection) {
-        if (tPssrProtection.getIds() != null) {
+    public AjaxResult turnDownProtection(@RequestBody List<TPssrProtection> tPssrProtection) {
+        if (CollectionUtils.isNotEmpty(tPssrProtection)) {
             String userId = getUserId().toString();
+            Long subId = tPssrProtection.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrProtection.getIds()) {
+            for (TPssrProtection item : tPssrProtection) {
                 TPssrProtection blind = new TPssrProtection();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrProtectionService.updateTPssrProtection(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrProtection.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -382,7 +395,7 @@ public class TPssrProtectionController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrProtection blind = new TPssrProtection();
-            blind.setSubId(tPssrProtection.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> confirmUsers1 = new HashSet<>();
             Set<String> confirmUsers2 = new HashSet<>();

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

@@ -11,16 +11,15 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPublic;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrPublicService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.*;
 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.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -47,6 +46,9 @@ import java.util.*;
 public class TPssrPublicController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrPublicService tPssrPublicService;
 
@@ -58,6 +60,7 @@ public class TPssrPublicController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "gygc";
 
 
     /**
@@ -256,20 +259,30 @@ public class TPssrPublicController extends BaseController {
      * 驳回公用工程
      */
     @PutMapping("/turnDownPublic")
-    public AjaxResult turnDownPublic(@RequestBody TPssrPublic tPssrPublic) {
-        if (tPssrPublic.getIds() != null) {
+    public AjaxResult turnDownPublic(@RequestBody List<TPssrPublic> tPssrPublic) {
+        if (CollectionUtils.isNotEmpty(tPssrPublic)) {
             String userId = getUserId().toString();
+            Long subId = tPssrPublic.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrPublic.getIds()) {
+            for (TPssrPublic item : tPssrPublic) {
                 TPssrPublic blind = new TPssrPublic();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrPublicService.updateTPssrPublic(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPublic.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -281,7 +294,7 @@ public class TPssrPublicController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrPublic blind = new TPssrPublic();
-            blind.setSubId(tPssrPublic.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -302,7 +315,7 @@ public class TPssrPublicController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrPublic.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -17,6 +17,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -43,6 +44,9 @@ import java.util.*;
 public class TPssrPumpCleaningController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrPumpCleaningService tPssrPumpCleaningService;
     @Autowired
@@ -63,6 +67,8 @@ public class TPssrPumpCleaningController extends BaseController {
     @Autowired
     private ISysUserService sysUserService;
 
+    private String forShort = "jb-c";
+
     /**
      * 查询机泵过滤器清理工作清单列表
      */
@@ -72,7 +78,9 @@ public class TPssrPumpCleaningController extends BaseController {
         startPage();
         List<TPssrPumpCleaning> list = tPssrPumpCleaningService.selectTPssrPumpCleaningList(tPssrPumpCleaning);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-c"));
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
         return getDataTable(list);
     }
@@ -157,7 +165,9 @@ public class TPssrPumpCleaningController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPumpCleaning item = tPssrPumpCleaningService.selectTPssrPumpCleaningById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-c"));
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);
     }
 
@@ -181,7 +191,7 @@ public class TPssrPumpCleaningController extends BaseController {
     @Log(title = "机泵过滤器清理工作清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPumpCleaning tPssrPumpCleaning) {
-        tPssrFileService.updateFileRelevance(tPssrPumpCleaning.getFileIds(), "jb-c", tPssrPumpCleaning.getId(), tPssrPumpCleaning.getSubId());
+        tPssrFileService.updateFileRelevance(tPssrPumpCleaning.getFileIds(), forShort, tPssrPumpCleaning.getId(), tPssrPumpCleaning.getSubId());
         return toAjax(tPssrPumpCleaningService.updateTPssrPumpCleaning(tPssrPumpCleaning));
     }
 
@@ -276,20 +286,30 @@ public class TPssrPumpCleaningController extends BaseController {
      * 驳回人身防护
      */
     @PutMapping("/turnDownPumpCleaning")
-    public AjaxResult turnDownPumpCleaning(@RequestBody TPssrPumpCleaning tPssrPumpCleaning) {
-        if (tPssrPumpCleaning.getIds() != null) {
+    public AjaxResult turnDownPumpCleaning(@RequestBody List<TPssrPumpCleaning> tPssrPumpCleaning) {
+        if (CollectionUtils.isNotEmpty(tPssrPumpCleaning)) {
             String userId = getUserId().toString();
+            Long subId = tPssrPumpCleaning.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrPumpCleaning.getIds()) {
+            for (TPssrPumpCleaning item : tPssrPumpCleaning) {
                 TPssrPumpCleaning blind = new TPssrPumpCleaning();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrPumpCleaningService.updateTPssrPumpCleaning(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpCleaning.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -301,7 +321,7 @@ public class TPssrPumpCleaningController extends BaseController {
             // 驳回 查询所有待审批的人员
             // 查询确认人
             TPssrPumpFill entity = new TPssrPumpFill();
-            entity.setSubId(tPssrPumpCleaning.getSubId());
+            entity.setSubId(subId);
             entity.setApproveStatus(1L);
             TPssrPumpFill queryData = tPssrPumpFillService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;

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

@@ -9,20 +9,16 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.domain.TPssrPumpFill;
-import com.ruoyi.project.pssr.domain.TPssrPumpFill;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
-import com.ruoyi.project.pssr.service.ITPssrPumpFillService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+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.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -49,6 +45,9 @@ import java.util.*;
 public class TPssrPumpFillController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrPumpFillService tPssrPumpFillService;
 
@@ -66,6 +65,7 @@ public class TPssrPumpFillController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "jb-f";
 
     /**
      * 查询机泵润滑油加注确认清单列表
@@ -77,6 +77,8 @@ public class TPssrPumpFillController extends BaseController {
         List<TPssrPumpFill> list = tPssrPumpFillService.selectTPssrPumpFillList(tPssrPumpFill);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-f"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jb-f"));
         });
         return getDataTable(list);
     }
@@ -163,6 +165,8 @@ public class TPssrPumpFillController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPumpFill item = tPssrPumpFillService.selectTPssrPumpFillById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-f"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jb-f"));
         return AjaxResult.success(item);
     }
 
@@ -280,20 +284,30 @@ public class TPssrPumpFillController extends BaseController {
      * 驳回人身防护
      */
     @PutMapping("/turnDownPumpFill")
-    public AjaxResult turnDownPumpFill(@RequestBody TPssrPumpFill tPssrPumpFill) {
-        if (tPssrPumpFill.getIds() != null) {
+    public AjaxResult turnDownPumpFill(@RequestBody List<TPssrPumpFill> tPssrPumpFill) {
+        if (CollectionUtils.isNotEmpty(tPssrPumpFill)) {
             String userId = getUserId().toString();
+            Long subId = tPssrPumpFill.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrPumpFill.getIds()) {
+            for (TPssrPumpFill item : tPssrPumpFill) {
                 TPssrPumpFill blind = new TPssrPumpFill();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrPumpFillService.updateTPssrPumpFill(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpFill.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -305,7 +319,7 @@ public class TPssrPumpFillController extends BaseController {
             // 驳回 查询所有待审批的人员
             // 查询确认人
             TPssrPumpFill entity = new TPssrPumpFill();
-            entity.setSubId(tPssrPumpFill.getSubId());
+            entity.setSubId(subId);
             entity.setApproveStatus(1L);
             TPssrPumpFill queryData = tPssrPumpFillService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;

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

@@ -17,6 +17,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -43,6 +44,9 @@ import java.util.*;
 public class TPssrPumpOverhaulController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrPumpOverhaulService tPssrPumpOverhaulService;
 
@@ -63,6 +67,7 @@ public class TPssrPumpOverhaulController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "jb-o";
 
     /**
      * 查询机泵检修完成确认清单列表
@@ -74,6 +79,8 @@ public class TPssrPumpOverhaulController extends BaseController {
         List<TPssrPumpOverhaul> list = tPssrPumpOverhaulService.selectTPssrPumpOverhaulList(tPssrPumpOverhaul);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-o"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jb-o"));
         });
         return getDataTable(list);
     }
@@ -158,6 +165,8 @@ public class TPssrPumpOverhaulController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPumpOverhaul item = tPssrPumpOverhaulService.selectTPssrPumpOverhaulById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-o"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jb-o"));
         return AjaxResult.success(item);
     }
 
@@ -275,20 +284,30 @@ public class TPssrPumpOverhaulController extends BaseController {
      * 驳回人身防护
      */
     @PutMapping("/turnDownPumpOverhaul")
-    public AjaxResult turnDownPumpOverhaul(@RequestBody TPssrPumpOverhaul tPssrPumpOverhaul) {
-        if (tPssrPumpOverhaul.getIds() != null) {
+    public AjaxResult turnDownPumpOverhaul(@RequestBody List<TPssrPumpOverhaul> tPssrPumpOverhaul) {
+        if (CollectionUtils.isNotEmpty(tPssrPumpOverhaul)) {
             String userId = getUserId().toString();
+            Long subId = tPssrPumpOverhaul.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrPumpOverhaul.getIds()) {
+            for (TPssrPumpOverhaul item : tPssrPumpOverhaul) {
                 TPssrPumpOverhaul blind = new TPssrPumpOverhaul();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrPumpOverhaulService.updateTPssrPumpOverhaul(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpOverhaul.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -300,7 +319,7 @@ public class TPssrPumpOverhaulController extends BaseController {
             // 驳回 查询所有待审批的人员
             // 查询确认人
             TPssrPumpFill entity = new TPssrPumpFill();
-            entity.setSubId(tPssrPumpOverhaul.getSubId());
+            entity.setSubId(subId);
             entity.setApproveStatus(1L);
             TPssrPumpFill queryData = tPssrPumpFillService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;

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

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBleed;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBleedService;
+import com.ruoyi.project.pssr.service.ITPssrTurndownService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.apache.poi.ss.usermodel.Cell;
@@ -39,11 +40,15 @@ import java.util.List;
 public class TPssrSafetyBleedController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrSafetyBleedService tPssrSafetyBleedService;
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "aqss-bd";
 
     /**
      * 查询安全设施-紧急泄放阀列表
@@ -54,7 +59,9 @@ public class TPssrSafetyBleedController extends BaseController {
         startPage();
         List<TPssrSafetyBleed> list = tPssrSafetyBleedService.selectTPssrSafetyBleedList(tPssrSafetyBleed);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bd"));
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
         return getDataTable(list);
     }
@@ -144,7 +151,9 @@ public class TPssrSafetyBleedController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrSafetyBleed item = tPssrSafetyBleedService.selectTPssrSafetyBleedById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bd"));
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);
     }
 
@@ -166,7 +175,7 @@ public class TPssrSafetyBleedController extends BaseController {
     @Log(title = "安全设施-紧急泄放阀", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBleed tPssrSafetyBleed) {
-        tPssrFileService.updateFileRelevance(tPssrSafetyBleed.getFileIds(), "aqss-bd", tPssrSafetyBleed.getId(), tPssrSafetyBleed.getSubId());
+        tPssrFileService.updateFileRelevance(tPssrSafetyBleed.getFileIds(), forShort, tPssrSafetyBleed.getId(), tPssrSafetyBleed.getSubId());
         return toAjax(tPssrSafetyBleedService.updateTPssrSafetyBleed(tPssrSafetyBleed));
     }
 

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

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBreath;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBreathService;
+import com.ruoyi.project.pssr.service.ITPssrTurndownService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.apache.poi.ss.usermodel.Cell;
@@ -39,11 +40,15 @@ import java.util.List;
 public class TPssrSafetyBreathController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrSafetyBreathService tPssrSafetyBreathService;
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "aqss-bh";
 
     /**
      * 查询安全设施-呼吸阀列表
@@ -55,6 +60,8 @@ public class TPssrSafetyBreathController extends BaseController {
         List<TPssrSafetyBreath> list = tPssrSafetyBreathService.selectTPssrSafetyBreathList(tPssrSafetyBreath);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bh"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-bh"));
         });
         return getDataTable(list);
     }
@@ -145,6 +152,8 @@ public class TPssrSafetyBreathController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrSafetyBreath item = tPssrSafetyBreathService.selectTPssrSafetyBreathById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bh"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-bh"));
         return AjaxResult.success(item);
     }
 

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

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBrust;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBrustService;
+import com.ruoyi.project.pssr.service.ITPssrTurndownService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.apache.poi.ss.usermodel.Cell;
@@ -39,11 +40,15 @@ import java.util.List;
 public class TPssrSafetyBrustController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrSafetyBrustService tPssrSafetyBrustService;
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "aqss-bt";
 
     /**
      * 查询安全设施-爆破片列表
@@ -55,6 +60,8 @@ public class TPssrSafetyBrustController extends BaseController {
         List<TPssrSafetyBrust> list = tPssrSafetyBrustService.selectTPssrSafetyBrustList(tPssrSafetyBrust);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bt"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-bt"));
         });
         return getDataTable(list);
     }
@@ -145,6 +152,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"));
         return AjaxResult.success(item);
     }
 

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

@@ -11,6 +11,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -26,6 +27,9 @@ public class TPssrSafetyController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
 
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
+
     @Autowired
     private RuntimeService runtimeService;
 
@@ -433,20 +437,30 @@ public class TPssrSafetyController extends BaseController {
      * 驳回泄放阀
      */
     @PutMapping("/turnDownBleed")
-    public AjaxResult turnDownBleed(@RequestBody TPssrSafetyBleed tPssrSafetyBleed) {
-        if (tPssrSafetyBleed.getIds() != null) {
+    public AjaxResult turnDownBleed(@RequestBody List<TPssrSafetyBleed> tPssrSafetyBleed) {
+        if (CollectionUtils.isNotEmpty(tPssrSafetyBleed)) {
             String userId = getUserId().toString();
+            Long subId = tPssrSafetyBleed.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrSafetyBleed.getIds()) {
+            for (TPssrSafetyBleed item : tPssrSafetyBleed) {
                 TPssrSafetyBleed blind = new TPssrSafetyBleed();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrSafetyBleedService.updateTPssrSafetyBleed(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort("aqss-bd");
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBleed.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -458,7 +472,7 @@ public class TPssrSafetyController extends BaseController {
             // 驳回 查询所有待审批的人员
             // 查询确认人
             TPssrSafetyBleed entity = new TPssrSafetyBleed();
-            entity.setSubId(tPssrSafetyBleed.getId());
+            entity.setSubId(subId);
             entity.setApproveStatus(1L);
             TPssrSafetyBleed safety = tPssrSafetyBleedService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;
@@ -513,20 +527,30 @@ public class TPssrSafetyController extends BaseController {
      * 驳回呼吸阀
      */
     @PutMapping("/turnDownBreath")
-    public AjaxResult turnDownBreath(@RequestBody TPssrSafetyBreath tPssrSafetyBreath) {
-        if (tPssrSafetyBreath.getIds() != null) {
+    public AjaxResult turnDownBreath(@RequestBody List<TPssrSafetyBreath> tPssrSafetyBreath) {
+        if (CollectionUtils.isNotEmpty(tPssrSafetyBreath)) {
             String userId = getUserId().toString();
+            Long subId = tPssrSafetyBreath.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrSafetyBreath.getIds()) {
+            for (TPssrSafetyBreath item : tPssrSafetyBreath) {
                 TPssrSafetyBreath blind = new TPssrSafetyBreath();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrSafetyBreathService.updateTPssrSafetyBreath(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort("aqss-bh");
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBreath.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -593,20 +617,30 @@ public class TPssrSafetyController extends BaseController {
      * 驳回爆破片
      */
     @PutMapping("/turnDownBrust")
-    public AjaxResult turnDownBrust(@RequestBody TPssrSafetyBrust tPssrSafetyBrust) {
-        if (tPssrSafetyBrust.getIds() != null) {
+    public AjaxResult turnDownBrust(@RequestBody List<TPssrSafetyBrust> tPssrSafetyBrust) {
+        if (CollectionUtils.isNotEmpty(tPssrSafetyBrust)) {
             String userId = getUserId().toString();
+            Long subId = tPssrSafetyBrust.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrSafetyBrust.getIds()) {
+            for (TPssrSafetyBrust item : tPssrSafetyBrust) {
                 TPssrSafetyBrust blind = new TPssrSafetyBrust();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrSafetyBrustService.updateTPssrSafetyBrust(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort("aqss-bt");
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBrust.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -673,20 +707,30 @@ public class TPssrSafetyController extends BaseController {
      * 驳回阻火器
      */
     @PutMapping("/turnDownFlamearrester")
-    public AjaxResult turnDownFlamearrester(@RequestBody TPssrSafetyFlamearrester tPssrSafetyFlamearrester) {
-        if (tPssrSafetyFlamearrester.getIds() != null) {
+    public AjaxResult turnDownFlamearrester(@RequestBody List<TPssrSafetyFlamearrester> tPssrSafetyFlamearrester) {
+        if (CollectionUtils.isNotEmpty(tPssrSafetyFlamearrester)) {
             String userId = getUserId().toString();
+            Long subId = tPssrSafetyFlamearrester.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrSafetyFlamearrester.getIds()) {
+            for (TPssrSafetyFlamearrester item : tPssrSafetyFlamearrester) {
                 TPssrSafetyFlamearrester blind = new TPssrSafetyFlamearrester();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrSafetyFlamearresterService.updateTPssrSafetyFlamearrester(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort("aqss-f");
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyFlamearrester.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -753,20 +797,30 @@ public class TPssrSafetyController extends BaseController {
      * 驳回安全阀
      */
     @PutMapping("/turnDownValve")
-    public AjaxResult turnDownValve(@RequestBody TPssrSafetyValve tPssrSafetyValve) {
-        if (tPssrSafetyValve.getIds() != null) {
+    public AjaxResult turnDownValve(@RequestBody List<TPssrSafetyValve> tPssrSafetyValve) {
+        if (CollectionUtils.isNotEmpty(tPssrSafetyValve)) {
             String userId = getUserId().toString();
+            Long subId = tPssrSafetyValve.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrSafetyValve.getIds()) {
+            for (TPssrSafetyValve item : tPssrSafetyValve) {
                 TPssrSafetyValve blind = new TPssrSafetyValve();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrSafetyValveService.updateTPssrSafetyValve(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort("aqss-v");
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyValve.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");

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

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyFlamearrester;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyFlamearresterService;
+import com.ruoyi.project.pssr.service.ITPssrTurndownService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.apache.poi.ss.usermodel.Cell;
@@ -39,11 +40,15 @@ import java.util.List;
 public class TPssrSafetyFlamearresterController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrSafetyFlamearresterService tPssrSafetyFlamearresterService;
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "aqss-f";
 
     /**
      * 查询安全设施-阻火器列表
@@ -55,6 +60,8 @@ public class TPssrSafetyFlamearresterController extends BaseController {
         List<TPssrSafetyFlamearrester> list = tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterList(tPssrSafetyFlamearrester);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-f"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-f"));
         });
         return getDataTable(list);
     }
@@ -141,6 +148,8 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrSafetyFlamearrester item = tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-f"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-f"));
         return AjaxResult.success(item);
     }
 

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

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyValve;
 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.apache.poi.ss.usermodel.Cell;
@@ -39,11 +40,15 @@ import java.util.List;
 public class TPssrSafetyValveController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrSafetyValveService tPssrSafetyValveService;
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "aqss-v";
 
     /**
      * 查询安全设施-安全阀列表
@@ -55,6 +60,8 @@ public class TPssrSafetyValveController extends BaseController {
         List<TPssrSafetyValve> list = tPssrSafetyValveService.selectTPssrSafetyValveList(tPssrSafetyValve);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-v"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-v"));
         });
         return getDataTable(list);
     }
@@ -146,6 +153,8 @@ public class TPssrSafetyValveController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrSafetyValve item = tPssrSafetyValveService.selectTPssrSafetyValveById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-v"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-v"));
         return AjaxResult.success(item);
     }
 

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

@@ -8,10 +8,7 @@ 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.TPssrBlind;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTorchvoc;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -19,6 +16,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 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;
 import org.apache.poi.ss.usermodel.Row;
@@ -45,6 +43,9 @@ import java.util.*;
 public class TPssrTorchvocController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrTorchvocService tPssrTorchvocService;
 
@@ -59,6 +60,7 @@ public class TPssrTorchvocController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "hbss";
 
     /**
      * 查询火炬，VOC系统列表
@@ -70,6 +72,8 @@ public class TPssrTorchvocController extends BaseController {
         List<TPssrTorchvoc> list = tPssrTorchvocService.selectTPssrTorchvocList(tPssrTorchvoc);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "hbss"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "hbss"));
         });
         return getDataTable(list);
     }
@@ -157,6 +161,8 @@ public class TPssrTorchvocController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrTorchvoc item = tPssrTorchvocService.selectTPssrTorchvocById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "hbss"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "hbss"));
         return AjaxResult.success(item);
     }
 
@@ -280,20 +286,30 @@ public class TPssrTorchvocController extends BaseController {
      * 驳回火炬，VOC系统
      */
     @PutMapping("/turnDownTorchvoc")
-    public AjaxResult turnDownTorchvoc(@RequestBody TPssrTorchvoc tPssrTorchvoc) {
-        if (tPssrTorchvoc.getIds() != null) {
+    public AjaxResult turnDownTorchvoc(@RequestBody List<TPssrTorchvoc> tPssrTorchvoc) {
+        if (CollectionUtils.isNotEmpty(tPssrTorchvoc)) {
             String userId = getUserId().toString();
+            Long subId = tPssrTorchvoc.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrTorchvoc.getIds()) {
+            for (TPssrTorchvoc item : tPssrTorchvoc) {
                 TPssrTorchvoc blind = new TPssrTorchvoc();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrTorchvocService.updateTPssrTorchvoc(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrTorchvoc.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
             TaskService taskService = processEngine.getTaskService();
@@ -305,7 +321,7 @@ public class TPssrTorchvocController extends BaseController {
 
             // 驳回 查询所有待审批的人员
             TPssrTorchvoc blind = new TPssrTorchvoc();
-            blind.setSubId(tPssrTorchvoc.getSubId());
+            blind.setSubId(subId);
             blind.setApproveStatus(1L);
             Set<String> installer = new HashSet<>();
             Set<String> remover = new HashSet<>();
@@ -326,7 +342,7 @@ public class TPssrTorchvocController extends BaseController {
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrTorchvoc.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回");
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -0,0 +1,97 @@
+package com.ruoyi.project.pssr.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.ITPssrTurndownService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * PSSR驳回原因Controller
+ *
+ * @author ssy
+ * @date 2024-11-25
+ */
+@RestController
+@RequestMapping("/pssr/turndown")
+public class TPssrTurndownController extends BaseController
+{
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
+
+    /**
+     * 查询PSSR驳回原因列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TPssrTurndown tPssrTurndown)
+    {
+        startPage();
+        List<TPssrTurndown> list = tPssrTurndownService.selectTPssrTurndownList(tPssrTurndown);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出PSSR驳回原因列表
+     */
+    @Log(title = "PSSR驳回原因", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPssrTurndown tPssrTurndown)
+    {
+        List<TPssrTurndown> list = tPssrTurndownService.selectTPssrTurndownList(tPssrTurndown);
+        ExcelUtil<TPssrTurndown> util = new ExcelUtil<TPssrTurndown>(TPssrTurndown.class);
+        return util.exportExcel(list, "turndown");
+    }
+
+    /**
+     * 获取PSSR驳回原因详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tPssrTurndownService.selectTPssrTurndownById(id));
+    }
+
+    /**
+     * 新增PSSR驳回原因
+     */
+    @Log(title = "PSSR驳回原因", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPssrTurndown tPssrTurndown)
+    {
+        return toAjax(tPssrTurndownService.insertTPssrTurndown(tPssrTurndown));
+    }
+
+    /**
+     * 修改PSSR驳回原因
+     */
+    @Log(title = "PSSR驳回原因", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPssrTurndown tPssrTurndown)
+    {
+        return toAjax(tPssrTurndownService.updateTPssrTurndown(tPssrTurndown));
+    }
+
+    /**
+     * 删除PSSR驳回原因
+     */
+    @Log(title = "PSSR驳回原因", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tPssrTurndownService.deleteTPssrTurndownByIds(ids));
+    }
+}

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

@@ -20,6 +20,7 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -46,6 +47,9 @@ import java.util.*;
 public class TPssrVesselController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+
+    @Autowired
+    private ITPssrTurndownService tPssrTurndownService;
     @Autowired
     private ITPssrVesselService tPssrVesselService;
 
@@ -68,6 +72,7 @@ public class TPssrVesselController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private String forShort = "ylrq";
 
     /**
      * 查询压力容器列表
@@ -79,6 +84,8 @@ public class TPssrVesselController extends BaseController {
         List<TPssrVessel> list = tPssrVesselService.selectTPssrVesselList(tPssrVessel);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylrq"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ylrq"));
         });
         return getDataTable(list);
     }
@@ -165,6 +172,8 @@ public class TPssrVesselController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrVessel item = tPssrVesselService.selectTPssrVesselById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylrq"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ylrq"));
         return AjaxResult.success(item);
     }
 
@@ -332,20 +341,30 @@ public class TPssrVesselController extends BaseController {
      * 驳回压力容器
      */
     @PutMapping("/turnDownVessel")
-    public AjaxResult turnDownVessel(@RequestBody TPssrVessel tPssrVessel) {
-        if (tPssrVessel.getIds() != null) {
+    public AjaxResult turnDownVessel(@RequestBody List<TPssrVessel> tPssrVessel) {
+        if (CollectionUtils.isNotEmpty(tPssrVessel)) {
             String userId = getUserId().toString();
+            Long subId = tPssrVessel.get(0).getSubId();
             // 修改已选择数据的状态
-            for (Long id : tPssrVessel.getIds()) {
+            for (TPssrVessel item : tPssrVessel) {
                 TPssrVessel blind = new TPssrVessel();
-                blind.setId(id);
+                blind.setId(item.getId());
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrVesselService.updateTPssrVessel(blind);
+                // 新增驳回原因数据
+                TPssrTurndown turndown = new TPssrTurndown();
+                turndown.setForShort(forShort);
+                turndown.setSubId(item.getSubId());
+                turndown.setItemId(item.getId());
+                turndown.setReason(item.getReason());
+                turndown.setCreatedate(new Date());
+                turndown.setCreaterCode(getUserId().toString());
+                tPssrTurndownService.insertTPssrTurndown(turndown);
             }
             // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrVessel.getSubId());
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
 
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
@@ -358,7 +377,7 @@ public class TPssrVesselController extends BaseController {
 
             //查询确认人
             TPssrPipe entity = new TPssrPipe();
-            entity.setSubId(tPssrVessel.getSubId());
+            entity.setSubId(subId);
             entity.setApproveStatus(1L);
             TPssrPipe tPssrPipe = tPssrPipeService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;

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

@@ -118,6 +118,16 @@ public class TPssrAirtight extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -85,6 +85,16 @@ public class TPssrAlarm extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -106,6 +106,16 @@ public class TPssrAnalyzer extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -46,6 +46,16 @@ public class TPssrApprove extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -177,6 +177,16 @@ public class TPssrBlind extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -130,6 +130,16 @@ public class TPssrCircuit extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -110,6 +110,16 @@ public class TPssrCleaning extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -85,6 +85,16 @@ public class TPssrContentModel extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -140,6 +140,16 @@ public class TPssrFrame extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -102,6 +102,16 @@ public class TPssrFranklinism extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -106,6 +106,16 @@ public class TPssrGasdetector extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -98,6 +98,16 @@ public class TPssrHygiene extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -110,6 +110,16 @@ public class TPssrInstrumentCalibration extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -85,6 +85,16 @@ public class TPssrInstrumentTest extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -100,6 +100,16 @@ public class TPssrLaboratory extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -114,6 +114,16 @@ public class TPssrLighting extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -141,6 +141,16 @@ public class TPssrLock extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -103,6 +103,16 @@ public class TPssrMaterial extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -103,6 +103,16 @@ public class TPssrMaterialRaw extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -27,6 +27,16 @@ public class TPssrMeasure extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -104,6 +104,16 @@ public class TPssrMoc extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -106,6 +106,16 @@ public class TPssrMotor extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -111,6 +111,16 @@ public class TPssrNitrogen extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -105,6 +105,16 @@ public class TPssrOverhaulExchanger extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public Long getDevType() {
         return devType;
     }

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

@@ -115,6 +115,16 @@ public class TPssrOverhaulFilter extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -99,6 +99,16 @@ public class TPssrOverhaulPipe extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -103,6 +103,16 @@ public class TPssrOverhaulPump extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -103,6 +103,16 @@ public class TPssrOverhaulTower extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -147,6 +147,16 @@ public class TPssrOverhaulValve extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -98,6 +98,16 @@ public class TPssrPatrol extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -115,6 +115,16 @@ public class TPssrPipe extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -92,6 +92,16 @@ public class TPssrPower extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -116,6 +116,16 @@ public class TPssrProgramme extends BaseEntity {
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -98,6 +98,16 @@ public class TPssrProtection extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -94,6 +94,16 @@ public class TPssrPublic extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -114,6 +114,16 @@ public class TPssrPumpCleaning extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -114,6 +114,16 @@ public class TPssrPumpFill extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -106,6 +106,16 @@ public class TPssrPumpOverhaul extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -155,6 +155,16 @@ public class TPssrSafetyBleed extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -155,6 +155,16 @@ public class TPssrSafetyBreath extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -125,6 +125,16 @@ public class TPssrSafetyBrust extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -109,6 +109,16 @@ public class TPssrSafetyFlamearrester extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -129,6 +129,16 @@ public class TPssrSafetyValve extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -112,6 +112,16 @@ public class TPssrSubcontent extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -110,6 +110,16 @@ public class TPssrTorchvoc extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -0,0 +1,194 @@
+package com.ruoyi.project.pssr.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * PSSR驳回原因对象 t_pssr_turndown
+ *
+ * @author ssy
+ * @date 2024-11-25
+ */
+public class TPssrTurndown extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 检查内容表id */
+    @Excel(name = "检查内容表id")
+    private Long subId;
+
+    /** 子表id */
+    @Excel(name = "子表id")
+    private Long itemId;
+
+    /** 关联表简称 */
+    @Excel(name = "关联表简称")
+    private String forShort;
+
+    /** 驳回原因 */
+    @Excel(name = "驳回原因")
+    private String reason;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setSubId(Long subId)
+    {
+        this.subId = subId;
+    }
+
+    public Long getSubId()
+    {
+        return subId;
+    }
+    public void setItemId(Long itemId)
+    {
+        this.itemId = itemId;
+    }
+
+    public Long getItemId()
+    {
+        return itemId;
+    }
+    public void setForShort(String forShort)
+    {
+        this.forShort = forShort;
+    }
+
+    public String getForShort()
+    {
+        return forShort;
+    }
+    public void setReason(String reason)
+    {
+        this.reason = reason;
+    }
+
+    public String getReason()
+    {
+        return reason;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("subId", getSubId())
+            .append("itemId", getItemId())
+            .append("forShort", getForShort())
+            .append("reason", getReason())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

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

@@ -27,6 +27,16 @@ public class TPssrVessel extends BaseEntity
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

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

@@ -0,0 +1,64 @@
+package com.ruoyi.project.pssr.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+
+/**
+ * PSSR驳回原因Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-11-25
+ */
+public interface TPssrTurndownMapper 
+{
+    /**
+     * 查询PSSR驳回原因
+     * 
+     * @param id PSSR驳回原因ID
+     * @return PSSR驳回原因
+     */
+    public TPssrTurndown selectTPssrTurndownById(Long id);
+    public String selectTPssrTurndownByItem(TPssrTurndown tPssrTurndown);
+
+    /**
+     * 查询PSSR驳回原因列表
+     * 
+     * @param tPssrTurndown PSSR驳回原因
+     * @return PSSR驳回原因集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TPssrTurndown> selectTPssrTurndownList(TPssrTurndown tPssrTurndown);
+
+    /**
+     * 新增PSSR驳回原因
+     * 
+     * @param tPssrTurndown PSSR驳回原因
+     * @return 结果
+     */
+    public int insertTPssrTurndown(TPssrTurndown tPssrTurndown);
+
+    /**
+     * 修改PSSR驳回原因
+     * 
+     * @param tPssrTurndown PSSR驳回原因
+     * @return 结果
+     */
+    public int updateTPssrTurndown(TPssrTurndown tPssrTurndown);
+
+    /**
+     * 删除PSSR驳回原因
+     * 
+     * @param id PSSR驳回原因ID
+     * @return 结果
+     */
+    public int deleteTPssrTurndownById(Long id);
+
+    /**
+     * 批量删除PSSR驳回原因
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPssrTurndownByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.project.pssr.service;
+
+import java.util.List;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+
+/**
+ * PSSR驳回原因Service接口
+ * 
+ * @author ssy
+ * @date 2024-11-25
+ */
+public interface ITPssrTurndownService 
+{
+    /**
+     * 查询PSSR驳回原因
+     * 
+     * @param id PSSR驳回原因ID
+     * @return PSSR驳回原因
+     */
+    public TPssrTurndown selectTPssrTurndownById(Long id);
+    public String selectTPssrTurndownByItem(Long subId,Long itemId, String forShort);
+
+    /**
+     * 查询PSSR驳回原因列表
+     * 
+     * @param tPssrTurndown PSSR驳回原因
+     * @return PSSR驳回原因集合
+     */
+    public List<TPssrTurndown> selectTPssrTurndownList(TPssrTurndown tPssrTurndown);
+
+    /**
+     * 新增PSSR驳回原因
+     * 
+     * @param tPssrTurndown PSSR驳回原因
+     * @return 结果
+     */
+    public int insertTPssrTurndown(TPssrTurndown tPssrTurndown);
+
+    /**
+     * 修改PSSR驳回原因
+     * 
+     * @param tPssrTurndown PSSR驳回原因
+     * @return 结果
+     */
+    public int updateTPssrTurndown(TPssrTurndown tPssrTurndown);
+
+    /**
+     * 批量删除PSSR驳回原因
+     * 
+     * @param ids 需要删除的PSSR驳回原因ID
+     * @return 结果
+     */
+    public int deleteTPssrTurndownByIds(Long[] ids);
+
+    /**
+     * 删除PSSR驳回原因信息
+     * 
+     * @param id PSSR驳回原因ID
+     * @return 结果
+     */
+    public int deleteTPssrTurndownById(Long id);
+}

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

@@ -0,0 +1,102 @@
+package com.ruoyi.project.pssr.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.pssr.mapper.TPssrTurndownMapper;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.ITPssrTurndownService;
+
+/**
+ * PSSR驳回原因Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-11-25
+ */
+@Service
+public class TPssrTurndownServiceImpl implements ITPssrTurndownService
+{
+    @Autowired
+    private TPssrTurndownMapper tPssrTurndownMapper;
+
+    /**
+     * 查询PSSR驳回原因
+     *
+     * @param id PSSR驳回原因ID
+     * @return PSSR驳回原因
+     */
+    @Override
+    public TPssrTurndown selectTPssrTurndownById(Long id)
+    {
+        return tPssrTurndownMapper.selectTPssrTurndownById(id);
+    }
+   @Override
+    public String selectTPssrTurndownByItem(Long subId,Long itemId, String forShort)
+    {
+        TPssrTurndown turndown = new TPssrTurndown();
+        turndown.setItemId(itemId);
+        turndown.setSubId(subId);
+        turndown.setForShort(forShort);
+        return tPssrTurndownMapper.selectTPssrTurndownByItem(turndown);
+    }
+
+    /**
+     * 查询PSSR驳回原因列表
+     *
+     * @param tPssrTurndown PSSR驳回原因
+     * @return PSSR驳回原因
+     */
+    @Override
+    public List<TPssrTurndown> selectTPssrTurndownList(TPssrTurndown tPssrTurndown)
+    {
+        return tPssrTurndownMapper.selectTPssrTurndownList(tPssrTurndown);
+    }
+
+    /**
+     * 新增PSSR驳回原因
+     *
+     * @param tPssrTurndown PSSR驳回原因
+     * @return 结果
+     */
+    @Override
+    public int insertTPssrTurndown(TPssrTurndown tPssrTurndown)
+    {
+        return tPssrTurndownMapper.insertTPssrTurndown(tPssrTurndown);
+    }
+
+    /**
+     * 修改PSSR驳回原因
+     *
+     * @param tPssrTurndown PSSR驳回原因
+     * @return 结果
+     */
+    @Override
+    public int updateTPssrTurndown(TPssrTurndown tPssrTurndown)
+    {
+        return tPssrTurndownMapper.updateTPssrTurndown(tPssrTurndown);
+    }
+
+    /**
+     * 批量删除PSSR驳回原因
+     *
+     * @param ids 需要删除的PSSR驳回原因ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPssrTurndownByIds(Long[] ids)
+    {
+        return tPssrTurndownMapper.deleteTPssrTurndownByIds(ids);
+    }
+
+    /**
+     * 删除PSSR驳回原因信息
+     *
+     * @param id PSSR驳回原因ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPssrTurndownById(Long id)
+    {
+        return tPssrTurndownMapper.deleteTPssrTurndownById(id);
+    }
+}

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

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.pssr.mapper.TPssrTurndownMapper">
+    
+    <resultMap type="TPssrTurndown" id="TPssrTurndownResult">
+        <result property="id"    column="id"    />
+        <result property="subId"    column="sub_id"    />
+        <result property="itemId"    column="item_id"    />
+        <result property="forShort"    column="for_short"    />
+        <result property="reason"    column="reason"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTPssrTurndownVo">
+        select d.id, d.sub_id, d.item_id, d.for_short, d.reason, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_turndown d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTPssrTurndownList" parameterType="TPssrTurndown" resultMap="TPssrTurndownResult">
+        <include refid="selectTPssrTurndownVo"/>
+        <where>  
+            <if test="subId != null "> and sub_id = #{subId}</if>
+            <if test="itemId != null "> and item_id = #{itemId}</if>
+            <if test="forShort != null  and forShort != ''"> and for_short = #{forShort}</if>
+            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectTPssrTurndownByItem" parameterType="TPssrTurndown" resultType="string">
+        select reason from (
+        select reason from t_pssr_turndown d
+        <where>
+            <if test="subId != null ">and sub_id = #{subId}</if>
+            <if test="itemId != null ">and item_id = #{itemId}</if>
+            <if test="forShort != null  and forShort != ''">and for_short = #{forShort}</if>
+            and d.del_flag = 0
+        </where>
+        order by createdate desc
+        )
+        WHERE ROWNUM = 1
+    </select>
+    
+    <select id="selectTPssrTurndownById" parameterType="Long" resultMap="TPssrTurndownResult">
+        <include refid="selectTPssrTurndownVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTPssrTurndown" parameterType="TPssrTurndown">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_pssr_turndown.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_pssr_turndown
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="subId != null">sub_id,</if>
+            <if test="itemId != null">item_id,</if>
+            <if test="forShort != null">for_short,</if>
+            <if test="reason != null">reason,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="subId != null">#{subId},</if>
+            <if test="itemId != null">#{itemId},</if>
+            <if test="forShort != null">#{forShort},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPssrTurndown" parameterType="TPssrTurndown">
+        update t_pssr_turndown
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="subId != null">sub_id = #{subId},</if>
+            <if test="itemId != null">item_id = #{itemId},</if>
+            <if test="forShort != null">for_short = #{forShort},</if>
+            <if test="reason != null">reason = #{reason},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTPssrTurndownById" parameterType="Long">
+        update t_pssr_turndown set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTPssrTurndownByIds" parameterType="String">
+        update t_pssr_turndown set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/pssr/turndown.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询PSSR驳回原因列表
+export function listTurndown(query) {
+  return request({
+    url: '/pssr/turndown/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询PSSR驳回原因详细
+export function getTurndown(id) {
+  return request({
+    url: '/pssr/turndown/' + id,
+    method: 'get'
+  })
+}
+
+// 新增PSSR驳回原因
+export function addTurndown(data) {
+  return request({
+    url: '/pssr/turndown',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改PSSR驳回原因
+export function updateTurndown(data) {
+  return request({
+    url: '/pssr/turndown',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除PSSR驳回原因
+export function delTurndown(id) {
+  return request({
+    url: '/pssr/turndown/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出PSSR驳回原因
+export function exportTurndown(query) {
+  return request({
+    url: '/pssr/turndown/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -1,24 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <!--<el-form-item label="从表id" prop="subId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.subId"-->
-          <!--placeholder="请输入从表id"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="审批id" prop="approveId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.approveId"-->
-          <!--placeholder="请输入审批id"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
       <el-form-item label="单元" prop="unit">
         <el-input
           v-model="queryParams.unit"
@@ -91,84 +73,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--<el-form-item label="确认人" prop="identifyingPerson">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.identifyingPerson"-->
-          <!--placeholder="请输入确认人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <el-form-item label="确认人1" prop="confirm1">
-        <el-input
-          v-model="queryParams.confirm1"
-          placeholder="请输入确认人1"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="确认人2" prop="confirm2">
-        <el-input
-          v-model="queryParams.confirm2"
-          placeholder="请输入确认人2"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="确认日期" prop="confirmationDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.confirmationDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择确认日期">
-        </el-date-picker>
-      </el-form-item>
-      <!--<el-form-item label="创建人" prop="createrCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.createrCode"-->
-          <!--placeholder="请输入创建人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="创建时间" prop="createdate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.createdate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择创建时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="修改人" prop="updaterCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.updaterCode"-->
-          <!--placeholder="请输入修改人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="修改时间" prop="updatedate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.updatedate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择修改时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="部门编号" prop="deptId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.deptId"-->
-          <!--placeholder="请输入部门编号"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
       <el-form-item label="备注" prop="remarks">
         <el-input
           v-model="queryParams.remarks"
@@ -284,9 +188,6 @@
 
     <el-table v-loading="loading" :data="airtightList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <!--<el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="从表id" align="center" prop="subId" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="审批id" align="center" prop="approveId" :show-overflow-tooltip="true"/>-->
       <el-table-column label="审批状态" align="center" prop="approveStatus" width="100">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
@@ -322,28 +223,14 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <!--<el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="创建时间" align="center" prop="createdate" width="100">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="修改时间" align="center" prop="updatedate" width="100">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
-
           <el-button
             size="mini"
             type="text"
             icon="el-icon-folder"
-            v-if="scope.row.approveStatus!=2"
             @click="handleDoc(scope.row)"
           >附件
           </el-button>
@@ -376,12 +263,6 @@
     <!-- 添加或修改气密对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <!--<el-form-item label="从表id" prop="subId">-->
-          <!--<el-input v-model="form.subId" placeholder="请输入从表id" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="审批id" prop="approveId">-->
-          <!--<el-input v-model="form.approveId" placeholder="请输入审批id" />-->
-        <!--</el-form-item>-->
         <el-form-item label="单元" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入单元" />
         </el-form-item>
@@ -403,9 +284,6 @@
         <el-form-item label="合格标准" prop="standard">
           <el-input v-model="form.standard" placeholder="请输入合格标准" />
         </el-form-item>
-        <!--<el-form-item label="确认人" prop="identifyingPerson">-->
-          <!--<el-input v-model="form.identifyingPerson" placeholder="请输入确认人" />-->
-        <!--</el-form-item>-->
         <el-form-item label="确认人1" prop="confirm1">
           <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人1">
@@ -432,40 +310,9 @@
             placeholder="选择确认日期">
           </el-date-picker>
         </el-form-item>
-        <!--<el-form-item label="删除状态" prop="delFlag">-->
-          <!--<el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="创建人" prop="createrCode">-->
-          <!--<el-input v-model="form.createrCode" placeholder="请输入创建人" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="创建时间" prop="createdate">-->
-          <!--<el-date-picker clearable size="small" style="width: 200px"-->
-            <!--v-model="form.createdate"-->
-            <!--type="date"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--placeholder="选择创建时间">-->
-          <!--</el-date-picker>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="修改人" prop="updaterCode">-->
-          <!--<el-input v-model="form.updaterCode" placeholder="请输入修改人" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="修改时间" prop="updatedate">-->
-          <!--<el-date-picker clearable size="small" style="width: 200px"-->
-            <!--v-model="form.updatedate"-->
-            <!--type="date"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--placeholder="选择修改时间">-->
-          <!--</el-date-picker>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="部门编号" prop="deptId">-->
-          <!--<el-input v-model="form.deptId" placeholder="请输入部门编号" />-->
-        <!--</el-form-item>-->
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
-          <!--<el-form-item label="归属部门" prop="deptId">-->
-              <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />-->
-          <!--</el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -511,6 +358,26 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
+
+
+
+    <!-- 附件对话框 -->
+    <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="reason.open" append-to-body title="驳回"
+               width="1000px">
+      <el-table  :data="items" border>
+        <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
+        <el-table-column label="系统名称" align="center" prop="systemName" :show-overflow-tooltip="true"/>
+        <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -550,6 +417,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -566,6 +436,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -710,6 +581,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -822,24 +694,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownAirtight(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+      this.reason.open = true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -863,6 +718,16 @@ export default {
         });
       });
     },
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownAirtight(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -0,0 +1,238 @@
+<template>
+  <div class="app-container">
+
+  </div>
+</template>
+
+<script>
+import { listTurndown, getTurndown, delTurndown, addTurndown, updateTurndown, exportTurndown, importTemplate} from "@/api/pssr/turndown";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Turndown",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // PSSR驳回原因表格数据
+      turndownList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/pssr/turndown/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        subId: null,
+        itemId: null,
+        forShort: null,
+        reason: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询PSSR驳回原因列表 */
+    getList() {
+      this.loading = true;
+      listTurndown(this.queryParams).then(response => {
+        this.turndownList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        subId: null,
+        itemId: null,
+        forShort: null,
+        reason: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加PSSR驳回原因";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTurndown(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改PSSR驳回原因";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTurndown(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTurndown(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delTurndown(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有PSSR驳回原因数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportTurndown(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>