PSSR:

-添加盲板创建流程

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

@@ -120,7 +120,11 @@ public class TPssrBlindController extends BaseController {
             TPssrBlind blind = new TPssrBlind();
             blind.setSubId(tPssrBlind.getSubId());
             blind.setCurrentUser(getUserId().toString());
-            blind.setApproveStatus(1L);
+            if (tPssrBlind.getTaskType() == 0) {
+                blind.setApproveStatus(1L);
+            } else if (tPssrBlind.getTaskType() == 1) {
+                blind.setApproveStatus(3L);
+            }
             for (TPssrBlind item : tPssrBlindService.selectTPssrBlindList(blind)) {
                 item.setTaskType(tPssrBlind.getTaskType());
                 setEntity(item);
@@ -130,28 +134,40 @@ public class TPssrBlindController extends BaseController {
         //查询当前待审批的确认人
         TPssrBlind entity = new TPssrBlind();
         entity.setSubId(tPssrBlind.getSubId());
-        entity.setApproveStatus(1L);
-        long status=1;
+        if (tPssrBlind.getTaskType() == 0) {
+            entity.setApproveStatus(1L);
+        } else if (tPssrBlind.getTaskType() == 1) {
+            entity.setApproveStatus(3L);
+        }
+        long status = 1;
         boolean flag = false;
         for (TPssrBlind item : tPssrBlindService.selectTPssrBlindList(entity)) {
             item.setTaskType(tPssrBlind.getTaskType());
-            if (tPssrBlind.getTaskType() == 0) {
-                if (item.getInstallStatus().split(",")[setEntity(item)].equals("0")) {
-                    return AjaxResult.success();
-                }
-            } else {
-                if (item.getRemoveStatus().split(",")[setEntity(item)].equals("0")) {
-                    return AjaxResult.success();
+            for (String s : setEntity(item).split(",")) {
+                int current = Integer.parseInt(s);
+                if (current == -1)
+                    continue;
+                if (tPssrBlind.getTaskType() == 0) {
+                    if (item.getInstallStatus().split(",")[current].equals("0")) {
+                        return AjaxResult.success();
+                    }
+                } else if (tPssrBlind.getTaskType()==1) {
+                    if (item.getRemoveStatus().split(",")[current].equals("0")) {
+                        return AjaxResult.success();
+                    }
                 }
             }
             if (item.getInstallStatus().equals("1,1,1,1,1")) {
                 item.setApproveStatus(3L);//已确认安装
-                status=3L;
+                status = 3L;
+                flag = true;
                 tPssrBlindService.updateTPssrBlind(item);
+
             }
             if (item.getRemoveStatus().equals("1,1,1,1,1")) {
                 item.setApproveStatus(2L);//已确认拆除
-                status=2L;
+                status = 4L;
+                flag = true;
                 tPssrBlindService.updateTPssrBlind(item);
             }
         }
@@ -172,7 +188,7 @@ public class TPssrBlindController extends BaseController {
         return AjaxResult.success();
     }
 
-    private int setEntity(TPssrBlind tPssrBlind) {
+    private String setEntity(TPssrBlind tPssrBlind) {
         //安装人员
         String inProcess = tPssrBlind.getInProcess();
         String inCoordinator = tPssrBlind.getInCoordinator();
@@ -188,43 +204,50 @@ public class TPssrBlindController extends BaseController {
         String reConfirm2 = tPssrBlind.getReConfirm2();
 
         //获取当前人员操作下标
-        int current = -1;
+        String currents = "-1,";
         if (inProcess.equals(getUserId().toString()) || reProcess.equals(getUserId().toString())) {
-            current = 0;
-        } else if (inCoordinator.equals(getUserId().toString()) || reCoordinator.equals(getUserId().toString())) {
-            current = 1;
-        } else if (inContractor.equals(getUserId().toString()) || reContractor.equals(getUserId().toString())) {
-            current = 2;
-        } else if (inConfirm1.equals(getUserId().toString()) || reConfirm1.equals(getUserId().toString())) {
-            current = 3;
-        } else if (inConfirm2.equals(getUserId().toString()) || reConfirm2.equals(getUserId().toString())) {
-            current = 4;
+            currents += "0,";
         }
-        //修改状态
-        if (current != -1) {
-            if (tPssrBlind.getTaskType() == 0) {
-                if (tPssrBlind.getInstallDate() == null) {
-                    tPssrBlind.setInstallDate(new Date());
-                }
-                String[] is = tPssrBlind.getInstallStatus().split(",");
-                is[current] = "1";
-                tPssrBlind.setInstallStatus(String.join(",", is));
-                if (tPssrBlind.getInstallDate() == null) {
-                    tPssrBlind.setInstallDate(new Date());
-                }
-            } else if (tPssrBlind.getTaskType() == 1) {
-                if (tPssrBlind.getRemovedDate() == null) {
-                    tPssrBlind.setRemovedDate(new Date());
-                }
-                String[] rs = tPssrBlind.getRemoveStatus().split(",");
-                rs[current] = "1";
-                tPssrBlind.setRemoveStatus(String.join(",", rs));
-                if (tPssrBlind.getRemovedDate() == null) {
-                    tPssrBlind.setRemovedDate(new Date());
+        if (inCoordinator.equals(getUserId().toString()) || reCoordinator.equals(getUserId().toString())) {
+            currents += "1,";
+        }
+        if (inContractor.equals(getUserId().toString()) || reContractor.equals(getUserId().toString())) {
+            currents += "2,";
+        }
+        if (inConfirm1.equals(getUserId().toString()) || reConfirm1.equals(getUserId().toString())) {
+            currents += "3,";
+        }
+        if (inConfirm2.equals(getUserId().toString()) || reConfirm2.equals(getUserId().toString())) {
+            currents += "4,";
+        }
+        for (String val : currents.split(",")) {
+            int current = Integer.parseInt(val);
+            //修改状态
+            if (current != -1) {
+                if (tPssrBlind.getTaskType() == 0) {
+                    if (tPssrBlind.getInstallDate() == null) {
+                        tPssrBlind.setInstallDate(new Date());
+                    }
+                    String[] is = tPssrBlind.getInstallStatus().split(",");
+                    is[current] = "1";
+                    tPssrBlind.setInstallStatus(String.join(",", is));
+                    if (tPssrBlind.getInstallDate() == null) {
+                        tPssrBlind.setInstallDate(new Date());
+                    }
+                } else if (tPssrBlind.getTaskType() == 1) {
+                    if (tPssrBlind.getRemovedDate() == null) {
+                        tPssrBlind.setRemovedDate(new Date());
+                    }
+                    String[] rs = tPssrBlind.getRemoveStatus().split(",");
+                    rs[current] = "1";
+                    tPssrBlind.setRemoveStatus(String.join(",", rs));
+                    if (tPssrBlind.getRemovedDate() == null) {
+                        tPssrBlind.setRemovedDate(new Date());
+                    }
                 }
             }
         }
-        return current;
+        return currents;
     }
 
 }

ui/src/views/approve/approveDetail/pssrApprove-detail.vue

@@ -8,8 +8,10 @@
     <span slot="footer" class="dialog-footer">
       <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2" type="primary"
                  @click="dataFormSubmit(1)" :disabled="submitDisabled">通过</el-button>
-      <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2" type="danger"
-                 :disabled="submitDisabled">驳回</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2&&this.taskForm.processName.includes('盲板')" type="danger"
+                 @click="dataFormSubmit(0)" :disabled="submitDisabled">驳回安装</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2&&this.taskForm.processName.includes('盲板')" type="danger"
+                 @click="dataFormSubmit(2)" :disabled="submitDisabled">驳回拆除</el-button>
       <el-button @click="visible = false">{{ $t('返回') }}</el-button>
     </span>
     <div>
@@ -56,6 +58,7 @@ export default {
         taskId: '',
         condition: '',
         taskName: '',
+        processName: '',
         businessKey: '',
         tPssrApprove: {}
       },
@@ -67,7 +70,7 @@ export default {
     }
   },
   methods: {
-    init(id, taskId, processId, taskName) {
+    init(id, taskId, processId, taskName,processName) {
       getSubcontent(id).then(res => {
         if (taskName=='检查内容负责人'){
           this.isApprove=2;
@@ -83,6 +86,7 @@ export default {
         this.subId = id;
         this.taskForm.taskId = taskId
         this.taskForm.taskName = taskName
+        this.taskForm.processName = processName
         if (!taskId){
           this.isApprove=3;
         }

ui/src/views/approve/pending/index.vue

@@ -456,7 +456,7 @@
         }  else if (row.processName.includes('PSSR')) {
           this.pssrApproveDetailVisible = true
           this.$nextTick(() => {
-            this.$refs.pssrApproveDetail.init(row.approveObject.subId, row.taskId, row.processId, row.taskName)
+            this.$refs.pssrApproveDetail.init(row.approveObject.subId, row.taskId, row.processId, row.taskName,row.processName)
           })
         } else {
           this.approveInfo = row;

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

@@ -120,12 +120,13 @@
     <el-table v-loading="loading" :data="blindList" @selection-change="handleSelectionChange" :height="clientHeight"
               border>
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="80">
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="100">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
           <el-tag v-if="scope.row.approveStatus==1" type="warning">待确认</el-tag>
-          <el-tag v-if="scope.row.approveStatus==3" type="success">已确认安装</el-tag>
-          <el-tag v-if="scope.row.approveStatus==2" type="success">已确认拆除</el-tag>
+          <el-tag v-if="scope.row.approveStatus==3" type="success">确认人1安装</el-tag>
+          <el-tag v-if="scope.row.approveStatus==4" type="success">确认人2拆除</el-tag>
+          <el-tag v-if="scope.row.approveStatus==2" type="success">已确认</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="单元/系统号" align="center" prop="unitNo" :show-overflow-tooltip="true" width="150"/>
@@ -212,7 +213,8 @@
         </el-table-column>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
+                       class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"