盲板驳回

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

@@ -595,10 +595,10 @@ public class TPssrApproveController extends BaseController {
             TPssrApprove approve = tPssrApproves.get(0);
             try {
                 runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
+                historyService.deleteHistoricProcessInstance(approve.getProcessId());
             } catch (Exception e) {
                 logger.info("无运行时流程");
             }
-            historyService.deleteHistoricProcessInstance(approve.getProcessId());
 
             tPssrBlind = new TPssrBlind();
             tPssrBlind.setApproveStatus(1L);

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

@@ -20,10 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 盲板Controller
@@ -264,6 +261,8 @@ public class TPssrBlindController extends BaseController {
             for (Long id : tPssrBlind.getIds()) {
                 TPssrBlind blind = new TPssrBlind();
                 blind.setId(id);
+                blind.setInstallStatus("0,0,0,0,0");
+                blind.setRemoveStatus("0,0,0,0,0");
                 blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
@@ -280,12 +279,38 @@ public class TPssrBlindController extends BaseController {
                     .processInstanceId(approve.getProcessId()).singleResult();
             String taskId = task.getId();
 
+            // 驳回 查询所有待审批的人员
+            TPssrBlind blind = new TPssrBlind();
+            blind.setSubId(tPssrBlind.getSubId());
+            blind.setApproveStatus(1L);
+            Set<String> installer = new HashSet<>();
+            Set<String> remover = new HashSet<>();
+            for (TPssrBlind item : tPssrBlindService.selectTPssrBlindList(blind)) {
+
+                // 安装人员
+                installer.add(item.getInConfirm1());
+                installer.add(item.getInConfirm2());
+                installer.add(item.getInContractor());
+                installer.add(item.getInProcess());
+                installer.add(item.getInCoordinator());
+
+                //拆除人员
+                remover.add(item.getReConfirm1());
+                remover.add(item.getReConfirm2());
+                remover.add(item.getReContractor());
+                remover.add(item.getReProcess());
+                remover.add(item.getReCoordinator());
+            }
+
+
             //处理流程节点
             Map<String, Object> param = new HashMap<>();
             param.put("condition", 1);
+            param.put("confirmUsers1", new ArrayList<>(installer));
+            param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除" + tPssrBlind.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrBlind.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

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

@@ -1,48 +1,6 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['pssr:patrol:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['pssr:patrol:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['pssr:patrol:remove']"
-        >删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['pssr:patrol:edit']"
-        >导入
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -63,7 +21,7 @@
       <el-table-column label="巡检状态" align="center" prop="planStatus" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.planStatus==1">待确认</el-tag>
-          <el-tag v-if="scope.row.planStatus==2">已确认</el-tag>
+          <el-tag v-if="scope.row.planStatus==2" type="success">已确认</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="确认人" align="center" prop="confirmer" :show-overflow-tooltip="true"/>

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

@@ -2,13 +2,7 @@
   <div class="app-container">
     <div v-if="sn=='jxxm'">
       <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="管道" name="first">
-          <overhaul-pipe :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
-        </el-tab-pane>
-        <el-tab-pane label="泵" name="second">
-          <overhaul-pump :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
-        </el-tab-pane>
-        <el-tab-pane label="换热器" name="third">
+        <el-tab-pane label="换热器" name="first">
           <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="塔罐" name="fourth">