增加已归还设备

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

     public TableDataInfo list(CmcDeviceApproval cmcDeviceApproval)
     {
         startPage();
-        List<CmcDeviceApproval> list = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval);
-        for(CmcDeviceApproval deviceApproval : list) {
-            String deviceIds = deviceApproval.getDevices();
-            StringBuilder deviceNames = new StringBuilder();
-            if (deviceIds != null && !deviceIds.equals("") && deviceIds.split(",").length > 0) {
-                for (String deviceId : deviceIds.split(",")) {
-                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
-                    deviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
-                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
-                }
-                deviceApproval.setDeviceNames(deviceNames.substring(0, deviceNames.length() - 1));
-            }
-            String modifyDeviceIds = deviceApproval.getModifyDevices();
-            StringBuilder modifyDeviceNames = new StringBuilder();
-            StringBuilder modifyDeviceNumbers = new StringBuilder();
-            if (modifyDeviceIds != null && !modifyDeviceIds.equals("") && modifyDeviceIds.split(",").length > 0) {
-                for (String deviceId : modifyDeviceIds.split(",")) {
-                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
-                    modifyDeviceNumbers.append(device.getDeviceNumber());
-                    modifyDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
-                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
-                }
-                deviceApproval.setModifyDeviceNumbers(modifyDeviceNumbers.substring(0, modifyDeviceNumbers.length() - 1));
-                deviceApproval.setModifyDeviceNames(modifyDeviceNames.substring(0, modifyDeviceNames.length() - 1));
-            }
-            String repairDeviceIds = deviceApproval.getRepairDevices();
-            StringBuilder repairDeviceNames = new StringBuilder();;
-            StringBuilder repairDeviceNumbers = new StringBuilder();
-            if (repairDeviceIds != null && !repairDeviceIds.equals("") && repairDeviceIds.split(",").length > 0) {
-                for (String deviceId : repairDeviceIds.split(",")) {
-                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
-                    repairDeviceNumbers.append(device.getDeviceNumber());
-                    repairDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
-                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
-                }
-                deviceApproval.setRepairDeviceNumbers(repairDeviceNumbers.substring(0, repairDeviceNumbers.length() - 1));
-                deviceApproval.setRepairDeviceNames(repairDeviceNames.substring(0, repairDeviceNames.length() - 1));
-            }
-        }
+        List<CmcDeviceApproval> list = DeviceId2Name(cmcDeviceApproval);
         return getDataTable(list);
     }
 
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcDeviceApproval cmcDeviceApproval)
     {
-        List<CmcDeviceApproval> list = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval);
-        for(CmcDeviceApproval deviceApproval : list) {
-            String deviceIds = deviceApproval.getDevices();
-            StringBuilder deviceNames = new StringBuilder();
-            if (deviceIds != null && !deviceIds.equals("") && deviceIds.split(",").length > 0) {
-                for (String deviceId : deviceIds.split(",")) {
-                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
-                    deviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
-                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
-                }
-                deviceApproval.setDeviceNames(deviceNames.substring(0, deviceNames.length() - 1));
-            }
-            String modifyDeviceIds = deviceApproval.getModifyDevices();
-            StringBuilder modifyDeviceNames = new StringBuilder();
-            StringBuilder modifyDeviceNumbers = new StringBuilder();
-            if (modifyDeviceIds != null && !modifyDeviceIds.equals("") && modifyDeviceIds.split(",").length > 0) {
-                for (String deviceId : modifyDeviceIds.split(",")) {
-                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
-                    modifyDeviceNumbers.append(device.getDeviceNumber());
-                    modifyDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
-                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
-                }
-                deviceApproval.setModifyDeviceNumbers(modifyDeviceNumbers.substring(0, modifyDeviceNumbers.length() - 1));
-                deviceApproval.setModifyDeviceNames(modifyDeviceNames.substring(0, modifyDeviceNames.length() - 1));
-            }
-            String repairDeviceIds = deviceApproval.getRepairDevices();
-            StringBuilder repairDeviceNames = new StringBuilder();;
-            StringBuilder repairDeviceNumbers = new StringBuilder();
-            if (repairDeviceIds != null && !repairDeviceIds.equals("") && repairDeviceIds.split(",").length > 0) {
-                for (String deviceId : repairDeviceIds.split(",")) {
-                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
-                    repairDeviceNumbers.append(device.getDeviceNumber());
-                    repairDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
-                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
-                }
-                deviceApproval.setRepairDeviceNumbers(repairDeviceNumbers.substring(0, repairDeviceNumbers.length() - 1));
-                deviceApproval.setRepairDeviceNames(repairDeviceNames.substring(0, repairDeviceNames.length() - 1));
-            }
-        }
+        List<CmcDeviceApproval> list = DeviceId2Name(cmcDeviceApproval);
         ExcelUtil<CmcDeviceApproval> util = new ExcelUtil<CmcDeviceApproval>(CmcDeviceApproval.class);
         util.exportExcel(response, list, "cmc设备审批数据");
     }
     {
         return success(cmcDeviceApprovalService.deleteCmcDeviceApprovalByDeviceApplyIds(deviceApplyIds));
     }
+
+    private List<CmcDeviceApproval> DeviceId2Name(CmcDeviceApproval cmcDeviceApproval) {
+        List<CmcDeviceApproval> list = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval);
+        for(CmcDeviceApproval deviceApproval : list) {
+            String deviceIds = deviceApproval.getDevices();
+            StringBuilder deviceNames = new StringBuilder();
+            StringBuilder deviceNumbers = new StringBuilder();
+            if (deviceIds != null && !deviceIds.equals("") && deviceIds.split(",").length > 0) {
+                for (String deviceId : deviceIds.split(",")) {
+                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
+                    deviceNumbers.append(device.getDeviceNumber());
+                    deviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
+                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
+                }
+                deviceApproval.setDeviceNumbers(deviceNumbers.substring(0, deviceNumbers.length() - 1));
+                deviceApproval.setDeviceNames(deviceNames.substring(0, deviceNames.length() - 1));
+            }
+            String modifyDeviceIds = deviceApproval.getModifyDevices();
+            StringBuilder modifyDeviceNames = new StringBuilder();
+            StringBuilder modifyDeviceNumbers = new StringBuilder();
+            if (modifyDeviceIds != null && !modifyDeviceIds.equals("") && modifyDeviceIds.split(",").length > 0) {
+                for (String deviceId : modifyDeviceIds.split(",")) {
+                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
+                    modifyDeviceNumbers.append(device.getDeviceNumber());
+                    modifyDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
+                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
+                }
+                deviceApproval.setModifyDeviceNumbers(modifyDeviceNumbers.substring(0, modifyDeviceNumbers.length() - 1));
+                deviceApproval.setModifyDeviceNames(modifyDeviceNames.substring(0, modifyDeviceNames.length() - 1));
+            }
+            String repairDeviceIds = deviceApproval.getRepairDevices();
+            StringBuilder repairDeviceNames = new StringBuilder();;
+            StringBuilder repairDeviceNumbers = new StringBuilder();
+            if (repairDeviceIds != null && !repairDeviceIds.equals("") && repairDeviceIds.split(",").length > 0) {
+                for (String deviceId : repairDeviceIds.split(",")) {
+                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
+                    repairDeviceNumbers.append(device.getDeviceNumber());
+                    repairDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
+                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
+                }
+                deviceApproval.setRepairDeviceNumbers(repairDeviceNumbers.substring(0, repairDeviceNumbers.length() - 1));
+                deviceApproval.setRepairDeviceNames(repairDeviceNames.substring(0, repairDeviceNames.length() - 1));
+            }
+            String returnDeviceIds = deviceApproval.getReturnDevices();
+            StringBuilder returnDeviceNames = new StringBuilder();;
+            StringBuilder returnDeviceNumbers = new StringBuilder();
+            if (returnDeviceIds != null && !returnDeviceIds.equals("") && returnDeviceIds.split(",").length > 0) {
+                for (String deviceId : returnDeviceIds.split(",")) {
+                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
+                    returnDeviceNumbers.append(device.getDeviceNumber());
+                    returnDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
+                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
+                }
+                deviceApproval.setReturnDeviceNumbers(returnDeviceNumbers.substring(0, returnDeviceNumbers.length() - 1));
+                deviceApproval.setReturnDeviceNames(returnDeviceNames.substring(0, returnDeviceNames.length() - 1));
+            }
+        }
+        return list;
+    }
+
 }

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java

     }
 
     /**
-     * 通过表单id获取流程节点信息
+     * 通过表单id及流程名获取流程节点信息
      *
      * @param formId 表单id
      * @return
      */
     @GetMapping("/flowXmlAndNodeByFormId")
-    public AjaxResult flowXmlAndNodeByFormId(String formId) {
-        return flowTaskService.flowXmlAndNodeByFormId(formId);
+    public AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String name) {
+        return flowTaskService.flowXmlAndNodeByFormIdAndName(formId, name);
     }
 
     /**

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowTaskService.java

     AjaxResult flowXmlAndNode(String procInsId,String deployId);
 
     /**
-     * 通过表单id获取流程节点信息
+     * 通过表单id及流程名获取流程节点信息
      * @param formId
      * @return
      */
-    AjaxResult flowXmlAndNodeByFormId(String formId);
+    AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String name);
 
     /**
      * 流程节点表单

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

 import com.ruoyi.flowable.service.IFlowTaskService;
 import com.ruoyi.flowable.service.ISysDeployFormService;
 import com.ruoyi.flowable.service.ISysFormService;
+import com.ruoyi.system.domain.FlowProcDefDto;
 import com.ruoyi.system.domain.FlowVarInst;
 import com.ruoyi.system.domain.SysForm;
 import com.ruoyi.system.mapper.FlowDeployMapper;
     private ISysFormService sysFormService;
     @Resource
     private FlowVarInstMapper flowVarInstMapper;
+    @Resource
+    private FlowDeployMapper flowDeployMapper;
 
     /**
      * 完成任务
     }
 
     /**
-     * 通过表单id获取流程节点信息
+     * 通过表单id及流程名获取流程节点信息
      *
      * @param formId
      * @return
      */
     @Override
-    public AjaxResult flowXmlAndNodeByFormId(String formId) {
+    public AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String name) {
         FlowVarInst flowVarInst =  flowVarInstMapper.selectProcInstByVar(formId);
-        String procInsId = flowVarInst.getProcInstId();
-        String deployId = "";
-        AjaxResult ajaxResult = new AjaxResult();
-        ajaxResult = flowXmlAndNode(procInsId, deployId);
-        return ajaxResult;
+        List<FlowProcDefDto> flowProcDefList = flowDeployMapper.selectDeployList(name);
+        return flowXmlAndNode(flowVarInst.getProcInstId(), flowProcDefList.get(0).getDeploymentId());
     }
 
     /**

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceApproval.java

     /** 设备id */
     @Excel(name = "申领设备")
     private String deviceNames;
+    @Excel(name = "申领设备序号")
+    private String deviceNumbers;
     private String devices;
 
     /** 申请日期 */
     private String dispatchComment;
 
     /** 修改后设备id */
-    @Excel(name = "发放设备")
     private String modifyDeviceNames;
     @Excel(name = "发放设备序号")
     private String modifyDeviceNumbers;
     private String repairDeviceNumbers;
     private String repairDevices;
 
+    /** 已归还设备id */
+    private String returnDeviceNames;
+    @Excel(name = "已归还设备序号")
+    private String returnDeviceNumbers;
+    private String returnDevices;
+
     private SysUser applierUser;
 
     private SysUser managerUser;
     {
         return devices;
     }
+    public void setDeviceNumbers(String deviceNumbers)
+    {
+        this.deviceNumbers = deviceNumbers;
+    }
+
+    public String getDeviceNumbers()
+    {
+        return deviceNumbers;
+    }
     public void setDeviceNames(String deviceNames)
     {
         this.deviceNames = deviceNames;
     {
         return repairDeviceNumbers;
     }
+    public void setReturnDevices(String returnDevices)
+    {
+        this.returnDevices = returnDevices;
+    }
+
+    public String getReturnDevices()
+    {
+        return returnDevices;
+    }
+    public void setReturnDeviceNames(String returnDeviceNames)
+    {
+        this.returnDeviceNames = returnDeviceNames;
+    }
+
+    public String getReturnDeviceNames()
+    {
+        return returnDeviceNames;
+    }
+    public void setReturnDeviceNumbers(String returnDeviceNumbers)
+    {
+        this.returnDeviceNumbers = returnDeviceNumbers;
+    }
+
+    public String getReturnDeviceNumbers()
+    {
+        return returnDeviceNumbers;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/FlowVarinst.java → oa-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/FlowVarInst.java

     private static final long serialVersionUID = 1L;
 
     /** 流程实例id */
-    @Excel(name = "流程实例id")
     private String procInstId;
 
     /** 变量名 */
-    @Excel(name = "变量名")
     private String name;
 
     /** 变量值 */
-    @Excel(name = "变量值")
     private String text;
 
     public void setProcInstId(String procInstId)

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml

         <result property="devices"    column="devices"    />
         <result property="modifyDevices"    column="modify_devices"    />
         <result property="repairDevices"    column="repair_devices"    />
+        <result property="returnDevices"    column="return_devices"    />
         <result property="projectId"    column="project_id"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="applyDate"    column="apply_date"    />
     </resultMap>
 
     <sql id="selectCmcDeviceApprovalVo">
-        select da.device_apply_id, da.applier, u.nick_name as applier_nick_name, da.use_dept, d.dept_name, da.devices, da.modify_devices, da.project_id, p.project_number, p.project_name,
+        select da.device_apply_id, da.applier, u.nick_name as applier_nick_name, da.use_dept, d.dept_name, da.devices, da.modify_devices, da.return_devices, da.project_id, p.project_number, p.project_name,
                da.apply_reason, da.apply_date, da.return_date, da.begin_date, da.end_date, da.days, da.repair_devices, da.manager_user_id, u1.nick_name as manager_nick_name, da.manager_comment,
                da.dispatcher, u2.nick_name as dispatch_nick_name, da.dispatch_comment, da.estimate_cost, da.remark, da.manager_time, da.dispatch_time from cmc_device_approval as da
             left join sys_user as u on u.user_id = da.applier
             <if test="devices != null">devices = #{devices},</if>
             <if test="modifyDevices != null">modify_devices = #{modifyDevices},</if>
             <if test="repairDevices != null">repair_devices = #{repairDevices},</if>
+            <if test="returnDevices != null">return_devices = #{returnDevices},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="applyDate != null">apply_date = #{applyDate},</if>

oa-ui/src/api/flowable/definition.js

   })
 }
 
+// 通过表单id及流程名获取流程节点信息
+export function flowXmlAndNodeByFormId(query) {
+  return request({
+    url: '/flowable/task/flowXmlAndNodeByFormId',
+    method: 'get',
+    params: query
+  })
+}
+
 // 读取xml文件
 export function saveXml(data) {
   return request({