关系转移流程

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TApproveDangerController.java

@@ -37,7 +37,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 隐患申请Controller
+ * 流程处理
  *
  * @author ruoyi
  * @date 2021-02-20
@@ -46,9 +46,6 @@ import java.util.stream.Collectors;
 @RequestMapping("/ehs/approvedanger")
 public class TApproveDangerController extends BaseController {
 
-    @Autowired
-    private RuntimeService runtimeService;
-
     @Autowired
     private HistoryService historyService;
 
@@ -64,131 +61,6 @@ public class TApproveDangerController extends BaseController {
     @Autowired
     private ITBranchMemberService memberService;
 
-//    @Autowired
-//    private ITApproveDangerService tApproveDangerService;
-
-//    @Autowired
-//    private ITApproveAccidentService tApproveAccidentService;
-
-
-
-//    @Autowired
-//    private ITCommonfileService tCommonfileService;
-//    @Autowired
-//    private ITApproveService tApproveService;
-//    @Autowired
-//    private ITApproveSpecModifyService tApproveSpecModifyService;
-//    @Autowired
-//    private ITStApproveService tStApproveService;
-//    @Autowired
-//    private ITApproveMaintenanceService tApproveMaintenanceService;
-//    @Autowired
-//    private ITIntactApproveService tIntactApproveService;
-//    @Autowired
-//    private ITKekaoApproveService tKekaoApproveService;
-//    @Autowired
-//    private ITApproveReserveInvoiceService tApproveReserveInvoiceService;
-//
-//    @Autowired
-//    private ITApplyOfflinevalveService tApplyOfflinevalveService;
-//
-//    @Autowired
-//    private ITApplySafetychangeService tApplySafetychangeService;
-//
-//    @Autowired
-//    private ITSaiApplyService tSaiApplyService;
-
-//    /**
-//     * 任务申请
-//     */
-//    @PostMapping("/save")
-//    public AjaxResult save(@RequestBody TApproveDanger tApprove) {
-//        try {
-//            logger.info("任务申请" + JSON.toJSONString(tApprove));
-//            Long userid = getUserId();
-//            //审批编号
-//            Date dt = new Date();
-//            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
-//            String data = sdf.format(dt) + userid;
-//            tApprove.setApproveNo(data);
-//            tApprove.setRecorderId(userid);
-//            logger.info("tApprove:" + tApprove);
-//            tApproveDangerService.insertTApproveDanger(tApprove);
-//
-//            Map<String, Object> variables = new HashMap<>();
-//            //执行人、验证人确认
-//            Long verificationId = null;
-//            Long deptId = sysUserService.selectUserById(userid).getDeptId();
-//            List<SysUser> deptPerson = sysUserService.selectUserByDept(deptId);
-//            for (SysUser s : deptPerson) {
-//                SysUserRole userRole = sysUserService.selectRoleByUserId(s.getUserId());
-//                if (userRole.getRoleId() == 100) {
-//                    verificationId = userRole.getUserId();
-//                }
-//            }
-//            tApprove.setVerificationId(verificationId);
-//
-//            //开始工作流、监听
-//            variables.put("endSucessListener", new EndSucessListener());
-//            variables.put("recorderTaskCreateListener", new RecorderTaskCreateListener());
-//            variables.put("executorTaskCreateListener", new ExecutorTaskCreateListener());
-//            variables.put("verificationTaskCreateListener", new VerificationTaskCreateListener());
-//
-//            //审批人员设置
-//            variables.put("recorder", userid);
-//            variables.put("executor", tApprove.getExecutorId());
-//            variables.put("verification", verificationId);
-//            logger.info("executor:" + tApprove.getExecutorId());
-//            logger.info("verification:" + verificationId);
-//
-//            long bussniseeKey = tApprove.getId();
-//            logger.info("bussniseeKey:" + bussniseeKey);
-//            Authentication.setAuthenticatedUserId(userid.toString());
-//            //采用key来启动流程定义并设置流程变量，返回流程实例
-//            ProcessInstance pi = null;
-//            if (tApprove.getHiddendangerLevel() == 2) {
-//                pi = runtimeService.startProcessInstanceByKey("commonProcess", String.valueOf(bussniseeKey), variables);
-//            } else if (tApprove.getHiddendangerLevel() == 3) {
-//                //初始化会签人员
-//                List<Long> confirmlist = new ArrayList<>();
-//                confirmlist.add(tApprove.getConfirmoneId());
-//                confirmlist.add(tApprove.getConfirmtwoId());
-//                //条件表达式方法 一定要序列号
-//                variables.put("confirmlist", confirmlist);
-//                pi = runtimeService.startProcessInstanceByKey("majorProcess", String.valueOf(bussniseeKey), variables);
-//            }
-//
-//            logger.info("流程部署id：" + pi.getDeploymentId());
-//            logger.info("流程定义id：" + pi.getProcessDefinitionId());
-//            logger.info("流程实例id：" + pi.getProcessInstanceId());
-//            logger.info("流程定义对象：" + pi.getProcessVariables());
-//            tApprove.setProcessId(Long.parseLong(pi.getProcessInstanceId()));
-//
-//            logger.info("tApprove:" + tApprove);
-//            tApproveDangerService.updateTApproveDanger(tApprove);
-//        } catch (Exception e) {
-//            logger.info("e:" + e);
-//        }
-//        return AjaxResult.success("申请成功", tApprove);
-//    }
-
-//    /**
-//     * 一般隐患任务申请
-//     */
-//    @PostMapping("/savegeneral")
-//    public AjaxResult saveGeneral(@RequestBody TApproveDanger tApprove) {
-//        try {
-//            Long userid = getUserId();
-//            tApprove.setRecorderId(userid);
-//            logger.info("tApprove:" + tApprove);
-//            //tApproveDangerService.insertTApproveDanger(tApprove);
-//        } catch (Exception e) {
-//            logger.info("e:" + e);
-//            return AjaxResult.error(e.toString());
-//        }
-//        return AjaxResult.success("申请成功");
-//    }
-
     /**
      * 我的申请列表
      */
@@ -219,62 +91,9 @@ public class TApproveDangerController extends BaseController {
                 try {
                     if (pi.getProcessDefinitionName().equals("通用审批流程")) {
                         TBranchMember member = memberService.selectTBranchMemberByMemberId(Long.parseLong(h.getBusinessKey()));
-                        devProcess.setMember(member);
+                        devProcess.setObj(member);
                         devProcess.setApNo(member.getApNo());
                     }
-//                    else if (pi.getProcessDefinitionName().equals("年度检查报告申请")) {
-//                        TApprove approve = tApproveService.selectTApproveById(Long.parseLong(h.getBusinessKey()));
-//                        devProcess.setSpecApprove(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    } else if (pi.getProcessDefinitionName().equals("月度检查")) {
-//                        TApprove approve = tApproveService.selectTApproveById(Long.parseLong(h.getBusinessKey()));
-//                        devProcess.setSpecApprove(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    } else if (pi.getProcessDefinitionName().equals("设备修改/删除审核") || pi.getProcessDefinitionName().equals("设备新增/删除审核")) {
-//                        TApproveSpecModify approve = tApproveSpecModifyService.selectTApproveSpecModifyById(Long.parseLong(pi.getBusinessKey()));
-//                        devProcess.setApproveSpecModify(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    } else if (pi.getProcessDefinitionName().equals("事件审批流程")) {
-//                        TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(h.getBusinessKey()));
-//                        devProcess.settApprove(approveDanger);
-//                        devProcess.setApNo(approveDanger.getApproveNo());
-//                    } else if (pi.getProcessDefinitionName().equals("重大隐患审批流程") || pi.getProcessDefinitionName().equals("普通隐患审批流程")) {
-//                        TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(h.getBusinessKey()));
-//                        devProcess.settApprove(approveDanger);
-//                        devProcess.setApNo(approveDanger.getApproveNo());
-//                    } else if (pi.getProcessDefinitionName().equals("专项培训计划审核")) {
-//                        TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
-//                        devProcess.setApproveObject(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    } else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
-//                        TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
-//                        devProcess.setApproveObject(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    } else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
-//                        TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
-//                        devProcess.setApproveObject(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    } else if (pi.getProcessDefinitionName().equals("可靠性管理申请")) {
-//                        TKekaoApprove approve = tKekaoApproveService.selectTKekaoApproveById(Long.parseLong(pi.getBusinessKey()));
-//                        devProcess.setApproveObject(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    } else if (pi.getProcessDefinitionName().equals("预约开票审批流程")) {
-//                        TApproveReserveInvoice approve = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(pi.getBusinessKey()));
-//                        devProcess.setApproveObject(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    } else if (pi.getProcessDefinitionName().equals("安全阀离线/切出申请流程")) {
-//                        TApplyOfflinevalve approve = tApplyOfflinevalveService.selectTApplyOfflinevalveById(Long.parseLong(pi.getBusinessKey()));
-//                        devProcess.setApproveObject(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    } else if (pi.getProcessDefinitionName().equals("组织保护措施状态变更申请流程")) {
-//                        TApplySafetychange approve = tApplySafetychangeService.selectTApplySafetychangeById(Long.parseLong(pi.getBusinessKey()));
-//                        devProcess.setApproveObject(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    } else if (pi.getProcessDefinitionName().equals("SAI开项申请流程")) {
-//                        TSaiApply approve = tSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
-//                        devProcess.setApproveObject(approve);
-//                        devProcess.setApNo(approve.getApNo());
-//                    }
                 } catch (Exception e) {
                     logger.error(e.toString());
                 }
@@ -288,7 +107,6 @@ public class TApproveDangerController extends BaseController {
                 } else {
                     devProcess.setEnd(false);
                 }
-                ;
                 logger.info("devProcess:" + devProcess);
                 list.add(devProcess);
             }
@@ -334,74 +152,12 @@ public class TApproveDangerController extends BaseController {
                 devTask.setProcessName(pi.getProcessDefinitionName());
                 devTask.setProcessCreateTime(pi.getStartTime());
                 devTask.setBusinessKey(pi.getBusinessKey());
+                devTask.setBusinessKey(pi.getBusinessKey());
                 if (pi.getProcessDefinitionName().equals("通用审批流程")) {
                     TBranchMember member = memberService.selectTBranchMemberByMemberId(Long.parseLong(pi.getBusinessKey()));
                     devTask.setObj(member);
                     devTask.setApNo(member.getApNo());
                 }
-//                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());
-//                }
                 list.add(devTask);
             }
         }
@@ -439,82 +195,8 @@ public class TApproveDangerController extends BaseController {
                     SysUser user = sysUserService.selectUserById(member.getUserId());
                     devProcess.setApNo(member.getApNo());
                     devProcess.setApName(user.getNickName());
-                    devProcess.setMember(member);
+                    devProcess.setObj(member);
                 }
-//                else if (pi.getProcessDefinitionName().equals("年度检查报告申请")) {
-//                    TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(approve.getUserId());
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setSpecApprove(approve);
-//                } else if (pi.getProcessDefinitionName().equals("月度检查")) {
-//                    TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(approve.getUserId());
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setSpecApprove(approve);
-//                } else if (pi.getProcessDefinitionName().equals("设备修改/删除审核") || pi.getProcessDefinitionName().equals("设备新增/删除审核")) {
-//                    TApproveSpecModify approve = tApproveSpecModifyService.selectTApproveSpecModifyById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(approve.getUserId());
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setApproveSpecModify(approve);
-//                } else if (pi.getProcessDefinitionName().equals("专项培训计划审核")) {
-//                    TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(approve.getUserId());
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setApproveObject(approve);
-//                } else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
-//                    TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(approve.getUserId());
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setApproveObject(approve);
-//                } else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
-//                    TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(approve.getUserId());
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setApproveObject(approve);
-//                } else if (pi.getProcessDefinitionName().equals("可靠性管理申请")) {
-//                    TKekaoApprove approve = tKekaoApproveService.selectTKekaoApproveById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(approve.getUserId());
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setApproveObject(approve);
-//                } else if (pi.getProcessDefinitionName().equals("预约开票审批流程")) {
-//                    TApproveReserveInvoice approve = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(approve.getUserId());
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setApproveObject(approve);
-//                } else if (pi.getProcessDefinitionName().equals("安全阀离线/切出申请流程")) {
-//                    TApplyOfflinevalve approve = tApplyOfflinevalveService.selectTApplyOfflinevalveById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(Long.valueOf(approve.getCreaterCode()));
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setApproveObject(approve);
-//                }  else if (pi.getProcessDefinitionName().equals("组织保护措施状态变更申请流程")) {
-//                    TApplySafetychange approve = tApplySafetychangeService.selectTApplySafetychangeById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(Long.valueOf(approve.getCreaterCode()));
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setApproveObject(approve);
-//                } else if (pi.getProcessDefinitionName().equals("SAI开项申请流程")) {
-//                    TSaiApply approve = tSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(Long.valueOf(approve.getCreateBy()));
-//                    devProcess.setApNo(approve.getApNo());
-//                    devProcess.setApName(user.getNickName());
-//                    devProcess.setApproveObject(approve);
-//                } else {
-//                    TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(pi.getBusinessKey()));
-//                    SysUser user = sysUserService.selectUserById(approveDanger.getRecorderId());
-//                    approveDanger.setRecorderName(user.getNickName());
-//                    devProcess.settApprove(approveDanger);
-//                    devProcess.setApNo(approveDanger.getApproveNo());
-//                    devProcess.setApName(user.getNickName());
-//                }
                 devProcess.setBusinessKey(pi.getBusinessKey());
                 devProcess.setProcessCreateTime(pi.getStartTime());
                 devProcess.setProcessId(pi.getId());
@@ -532,55 +214,6 @@ public class TApproveDangerController extends BaseController {
         return getDataTable(list,count);
     }
 
-//    /**
-//     * 审核处理
-//     */
-//    @Log(title = "隐患审核处理", businessType = BusinessType.UPDATE)
-//    @PutMapping("/handle")
-//    public AjaxResult handle(@RequestBody DevTask devTask) {
-//        logger.info("devTask:" + devTask);
-//        Map<String, Object> param = new HashMap<>();
-//        param.put("submitType", devTask.getSubmitType());
-//        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-//        TaskService taskService = processEngine.getTaskService();
-//        //使用任务服务完成任务(提交任务)
-//        String taskId = devTask.getTaskId();
-//        // 使用任务id,获取任务对象，获取流程实例id
-//        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-//        logger.info("Assignee:" + task.getAssignee());
-//        //利用任务对象，获取流程实例id
-//        String processInstancesId = task.getProcessInstanceId();
-//        System.out.println(processInstancesId);
-//        //认领任务
-//        processEngine.getTaskService()//
-//                .claim(taskId, getUserId().toString());
-////        Authentication.setAuthenticatedUserId("cmc"); // 添加批注时候的审核人
-//        if (devTask.getComment() == null) {
-//            devTask.setComment("");
-//        }
-//        taskService.addComment(taskId, processInstancesId, devTask.getComment());
-//        //业务监听处理
-////        tApproveService.handleApprove(task ,devTask);
-//        taskService.complete(taskId, param);
-//
-//        //执行人上传措施前后照片
-//        if (devTask.getTaskName().equals("执行人") && devTask.getSubmitType().equals("1")) {
-//            TApproveDanger updatepicture = devTask.gettApprove();
-//            updatepicture.setBeforeUrl(devTask.getBeforeUrl());
-//            updatepicture.setBeforeFilename(devTask.getBeforeFilename());
-//            updatepicture.setAfterUrl(devTask.getAfterUrl());
-//            updatepicture.setAfterFilename(devTask.getAfterFilename());
-//            tApproveDangerService.updateTApproveDanger(updatepicture);
-//        }
-//        //流程结束，approveDanger实体类实际完成时间字段更新
-//        if (devTask.getTaskName().equals("验证人") && devTask.getSubmitType().equals("1")) {
-//            TApproveDanger updateEndTime = devTask.gettApprove();
-//            updateEndTime.setEndtime(new Date());
-//            tApproveDangerService.updateTApproveDanger(updateEndTime);
-//        }
-//        return AjaxResult.success();
-//    }
-
     /**
      * 流转列表
      */
@@ -632,68 +265,6 @@ public class TApproveDangerController extends BaseController {
         return getDataTable(devTaskList);
     }
 
-//    /**
-//     * 查询隐患申请列表
-//     */
-//    @PreAuthorize("@ss.hasPermi('ehs:approvedanger:list')")
-//    @GetMapping("/list")
-//    public TableDataInfo list(TApproveDanger tApproveDanger) {
-//        startPage();
-//        List<TApproveDanger> list = tApproveDangerService.selectTApproveDangerList(tApproveDanger);
-//        return getDataTable(list);
-//    }
-
-//    /**
-//     * 导出隐患申请列表
-//     */
-//    @PreAuthorize("@ss.hasPermi('ehs:approvedanger:export')")
-//    @Log(title = "隐患申请", businessType = BusinessType.EXPORT)
-//    @GetMapping("/export")
-//    public AjaxResult export(TApproveDanger tApproveDanger) {
-//        List<TApproveDanger> list = tApproveDangerService.selectTApproveDangerList(tApproveDanger);
-//        ExcelUtil<TApproveDanger> util = new ExcelUtil<TApproveDanger>(TApproveDanger.class);
-//        return util.exportExcel(list, "approvedanger");
-//    }
-
-//    /**
-//     * 获取隐患申请详细信息
-//     */
-//    @PreAuthorize("@ss.hasPermi('ehs:approvedanger:query')")
-//    @GetMapping(value = "/{id}")
-//    public AjaxResult getInfo(@PathVariable("id") Long id) {
-//        return AjaxResult.success(tApproveDangerService.selectTApproveDangerById(id));
-//    }
-
-//    /**
-//     * 新增隐患申请
-//     */
-//    @PreAuthorize("@ss.hasPermi('ehs:approvedanger:add')")
-//    @Log(title = "隐患申请", businessType = BusinessType.INSERT)
-//    @PostMapping
-//    public AjaxResult add(@RequestBody TApproveDanger tApproveDanger) {
-//        return toAjax(tApproveDangerService.insertTApproveDanger(tApproveDanger));
-//    }
-//
-//    /**
-//     * 修改隐患申请
-//     */
-//    @PreAuthorize("@ss.hasPermi('ehs:approvedanger:edit')")
-//    @Log(title = "隐患申请", businessType = BusinessType.UPDATE)
-//    @PutMapping
-//    public AjaxResult edit(@RequestBody TApproveDanger tApproveDanger) {
-//        return toAjax(tApproveDangerService.updateTApproveDanger(tApproveDanger));
-//    }
-//
-//    /**
-//     * 删除隐患申请
-//     */
-//    @PreAuthorize("@ss.hasPermi('ehs:approvedanger:remove')")
-//    @Log(title = "隐患申请", businessType = BusinessType.DELETE)
-//    @DeleteMapping("/{ids}")
-//    public AjaxResult remove(@PathVariable Long[] ids) {
-//        return toAjax(tApproveDangerService.deleteTApproveDangerByIds(ids));
-//    }
-//
     @GetMapping("/processImg/{processId}")
     public void currentProcessInstanceImage(@PathVariable("processId") String processId, HttpServletResponse response) throws IOException {
         InputStream inputStream = currentProcessInstanceImage(processId);
@@ -760,9 +331,6 @@ public class TApproveDangerController extends BaseController {
         return inputStream;
     }
 
-
-
-
     /**
      * 获取已经流转的线
      *

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchMemberController.java

@@ -96,12 +96,11 @@ public class TBranchMemberController extends BaseController
                 transfer.setNewDeptId(member.getNewDeptId());
                 transfer.setDeptId(member.getNewDeptId());
                 transfer.setTransferTime(new Date());
+                transfer.setUserId(member.getUserId());
                 transferService.insertTBranchMemTransfer(transfer);
 
                 member.setApStatus("1");
                 member.setDeptId(member.getNewDeptId());
-                member.setNewDeptId(null);
-                member.setOldDeptId(null);
             } else {
 
             }
@@ -114,10 +113,9 @@ public class TBranchMemberController extends BaseController
                 member.setNewDeptId(newMember.getNewDeptId());
             } else {
                 member.setApStatus("1");
-                member.setNewDeptId(null);
-                member.setOldDeptId(null);
             }
         }
+        // 更新支部成员表
         tBranchMemberService.updateTBranchMember(member);
 
         return AjaxResult.success();
@@ -167,7 +165,6 @@ public class TBranchMemberController extends BaseController
         return AjaxResult.success();
     }
 
-
     /**
      * 查询支部成员政治生日列表
      */

ruoyi-common/src/main/resources/processes/common.bpmn

@@ -22,56 +22,55 @@
   <bpmndi:BPMNDiagram id="BPMNDiagram_commonProcess">
     <bpmndi:BPMNPlane bpmnElement="commonProcess" id="BPMNPlane_commonProcess">
       <bpmndi:BPMNShape bpmnElement="startevent" id="BPMNShape_startevent">
-        <omgdc:Bounds height="35.0" width="35.0" x="140.0" y="249.0"></omgdc:Bounds>
+        <omgdc:Bounds height="35.0" width="35.0" x="60.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="endevent" id="BPMNShape_endevent">
-        <omgdc:Bounds height="35.0" width="35.0" x="760.0" y="249.0"></omgdc:Bounds>
+        <omgdc:Bounds height="35.0" width="35.0" x="680.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="apply" id="BPMNShape_apply">
-        <omgdc:Bounds height="55.0" width="105.0" x="310.0" y="239.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="105.0" x="230.0" y="130.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="assess" id="BPMNShape_assess">
-        <omgdc:Bounds height="55.0" width="105.0" x="530.0" y="239.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="105.0" x="450.0" y="130.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
-        <omgdi:waypoint x="175.0" y="266.0"></omgdi:waypoint>
-        <omgdi:waypoint x="310.0" y="266.0"></omgdi:waypoint>
+        <omgdi:waypoint x="95.0" y="157.0"></omgdi:waypoint>
+        <omgdi:waypoint x="230.0" y="157.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="100.0" x="219.0" y="249.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="139.0" y="140.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
-        <omgdi:waypoint x="415.0" y="266.0"></omgdi:waypoint>
-        <omgdi:waypoint x="530.0" y="266.0"></omgdi:waypoint>
+        <omgdi:waypoint x="335.0" y="157.0"></omgdi:waypoint>
+        <omgdi:waypoint x="450.0" y="157.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="100.0" x="449.0" y="249.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="369.0" y="140.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
-        <omgdi:waypoint x="635.0" y="266.0"></omgdi:waypoint>
-        <omgdi:waypoint x="760.0" y="266.0"></omgdi:waypoint>
+        <omgdi:waypoint x="555.0" y="157.0"></omgdi:waypoint>
+        <omgdi:waypoint x="680.0" y="157.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="100.0" x="669.0" y="249.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="589.0" y="140.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
-        <omgdi:waypoint x="582.0" y="294.0"></omgdi:waypoint>
-        <omgdi:waypoint x="582.0" y="358.0"></omgdi:waypoint>
-        <omgdi:waypoint x="472.0" y="358.0"></omgdi:waypoint>
-        <omgdi:waypoint x="362.0" y="358.0"></omgdi:waypoint>
-        <omgdi:waypoint x="362.0" y="294.0"></omgdi:waypoint>
+        <omgdi:waypoint x="502.0" y="185.0"></omgdi:waypoint>
+        <omgdi:waypoint x="502.0" y="263.0"></omgdi:waypoint>
+        <omgdi:waypoint x="282.0" y="263.0"></omgdi:waypoint>
+        <omgdi:waypoint x="282.0" y="185.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="100.0" x="450.0" y="339.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="370.0" y="230.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5">
-        <omgdi:waypoint x="362.0" y="239.0"></omgdi:waypoint>
-        <omgdi:waypoint x="362.0" y="177.0"></omgdi:waypoint>
-        <omgdi:waypoint x="582.0" y="177.0"></omgdi:waypoint>
-        <omgdi:waypoint x="777.0" y="177.0"></omgdi:waypoint>
-        <omgdi:waypoint x="777.0" y="249.0"></omgdi:waypoint>
+        <omgdi:waypoint x="282.0" y="130.0"></omgdi:waypoint>
+        <omgdi:waypoint x="282.0" y="73.0"></omgdi:waypoint>
+        <omgdi:waypoint x="582.0" y="72.0"></omgdi:waypoint>
+        <omgdi:waypoint x="696.0" y="72.0"></omgdi:waypoint>
+        <omgdi:waypoint x="697.0" y="140.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="100.0" x="533.0" y="161.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="32.0" x="453.0" y="52.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>

ruoyi-system/src/main/java/com/ruoyi/branch/domain/approve/DevProcess.java

@@ -33,20 +33,14 @@ public class DevProcess {
     /** 是否结束 */
     private boolean isEnd;
 
-    private TBranchMember member;
+    private Object obj;
 
-//    /** 隐患申请对象 */
-//    private TApproveDanger tApprove;
-//    private TApprove specApprove;
-//    private Object approveObject;
-//    private TApproveSpecModify approveSpecModify;
-
-    public TBranchMember getMember() {
-        return member;
+    public Object getObj() {
+        return obj;
     }
 
-    public void setMember(TBranchMember member) {
-        this.member = member;
+    public void setObj(Object obj) {
+        this.obj = obj;
     }
 
     public String getApName() {

ruoyi-system/src/main/resources/mapper/branch/TBranchMemberMapper.xml

@@ -38,6 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="newDeptId"    column="new_dept_id"    />
         <result property="oldDeptId"    column="old_dept_id"    />
         <result property="apStatus"    column="ap_status"    />
+        <result property="apNo"    column="ap_no"    />
+        <result property="processId"    column="process_id"    />
         <collection  property="roles"   javaType="java.util.List" resultMap="RoleResult" />
         <collection  property="posts"   javaType="java.util.List" resultMap="PostResult" />
     </resultMap>
@@ -60,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTBranchMemberVo">
-        select u.member_id, u.new_dept_id, u.old_dept_id, u.ap_status, u.user_id, u.staff_id, u.ethnic, u.member_type, u.birthday, u.education_level, u.work_join_time, u.work_entry_time, u.party_entry_time, u.labour_entry_time, u.labour_leave_time, u.entry_time, u.leave_time, u.is_league, u.apply_time, u.form_create_time, u.current_mentor, u.plan_develop_duration, u.is_trained, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id,
+        select u.member_id, u.new_dept_id, u.old_dept_id, u.ap_no, u.process_id, u.ap_status, u.user_id, u.staff_id, u.ethnic, u.member_type, u.birthday, u.education_level, u.work_join_time, u.work_entry_time, u.party_entry_time, u.labour_entry_time, u.labour_leave_time, u.entry_time, u.leave_time, u.is_league, u.apply_time, u.form_create_time, u.current_mentor, u.plan_develop_duration, u.is_trained, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id,
         us.NICK_NAME, us.SEX, us.PHONENUMBER,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
         p.post_id, p.post_code, p.post_name, p.post_sort, p.status as post_status
@@ -157,6 +159,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="newDeptId != null">new_dept_id,</if>
             <if test="oldDeptId != null">old_dept_id,</if>
             <if test="apStatus != null">ap_status,</if>
+            <if test="apNo != null">ap_no,</if>
+            <if test="processId != null">process_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="memberId != null">#{memberId},</if>
@@ -189,6 +193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="newDeptId != null">#{newDeptId},</if>
             <if test="oldDeptId != null">#{oldDeptId},</if>
             <if test="apStatus != null">#{apStatus},</if>
+            <if test="apNo != null">#{apNo},</if>
+            <if test="processId != null">#{processId},</if>
          </trim>
     </insert>
 
@@ -235,6 +241,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="newDeptId == null">new_dept_id = null,</if>
             <if test="oldDeptId != null">old_dept_id = #{oldDeptId},</if>
             <if test="oldDeptId == null">old_dept_id = null,</if>
+            <if test="apNo != null">ap_no = #{apNo},</if>
+            <if test="processId != null">process_id = #{processId},</if>
         </trim>
         where member_id = #{memberId}
     </update>

ruoyi-ui/src/views/branch/approve/detail/common-detail.vue

@@ -1,13 +1,23 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="visible" :append-to-body="true" width="600px">
     <el-form ref="form" :model="taskForm" :rules="rules" label-width="80px">
-      <el-form-item label="原支部" prop="oldDeptId">
+      <el-form-item label="支部成员" prop="userId">
+        <el-select v-model="taskForm.userId" placeholder="请选择支部成员" disabled="true">
+          <el-option
+            v-for="dict in userList"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="原支部" prop="oldDeptId" style="width: 300px;">
         <treeselect v-model="taskForm.oldDeptId" :options="deptOptions" :disabled="true"/>
       </el-form-item>
-      <el-form-item label="转入支部" prop="newDeptId">
+      <el-form-item label="转入支部" prop="newDeptId" style="width: 300px;">
         <treeselect v-model="taskForm.newDeptId" :options="deptOptions" :disabled="newDeptIdDisabled" placeholder="请选择转入支部"/>
       </el-form-item>
-      <el-form-item label="审批意见" prop="comment">
+      <el-form-item label="审批意见" prop="comment" v-if="dialogType == 1">
         <el-input v-model="taskForm.comment" placeholder="请输入审批意见" />
       </el-form-item>
     </el-form>
@@ -21,8 +31,8 @@
     </el-table>
 
     <div slot="footer" class="dialog-footer">
-      <el-button type="success" @click="dataFormSubmit(1)">{{ taskForm.taskName == "党总支审核" ? "通 过" : "提 交" }}</el-button>
-      <el-button type="info" @click="dataFormSubmit(0)">{{ taskForm.taskName == "党总支审核" ? "驳 回" : "撤 销" }}</el-button>
+      <el-button v-if="dialogType == 1" type="success" @click="dataFormSubmit(1)">{{ taskForm.taskName == "党总支审核" ? "通 过" : "提 交" }}</el-button>
+      <el-button v-if="dialogType == 1" type="info" @click="dataFormSubmit(0)">{{ taskForm.taskName == "党总支审核" ? "驳 回" : "撤 销" }}</el-button>
       <el-button @click="visible = false">返回</el-button>
     </div>
   </el-dialog>
@@ -35,13 +45,19 @@
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import {getHistorylist} from "@/api/branch/approvedanger";
+  import { listUserNoPage} from "@/api/system/user";
 
 export default {
   name: "common-detail",
   components: { Treeselect },
   data() {
     return {
+      // 用户列表
+      userList: [],
       rules: {
+        userId: [
+          { required: true, message: "支部成员不能为空", trigger: "blur" }
+        ],
         oldDeptId: [
           { required: true, message: "原支部不能为空", trigger: "blur" }
         ],
@@ -67,11 +83,15 @@ export default {
       historyList: [],
       // rejectList: [],
       historyLoading: true,
-
+      dialogType: 0,
     }
   },
   methods: {
-    init(id, taskId, processId, taskName) {
+    init(id, taskId, processId, taskName, dialogType) {
+
+      this.getUserList();
+
+      // 流转列表
       getHistorylist({ "processId": processId }).then(response => {
         this.historyList = response.rows;
         this.historyLoading = false
@@ -83,7 +103,12 @@ export default {
       } else {
         this.newDeptIdDisabled = true;
       }
-      this.title =  taskName + "处理";
+      this.dialogType = dialogType;
+      if (dialogType == 1) {
+        this.title =  taskName + "处理";
+      } else {
+        this.title = "查看详情";
+      }
       this.taskForm.objId = id;
       this.taskForm.taskId = taskId;
       this.taskForm.taskName = taskName;
@@ -91,10 +116,31 @@ export default {
         this.taskForm.obj = response.data;
         this.taskForm.oldDeptId = Number(response.data.oldDeptId);
         this.taskForm.newDeptId = Number(response.data.newDeptId);
+        this.taskForm.userId = Number(response.data.userId);
       });
       this.getTreeselect();
     },
 
+    /** 查询用户列表 */
+    getUserList() {
+      listUserNoPage().then(response => {
+        let rows = response.data;
+        let userList = [];
+        for(let i = 0; i < rows.length; i++) {
+          if (rows[i].userName != "admin") {
+            let user = { "dictValue" : rows[i].userId, "dictLabel" : rows[i].nickName};
+            userList.push(user);
+          }
+        }
+        this.userList = userList;
+      });
+    },
+
+    // 用户列表字典翻译
+    userListFormat(row, column) {
+      return this.selectDictLabel(this.userList, row.userId);
+    },
+
     reset() {
       this.taskForm =  {
         oldDeptId: null,
@@ -131,3 +177,10 @@ export default {
   }
 }
 </script>
+
+<style scoped lang="scss">
+  ::v-deep .el-input.is-disabled .el-input__inner {
+    color: #606266;
+    background-color: transparent;
+  }
+</style>

ruoyi-ui/src/views/branch/approve/myapprove/index.vue

@@ -57,6 +57,7 @@
     <!--<offlinevalve-detail v-if="offlinevalveDetailVisible" ref="offlinevalveDetail" @refreshDataList="getList"></offlinevalve-detail>-->
     <!--<safetychange-detail v-if="safetychangeDetailVisible" ref="safetychangeDetail" @refreshDataList="getList"></safetychange-detail>-->
     <!--<sai-apply-detail v-if="saiApplyVisible" ref="saiApplyDetail" @refreshDataList="getList"></sai-apply-detail>-->
+    <common-detail v-if="commonVisible" ref="commonDetail" @refreshDataList="getList"/>
   </div>
 </template>
 
@@ -66,6 +67,7 @@
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import ProcessImg from '../processImg'
+  import CommonDetail from "@/views/branch/approve/detail/common-detail";
   // import AddOrUpdate from '../approveDetail/spec-detail';
   // import SpecModify from '../approveDetail/specModify-detail';
   // import SpecTrainingPlan from '../approveDetail/specTrainingPlan-detaill';
@@ -84,7 +86,8 @@
     //   SafetychangeDetail,
     //   OfflinevalveDetail,
       Treeselect,
-    ProcessImg,
+      ProcessImg,
+      CommonDetail,
       // AddOrUpdate,
     // SpecModify,
     // SpecTrainingPlan,
@@ -108,6 +111,7 @@
         offlinevalveDetailVisible:false,
         safetychangeDetailVisible:false,
         saiApplyVisible:false,
+        commonVisible: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -179,84 +183,11 @@
       },
       //操作审批流程
       detailHandle (row) {
-        if (row.processName == "特种设备审核"){
-          this.specDealVisible = true
+        if (row.processName == "通用审批流程") {
+          this.commonVisible = true
           this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specDeal.init(row.specApprove.id, row.taskId, row.processId,row.taskName)
+            this.$refs.commonDetail.init(row.obj.memberId, row.taskId, row.processId, row.taskName, 2)
           })
-        }else if (row.processName == "年度检查报告申请"){
-          this.specDealVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specDeal.init(row.specApprove.id, row.taskId, row.processId,row.taskName)
-          })
-        }else if (row.processName == "月度检查"){
-          this.specDealVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specDeal.init(row.specApprove.id, row.taskId, row.processId,row.taskName)
-          })
-        }else if (row.processName == "设备修改/删除审核" || row.processName == "设备新增/删除审核"){
-          this.specModifyDealVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specModifyDeal.init(row.approveSpecModify.id, row.taskId, row.processId,row.taskName)
-          })
-        }else if (row.processName == "专项培训计划审核") {
-          this.specTrainingPlanVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specTrainingPlan.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        }else if (row.processName == "设备维修审批流程") {
-          this.specMaintenanceVisible = true
-          this.$nextTick(() => {
-          //  console.log(row.taskName)
-
-              console.log(row)
-            this.$refs.specMaintenance.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        }else if (row.processName == "设备变更申请") {
-          this.intactDetailVisible = true
-          this.$nextTick(() => {
-
-            console.log(row)
-            this.$refs.intactDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        }else if (row.processName == "可靠性管理申请") {
-          this.kekaoDetailVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.kekaoDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        }else if (row.processName == "预约开票审批流程") {
-          this.invoiceDetailVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.invoiceDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        } else if (row.processName == "安全阀离线/切出申请流程") {
-          this.offlinevalveDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.offlinevalveDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        } else if (row.processName == "组织保护措施状态变更申请流程") {
-          this.safetychangeDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.safetychangeDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        } else if (row.processName == "SAI开项申请流程") {
-          console.log(row)
-          this.saiApplyVisible = true
-          this.$nextTick(() => {
-            this.$refs.saiApplyDetail.init(row.approveObject.saiApplyId, row.taskId, row.processId, row.taskName)
-          })
-        } else {
-          this.approveInfo = row;
-          this.infoTaskName = row.taskName;
-          this.infoprocessName = row.processName;
-          this.addOrUpdateVisible = true;
         }
       },
       /** 查询部门下拉树结构 */

ruoyi-ui/src/views/branch/approve/pending/index.vue

@@ -348,89 +348,9 @@
         if (row.processName == "通用审批流程") {
           this.commonVisible = true
           this.$nextTick(() => {
-            this.$refs.commonDetail.init(row.obj.memberId, row.taskId, row.processId, row.taskName)
+            this.$refs.commonDetail.init(row.obj.memberId, row.taskId, row.processId, row.taskName, 1)
           })
         }
-        // if (row.processName == "特种设备审核"){
-        //   this.specDealVisible = true
-        //   this.$nextTick(() => {
-        //     console.log(row.taskName)
-        //     this.$refs.specDeal.init(row.specApprove.id, row.taskId, row.processId,row.taskName)
-        //   })
-        // }else if (row.processName == "年度检查报告申请"){
-        //   this.specDealVisible = true
-        //   this.$nextTick(() => {
-        //     console.log(row.taskName)
-        //     this.$refs.specDeal.init(row.specApprove.id, row.taskId, row.processId,row.taskName)
-        //   })
-        // }else if (row.processName == "月度检查"){
-        //   this.specDealVisible = true
-        //   this.$nextTick(() => {
-        //     console.log(row.taskName)
-        //     this.$refs.specDeal.init(row.specApprove.id, row.taskId, row.processId,row.taskName)
-        //   })
-        // }else if (row.processName == "设备修改/删除审核" || row.processName == "设备新增/删除审核"){
-        //   this.specModifyDealVisible = true
-        //   this.$nextTick(() => {
-        //     console.log(row.taskName)
-        //     this.$refs.specModifyDeal.init(row.approveSpecModify.id, row.taskId, row.processId,row.taskName)
-        //   })
-        // }else if (row.processName == "专项培训计划审核"){
-        //   this.specTrainingPlanDealVisible = true
-        //   this.$nextTick(() => {
-        //     console.log(row.taskName)
-        //     this.$refs.specTrainingPlanDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
-        //   })
-        // }else if (row.processName == "设备维修审批流程"){
-        //   this.specMaintenanceVisible = true
-        //   this.$nextTick(() => {
-        //     console.log(row.taskName)
-        //     this.$refs.specMaintenance.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
-        //   })
-        // }else if (row.processName == "设备变更申请"){
-        //   this.intactResolveVisible = true
-        //   this.$nextTick(() => {
-        //
-        //     console.log(row)
-        //
-        //     this.$refs.intactResolveDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
-        //   })
-        // }else if (row.processName == "可靠性管理申请"){
-        //   this.kekaoResolveVisible = true
-        //   this.$nextTick(() => {
-        //
-        //     console.log(row)
-        //
-        //     this.$refs.kekaoResolveDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
-        //   })
-        // } else if (row.processName == "预约开票审批流程"){
-        //   this.invoiceDetailVisible = true
-        //   this.$nextTick(() => {
-        //     console.log(row)
-        //     console.log(row.approveObj)
-        //     this.$refs.invoiceDetail.init(row.approveObject.id, row.taskId, row.processId,row.taskName)
-        //   })
-        // } else if (row.processName == "安全阀离线/切出申请流程") {
-        //   this.offlinevalveDetailVisible = true
-        //   this.$nextTick(() => {
-        //     this.$refs.offlinevalveDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName,true)
-        //   })
-        // } else if (row.processName == "组织保护措施状态变更申请流程") {
-        //   this.safetychangeDetailVisible = true
-        //   this.$nextTick(() => {
-        //     this.$refs.safetychangeDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName,true)
-        //   })
-        // } else if (row.processName == "SAI开项申请流程") {
-        //   this.saiApplyVisible = true
-        //   this.$nextTick(() => {
-        //     this.$refs.saiApplyDetail.init(row.approveObject.saiApplyId, row.taskId, row.processId, row.taskName)
-        //   })
-        // } else {
-        //   this.approveInfo = row;
-        //   this.infoTaskName = row.taskName;
-        //   this.infoprocessName = row.processName;
-        //   this.addOrUpdateVisible = true;
-        // }
       },
       // 多选框选中数据
       handleSelectionChange(selection) {

ruoyi-ui/src/views/branch/approve/processImg/index.vue

@@ -24,7 +24,6 @@
     },
     methods: {
       init (processId) {
-        console.log(processId)
         this.processId = processId
         this.visible = true
       },
@@ -34,19 +33,3 @@
     }
   }
 </script>
-
-<!--<style lang="scss" scoped>-->
-  <!--.el-dialog{-->
-    <!--display: flex;-->
-    <!--flex-direction: column;-->
-    <!--margin:0 !important;-->
-    <!--position:absolute;-->
-    <!--top:50%;-->
-    <!--left:50%;-->
-    <!--transform:translate(-50%,-50%);-->
-  <!--}-->
-  <!--.el-dialog .el-dialog__body{-->
-    <!--flex:1;-->
-    <!--overflow: auto;-->
-  <!--}-->
-<!--</style>-->

ruoyi-ui/src/views/branch/approve/taskdone/index.vue

@@ -61,6 +61,7 @@
     <!--<offlinevalve-detail v-if="offlinevalveDetailVisible" ref="offlinevalveDetail" @refreshDataList="getList"></offlinevalve-detail>-->
     <!--<safetychange-detail v-if="safetychangeDetailVisible" ref="safetychangeDetail" @refreshDataList="getList"></safetychange-detail>-->
     <!--<sai-apply-detail v-if="saiApplyVisible" ref="saiApplyDetail" @refreshDataList="getList"></sai-apply-detail>-->
+    <common-detail v-if="commonVisible" ref="commonDetail" @refreshDataList="getList"/>
   </div>
 </template>
 
@@ -72,6 +73,8 @@
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import ProcessImg from "../processImg/index";
+
+  import CommonDetail from "@/views/branch/approve/detail/common-detail";
   // import SpecModify from '../approveDetail/specModify-detail';
   // import SpecTrainingPlan from '../approveDetail/specTrainingPlan-detaill';
   // import SpecMaintenance from "@/views/approve/approveDetail/specMaintenance-detail";
@@ -89,6 +92,7 @@
     //   SafetychangeDetail,
     //   OfflinevalveDetail,
       Treeselect,
+      CommonDetail,
     // AddOrUpdate,
       ProcessImg,
       // SpecModify,SpecTrainingPlan,SpecMaintenance,IntactDetail,KekaoDetail,InvoiceDetail
@@ -108,6 +112,7 @@
         offlinevalveDetailVisible:false,
         safetychangeDetailVisible:false,
         saiApplyVisible:false,
+        commonVisible: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -189,81 +194,11 @@
       },
       /** 查看操作 */
       handleView (row) {
-        if (row.processName == "特种设备审核"){
-          this.specDealVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specDeal.init(row.specApprove.id, row.taskId, row.processId,row.taskName)
-          })
-        }else if (row.processName == "年度检查报告申请"){
-          this.specDealVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specDeal.init(row.specApprove.id, row.taskId, row.processId,row.taskName)
-          })
-        }else if (row.processName == "月度检查"){
-          this.specDealVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specDeal.init(row.specApprove.id, row.taskId, row.processId,row.taskName)
-          })
-        }else if (row.processName == "设备修改/删除审核" || row.processName == "设备新增/删除审核"){
-          this.specModifyDealVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specModifyDeal.init(row.approveSpecModify.id, row.taskId, row.processId,row.taskName)
-          })
-        }else if (row.processName == "专项培训计划审核"){
-          this.specTrainingPlanVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specTrainingPlan.init(row.approveObject.id, row.taskId, row.processId,row.taskName)
-          })
-        }else if (row.processName == "设备维修审批流程") {
-          this.specMaintenanceVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.specMaintenance.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        }else if (row.processName == "设备变更申请") {
-          this.intactDetailVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.intactDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        }else if (row.processName == "可靠性管理申请") {
-          this.kekaoDetailVisible = true
-          this.$nextTick(() => {
-            console.log(row.taskName)
-            this.$refs.kekaoDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        }else if (row.processName == "预约开票审批流程"){
-          this.invoiceDetailVisible = true
-          this.$nextTick(() => {
-            console.log(row)
-            console.log(row.approveObj)
-            this.$refs.invoiceDetail.init(row.approveObject.id, row.taskId, row.processId,row.taskName)
-          })
-        } else if (row.processName == "安全阀离线/切出申请流程") {
-          this.offlinevalveDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.offlinevalveDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        } else if (row.processName == "组织保护措施状态变更申请流程") {
-          this.safetychangeDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.safetychangeDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
-          })
-        } else if (row.processName == "SAI开项申请流程") {
-          this.saiApplyVisible = true
+        if (row.processName == "通用审批流程") {
+          this.commonVisible = true
           this.$nextTick(() => {
-            this.$refs.saiApplyDetail.init(row.approveObject.saiApplyId, row.taskId, row.processId, row.taskName)
+            this.$refs.commonDetail.init(row.obj.memberId, row.taskId, row.processId, row.taskName, 2)
           })
-        } else {
-          this.approveInfo = row;
-          this.infoTaskName = row.taskName;
-          this.infoprocessName = row.processName;
-          this.addOrUpdateVisible = true;
         }
       },
       // 装置名称字典翻译