-修改上锁确认人

master/src/main/java/com/ruoyi/project/apply/controller/TApplyOfflinevalveController.java

@@ -150,12 +150,12 @@ public class TApplyOfflinevalveController extends BaseController {
         variables.put("flowListener", new FlowListener());
         variables.put("endSuccessListener", new EndSuccessListener());
         variables.put("endFailListener", new EndFailListener());
-        tApplyOfflinevalveService.updateTApplyOfflinevalve(tApplyOfflinevalve);
         //采用key来启动流程定义并设置流程变量，返回流程实例
         ProcessInstance pi = runtimeService.startProcessInstanceByKey("offlinevalve", String.valueOf(businessKey), variables);
         logger.info("流程定义id：" + pi.getProcessDefinitionId());
         logger.info("流程实例id：" + pi.getProcessInstanceId());
         tApplyOfflinevalve.setProcessId(pi.getProcessInstanceId());
+        tApplyOfflinevalveService.updateTApplyOfflinevalve(tApplyOfflinevalve);
 
 
         // 申请人申请直接通过
@@ -247,7 +247,16 @@ public class TApplyOfflinevalveController extends BaseController {
                 param.put("infoconfirmer", tApplyOfflinevalve.getConfirmer());
                 break;
             case "信息确认人":
-                param.put("lockConfirmer", form.getLockConfirmer1());//设置上锁确认人
+                tStaffmgr = new TStaffmgr();
+                tStaffmgr.setActualposts("12");
+                StringBuilder lockConfirmer = new StringBuilder();
+                for (SysUser user : userService.selectUserPost(tStaffmgr)) {
+                    lockConfirmer.append(user.getUserId().toString()).append(",");
+                }
+                if (StringUtils.isNotEmpty(lockConfirmer.toString())) {
+                    lockConfirmer = new StringBuilder(lockConfirmer.substring(0, lockConfirmer.length() - 1));
+                }
+                param.put("lockConfirmer", lockConfirmer);//设置上锁确认人
                 form.setLockConfirmer1(null);
                 break;
             case "确认人":

master/src/main/resources/processes/apply/offlinevalve.bpmn

@@ -59,7 +59,7 @@
     <sequenceFlow id="flow9" name="是" sourceRef="isunlock" targetRef="infoconfirmertask">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${is_unlock == 1}]]></conditionExpression>
     </sequenceFlow>
-    <userTask id="lockconfirmertask" name="上锁人" activiti:assignee="#{lockConfirmer}">
+    <userTask id="lockconfirmertask" name="上锁人" activiti:candidateUsers="#{lockConfirmer}">
       <extensionElements>
         <activiti:taskListener event="create" delegateExpression="${nextTaskListener}"></activiti:taskListener>
       </extensionElements>

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

@@ -134,7 +134,7 @@
               </el-col>
             </div>
           </el-row>
-          <div v-if="dataForm.disassembly=='是'">
+<!--          <div v-if="dataForm.disassembly=='是'">
             <el-form-item label="上锁确认人" prop="lockConfirmer1">
               <el-select v-model="form.lockConfirmer1" placeholder="请选择上锁确认人" clearable size="small" filterable
                          style="width: 100%">
@@ -146,7 +146,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </div>
+          </div>-->
         </div>
         <el-form-item label="备注" prop="remarks" v-if="taskName!='申请人提交申请'">
           <el-input type="textarea" v-model="form.remarks" placeholder="选填"/>