BCC RC前检查管理 bugfix

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

@@ -34,8 +34,10 @@ import com.ruoyi.project.listener.ExecutorTaskCreateListener;
 import com.ruoyi.project.listener.RecorderTaskCreateListener;
 import com.ruoyi.project.listener.VerificationTaskCreateListener;
 import com.ruoyi.project.production.domain.TEoegSaiApply;
+import com.ruoyi.project.production.domain.TRcSaiApply;
 import com.ruoyi.project.production.domain.TSaiApply;
 import com.ruoyi.project.production.service.ITEoegSaiApplyService;
+import com.ruoyi.project.production.service.ITRcSaiApplyService;
 import com.ruoyi.project.production.service.ITSaiApplyService;
 import com.ruoyi.project.pssr.domain.TPssrAboveall;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
@@ -141,6 +143,8 @@ public class TApproveDangerController extends BaseController {
     @Autowired
     private ITSaiApplyService tSaiApplyService;
     @Autowired
+    private ITRcSaiApplyService tRcSaiApplyService;
+    @Autowired
     private ITEoegSaiApplyService tEoegSaiApplyService;
     @Autowired
     private ITSpecWeekcheckService tSpecWeekcheckService;
@@ -345,6 +349,10 @@ public class TApproveDangerController extends BaseController {
                         TSaiApply approve = tSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
                         devProcess.setApproveObject(approve);
                         devProcess.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("RC_SAI开项申请流程")) {
+                        TRcSaiApply approve = tRcSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
+                        devProcess.setApproveObject(approve);
+                        devProcess.setApNo(approve.getApNo());
                     } else if (pi.getProcessDefinitionName().equals("EOEG_SAI开项申请流程")) {
                         TEoegSaiApply approve = tEoegSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
                         devProcess.setApproveObject(approve);
@@ -513,6 +521,10 @@ public class TApproveDangerController extends BaseController {
                         TSaiApply approve = tSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
                         devTask.setApproveObject(approve);
                         devTask.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("RC_SAI开项申请流程")) {
+                        TRcSaiApply approve = tRcSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
+                        devTask.setApproveObject(approve);
+                        devTask.setApNo(approve.getApNo());
                     } else if (pi.getProcessDefinitionName().equals("EOEG_SAI开项申请流程")) {
                         TEoegSaiApply approve = tEoegSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
                         devTask.setApproveObject(approve);
@@ -674,6 +686,12 @@ public class TApproveDangerController extends BaseController {
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
+                } else if (pi.getProcessDefinitionName().equals("RC_SAI开项申请流程")) {
+                    TRcSaiApply approve = tRcSaiApplyService.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 if (pi.getProcessDefinitionName().equals("EOEG_SAI开项申请流程")) {
                     TEoegSaiApply approve = tEoegSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(Long.valueOf(approve.getCreateBy()));

master/src/main/java/com/ruoyi/project/production/controller/TRcSaiApplyController.java

@@ -513,7 +513,7 @@ public class TRcSaiApplyController extends BaseController
         //更新数据
         TRcSaiApply form = devTask.getRcSaiApply();
         //使用任务服务完成任务(提交任务)
-        String taskId = devTask.getSaiApply().getTaskId();
+        String taskId = devTask.getRcSaiApply().getTaskId();
         // 使用任务id,获取任务对象，获取流程实例id
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         //利用任务对象，获取流程实例id

master/src/main/resources/mybatis/production/TRcSaiApplyMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.production.mapper.TRcSaiApplyMapper">
     
-    <resultMap type="TSaiApply" id="TSaiApplyResult">
+    <resultMap type="TRcSaiApply" id="TSaiApplyResult">
         <result property="saiApplyId"    column="sai_apply_id"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />

ui/src/views/approve/approveDetail/rc-sai-apply-detail.vue

@@ -521,7 +521,7 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-import { updateApply, getApply, handleApply } from "@/api/production/apply";
+import { updateApply, getApply, handleApply } from "@/api/production/rcApply";
 import { listFile } from "@/api/production/saiApproveFile";
 import { getHistorylist } from "@/api/ehs/approvedanger";
 import { listUserPost } from "@/api/system/user";
@@ -1314,7 +1314,7 @@ export default {
             }
           }
         }
-        this.taskForm.saiApply = this.dataForm;
+        this.taskForm.rcSaiApply = this.dataForm;
         this.taskForm.condition = condition;
         handleApply(this.taskForm).then(response =>{
           this.msgSuccess("提交成功");
@@ -1337,7 +1337,7 @@ export default {
                 }
               }
             }
-            this.taskForm.saiApply = this.dataForm;
+            this.taskForm.rcSaiApply = this.dataForm;
             this.taskForm.condition = condition;
             handleApply(this.taskForm).then(response =>{
               this.msgSuccess("提交成功");