-修改申请单

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

@@ -126,16 +126,17 @@ public class TApplyOfflinevalveController extends BaseController {
         Authentication.setAuthenticatedUserId(applyUser);//设置当前申请人
         Map<String, Object> variables = new HashMap<>();
         variables.put("applyuser", applyUser);
-        String confirmers = tApplyOfflinevalve.getConfirmer();
-        StringBuilder confirmer = new StringBuilder();
-        for (String staffId : confirmers.split(",")) {
-            SysUser user = userService.selectUserByStaffId(staffId);
-            confirmer.append(user.getUserId()).append(",");
-        }
-        if (StringUtils.isNotEmpty(confirmer.toString())) {
-            confirmer = new StringBuilder(confirmer.substring(0, confirmer.length() - 1));
-        }
-        variables.put("confirmer", confirmer.toString());
+        String confirmer = tApplyOfflinevalve.getConfirmer();
+//        StringBuilder confirmer = new StringBuilder();
+//        for (String staffId : confirmers.split(",")) {
+//            SysUser user = userService.selectUserByStaffId(staffId);
+//            confirmer.append(user.getUserId()).append(",");
+//        }
+//        if (StringUtils.isNotEmpty(confirmer.toString())) {
+//            confirmer = new StringBuilder(confirmer.substring(0, confirmer.length() - 1));
+//        }
+        variables.put("confirmer", confirmer);
+        variables.put("infoconfirmer", confirmer);
         TStaffmgr tStaffmgr = new TStaffmgr();
         tStaffmgr.setActualposts("12");
         StringBuilder executor = new StringBuilder();
@@ -244,7 +245,6 @@ public class TApplyOfflinevalveController extends BaseController {
                 form.setApproveTime(new Date());
                 if ("1".equals(devTask.getCondition()))//只有通过时审批状态才会变为已通过
                     form.setApproveStatus("2");
-                param.put("infoconfirmer", tApplyOfflinevalve.getConfirmer());
                 break;
             case "信息确认人":
                 tStaffmgr = new TStaffmgr();

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

@@ -136,17 +136,18 @@ public class TApplySafetychangeController extends BaseController {
         Authentication.setAuthenticatedUserId(userId);//设置当前申请人
         Map<String, Object> variables = new HashMap<>();
         variables.put("applyuser", userId);
-        StringBuilder confirmer = new StringBuilder();
-        for (String staffId : safaerIds.split(",")) {
-            SysUser user = userService.selectUserByStaffId(staffId);
-            confirmer.append(user.getUserId()).append(",");
-        }
-        if (StringUtils.isNotEmpty(confirmer.toString())) {
-            confirmer = new StringBuilder(confirmer.substring(0, confirmer.length() - 1));
-        }
-        variables.put("confirmer", confirmer.toString());
+//        StringBuilder confirmer = new StringBuilder();
+//        for (String staffId : safaerIds.split(",")) {
+//            SysUser user = userService.selectUserByStaffId(staffId);
+//            confirmer.append(user.getUserId()).append(",");
+//        }
+//        if (StringUtils.isNotEmpty(confirmer.toString())) {
+//            confirmer = new StringBuilder(confirmer.substring(0, confirmer.length() - 1));
+//        }
+        variables.put("confirmer", safaerIds);
+        variables.put("resetConfirmer2", safaerIds);
         variables.put("executor", tApplySafetychange.getExecutor());
-        variables.put("safaer", confirmer.toString());
+        variables.put("safaer", safaerIds);
         //查询经理
         TStaffmgr tStaffmgr = new TStaffmgr();
         tStaffmgr.setActualposts("24,26");
@@ -270,7 +271,6 @@ public class TApplySafetychangeController extends BaseController {
                 param.put("resetConfirmer1", resetConfirmer1.toString());
                 break;
             case "确认人1":
-                param.put("resetConfirmer2", tApplySafetychange.getConfirmer());
                 form.setResetConfirmer1(getUserId().toString());
                 form.setResetConfirmTime1(new Date());
                 form.setResetConfirmerName1(getNickName());

master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceDeviceController.java

@@ -86,6 +86,20 @@ public class TInvoiceDeviceController extends BaseController
         return util.exportExcel(list, "device");
     }
 
+
+    @GetMapping("/listRegionalHead")
+    public AjaxResult listRegionalHead(){
+        List<TInvoiceDevice> tInvoiceDevices = tInvoiceDeviceService.selectAllRegionalHead(new TInvoiceDevice());
+        for (TInvoiceDevice tInvoiceDevice : tInvoiceDevices) {
+            StringBuilder nickname = new StringBuilder();
+            for (String userId : tInvoiceDevice.getRegionalHead().split(",")) {
+                nickname.append(sysUserService.selectUserById(Long.valueOf(userId)).getNickName()).append("，");
+            }
+            tInvoiceDevice.setRegionalHeadName(nickname.substring(0,nickname.length()-1));
+        }
+        return AjaxResult.success(tInvoiceDevices);
+    }
+
     /**
      * 获取装置区域管理详细信息
      */

master/src/main/java/com/ruoyi/project/invoice/mapper/TInvoiceDeviceMapper.java

@@ -22,6 +22,9 @@ public interface TInvoiceDeviceMapper
     public TInvoiceDevice selectTInvoiceDeviceById(Long id);
     public TInvoiceDevice selectRegionalHeadByWorkArea(String workArea);
 
+    @DataScope(deptAlias = "d")
+    public List<TInvoiceDevice> selectAllRegionalHead(TInvoiceDevice tInvoiceDevice);
+
     /**
      * 查询装置区域管理列表
      *

master/src/main/java/com/ruoyi/project/invoice/service/ITInvoiceDeviceService.java

@@ -20,6 +20,7 @@ public interface ITInvoiceDeviceService
      */
     public TInvoiceDevice selectTInvoiceDeviceById(Long id);
     public TInvoiceDevice selectRegionalHeadByWorkArea(String workArea);
+    public List<TInvoiceDevice> selectAllRegionalHead(TInvoiceDevice tInvoiceDevice);
 
     /**
      * 查询装置区域管理列表

master/src/main/java/com/ruoyi/project/invoice/service/impl/TInvoiceDeviceServiceImpl.java

@@ -36,6 +36,12 @@ public class TInvoiceDeviceServiceImpl implements ITInvoiceDeviceService
         return tInvoiceDeviceMapper.selectRegionalHeadByWorkArea(workArea);
     }
 
+    @Override
+    public List<TInvoiceDevice> selectAllRegionalHead(TInvoiceDevice tInvoiceDevice)
+    {
+        return tInvoiceDeviceMapper.selectAllRegionalHead(tInvoiceDevice);
+    }
+
     /**
      * 查询装置区域管理列表
      *

master/src/main/resources/mybatis/invoice/TInvoiceDeviceMapper.xml

@@ -52,6 +52,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectAllRegionalHead" parameterType="TInvoiceDevice" resultMap="TInvoiceDeviceResult">
+        select distinct(regional_head)  from t_invoice_device d
+        left join sys_dept s on s.dept_id = d.dept_id
+        <where>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
     <select id="selectTInvoiceDeviceAllList"  resultType="java.lang.String">
         select d.work_area  from t_invoice_device d                                                                                                                                                   left join sys_dept s on s.dept_id = d.dept_id
         where d.del_flag = 0

master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<select id="selectUserPost" parameterType="tStaffmgr" resultMap="SysUserResult">
-		select b.USER_ID ,b.NICK_NAME  from T_STAFFMGR a
+		select b.USER_ID ,b.NICK_NAME ,b.STAFFID from T_STAFFMGR a
 		left join SYS_USER b on a.STAFFID=b.STAFFID
 		left join sys_dept d on a.dept_id = d.dept_id
 		<where>

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

@@ -40,7 +40,7 @@
         <activiti:executionListener event="end" delegateExpression="${endSuccessListener}"></activiti:executionListener>
       </extensionElements>
     </endEvent>
-    <userTask id="infoconfirmertask2" name="确认人" activiti:assignee="#{infoconfirmer}">
+    <userTask id="infoconfirmertask2" name="确认人" activiti:candidateUsers="#{infoconfirmer}">
       <extensionElements>
         <activiti:taskListener event="create" delegateExpression="${nextTaskListener}"></activiti:taskListener>
       </extensionElements>
@@ -51,7 +51,7 @@
     <sequenceFlow id="flow8" name="通过" sourceRef="infoconfirmertask2" targetRef="endevent1">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
-    <userTask id="infoconfirmertask" name="信息确认人" activiti:assignee="#{infoconfirmer}">
+    <userTask id="infoconfirmertask" name="信息确认人" activiti:candidateUsers="#{infoconfirmer}">
       <extensionElements>
         <activiti:taskListener event="create" delegateExpression="${nextTaskListener}"></activiti:taskListener>
       </extensionElements>
@@ -218,7 +218,7 @@
         <omgdi:waypoint x="538.0" y="107.0"></omgdi:waypoint>
         <omgdi:waypoint x="470.0" y="107.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="470.0" y="197.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="24.0" x="470.0" y="197.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="toConfirmer" id="BPMNEdge_toConfirmer">
@@ -227,7 +227,7 @@
         <omgdi:waypoint x="535.0" y="197.0"></omgdi:waypoint>
         <omgdi:waypoint x="470.0" y="197.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="470.0" y="467.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="24.0" x="470.0" y="470.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow17" id="BPMNEdge_flow17">

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

@@ -65,7 +65,7 @@
         <activiti:taskListener event="create" delegateExpression="${changeNextTaskListener}"></activiti:taskListener>
       </extensionElements>
     </userTask>
-    <userTask id="resetConfirmer2" name="确认人2" activiti:assignee="#{resetConfirmer2}">
+    <userTask id="resetConfirmer2" name="确认人2" activiti:candidateUsers="#{resetConfirmer2}">
       <extensionElements>
         <activiti:taskListener event="create" delegateExpression="${changeNextTaskListener}"></activiti:taskListener>
       </extensionElements>

ui/src/api/invoice/device.js

@@ -9,6 +9,13 @@ export function listDevice(query) {
   })
 }
 
+export function listRegionalHead() {
+  return request({
+    url: '/invoice/device/listRegionalHead',
+    method: 'get',
+  })
+}
+
 // 查询装置区域下拉列表数据
 export function selectDevice(query) {
   return request({
@@ -59,4 +66,4 @@ export function exportDevice(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/views/apply/offlinevalve/index.vue

@@ -239,9 +239,9 @@
           <el-select v-model="form.confirmer" placeholder="请选择临时措施确认人" clearable size="small" filterable style="width: 100%">
             <el-option
               v-for="item in confirmerList"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
+              :key="item.regionalHead"
+              :label="item.regionalHeadName"
+              :value="item.regionalHead"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -403,6 +403,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {allSafetyvavle} from "@/api/reliability/safetyvavle";
 import {listPostUser, listUserPost} from "@/api/system/user";
 import OfflinevalveDetail from "@/views/approve/approveDetail/offlinevalve-detail";
+import {listRegionalHead} from "@/api/invoice/device";
 
 export default {
   name: "Offlinevalve",
@@ -554,7 +555,7 @@ export default {
     }).then(response => {
       this.executorList = response;
     });
-    this.getDicts("apply_safaer").then(response => {
+    listRegionalHead().then(response => {
       this.confirmerList = response.data;
     });
     //设置表格高度对应屏幕高度

ui/src/views/apply/safetychange/index.vue

@@ -217,9 +217,9 @@
                      style="width: 100%">
             <el-option
               v-for="item in safaerList"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
+              :key="item.regionalHead"
+              :label="item.regionalHeadName"
+              :value="item.regionalHead"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -229,7 +229,7 @@
             <el-option
               v-for="item in executorList"
               :key="item.userId"
-              :label="item.nickName"
+              :label="item.nickName+'_'+item.staffId"
               :value="item.userId"
             ></el-option>
           </el-select>
@@ -408,6 +408,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listPostUser, listUserPost} from "@/api/system/user";
 import SafetychangeDetail from "@/views/approve/approveDetail/safetychange-detail";
+import {listRegionalHead} from "@/api/invoice/device";
 
 export default {
   name: "Safetychange",
@@ -567,7 +568,7 @@ export default {
     }).then(response => {
       this.executorList = response;
     });
-    this.getDicts("apply_safaer").then(response => {
+    listRegionalHead().then(response => {
       this.safaerList = response.data;
     });
   },