设备申请 增加修改后设备

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

@@ -153,9 +153,9 @@ public class CmcDeviceApprovalController extends BaseController
             cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
             cmcDeviceApproval.setDispatchTime(new Date());
         }
-        if (formDataJson.getJSONArray("devices").size() > 0) {
+        if (formDataJson.getJSONArray("modifyDevices").size() > 0) {
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
-            String deviceString = formDataJson.getString("devices").substring(1, formDataJson.getString("devices").length() - 1);
+            String deviceString = formDataJson.getString("modifyDevices").substring(1, formDataJson.getString("modifyDevices").length() - 1);
             cmcDeviceApproval.setDevices(deviceString);
             String[] devices = deviceString.split(",");
             BigDecimal estimateCost = new BigDecimal(0);

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

@@ -84,13 +84,16 @@ public class CmcTechnicalController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcTechnical cmcTechnical)
     {
-        if (cmcTechnical.getTechnicalDocument() != null) {
+        if (cmcTechnical.getTechnicalDocument() != null && cmcTechnical.getTechnicalComment() == null) {
+            cmcTechnical.setTechnicalDesigner(getLoginUser().getUserId());
             cmcTechnical.setTechnicalUploadTime(new Date());
         }
-        if (cmcTechnical.getTechnicalComment() != null) {
+        if (cmcTechnical.getModifyDocument() != null && cmcTechnical.getManageComment() == null) {
+            cmcTechnical.setTechnicalPlanner(getLoginUser().getUserId());
             cmcTechnical.setTechApprovalTime(new Date());
         }
         if (cmcTechnical.getManageComment() != null) {
+            cmcTechnical.setManagerUserId(getLoginUser().getUserId());
             cmcTechnical.setManageApprovalTime(new Date());
         }
         return toAjax(cmcTechnicalService.updateCmcTechnical(cmcTechnical));

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

@@ -44,6 +44,10 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "设备id")
     private String devices;
 
+    /** 修改后设备id */
+    @Excel(name = "修改后设备id")
+    private String modifyDevices;
+
     /** 项目id */
     @Excel(name = "项目id")
     private String projectId;
@@ -190,6 +194,15 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return devices;
     }
+    public void setModifyDevices(String modifyDevices)
+    {
+        this.modifyDevices = modifyDevices;
+    }
+
+    public String getModifyDevices()
+    {
+        return modifyDevices;
+    }
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
@@ -350,6 +363,7 @@ public class CmcDeviceApproval extends BaseEntity
             .append("deviceApplyId", getDeviceApplyId())
             .append("applier", getApplier())
             .append("devices", getDevices())
+            .append("modifyDevices", getModifyDevices())
             .append("projectId", getProjectId())
             .append("applyReason", getApplyReason())
             .append("beginDate", getBeginDate())

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

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applier"    column="applier"    />
         <result property="useDept"    column="use_dept"    />
         <result property="devices"    column="devices"    />
+        <result property="modifyDevices"    column="modify_devices"    />
         <result property="projectId"    column="project_id"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="applyDate"    column="apply_date"    />
@@ -59,9 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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.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.state, 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
+        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,
+               da.apply_reason, da.apply_date, da.return_date, da.begin_date, da.end_date, da.days, da.state, 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
             left join sys_user as u1 on u1.user_id = da.manager_user_id
             left join sys_user as u2 on u2.user_id = da.dispatcher
@@ -75,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applier != null "> and da.applier = #{applier}</if>
             <if test="useDept != null "> and da.use_dept = #{useDept}</if>
             <if test="devices != null  and devices != ''"> and da.devices like concat('%', #{devices}, '%')</if>
+            <if test="modifyDevices != null  and modifyDevices != ''"> and da.modify_devices like concat('%', #{modifyDevices}, '%')</if>
             <if test="projectId != null  and projectId != ''"> and da.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and da.apply_reason = #{applyReason}</if>
             <if test="applyDate != null "> and da.apply_date = #{applyDate}</if>
@@ -104,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applier != null">applier,</if>
             <if test="useDept != null">use_dept,</if>
             <if test="devices != null">devices,</if>
+            <if test="modifyDevices != null">modify_devices,</if>
             <if test="projectId != null">project_id,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="applyDate != null">apply_date,</if>
@@ -126,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applier != null">#{applier},</if>
             <if test="useDept != null">#{useDept},</if>
             <if test="devices != null">#{devices},</if>
+            <if test="modifyDevices != null">#{modifyDevices},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="applyDate != null">#{applyDate},</if>
@@ -151,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applier != null">applier = #{applier},</if>
             <if test="useDept != null">use_dept = #{useDept},</if>
             <if test="devices != null">devices = #{devices},</if>
+            <if test="modifyDevices != null">modify_devices = #{modifyDevices},</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-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -95,31 +95,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
-		select u.user_id, u.nick_name from sys_user as u
-		left join sys_user_post as up on u.user_id = up.user_id
-		left join sys_post as p on up.post_id = p.post_id
-		where p.post_name = '主任' and u.user_id = #{param}
+		select r.user_id, r.nick_name from
+		(select u1.user_id, u1.nick_name, u.dept_id from
+		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '主任'
 	</select>
 
 	<select id="selectViceDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
-		select u.user_id, u.nick_name from sys_user as u
-		left join sys_user_post as up on u.user_id = up.user_id
-		left join sys_post as p on up.post_id = p.post_id
-		where p.post_name = '副主任' and u.user_id = #{param} order by u.user_id desc limit 1
+		select r.user_id, r.nick_name from
+		(select u1.user_id, u1.nick_name, u.dept_id from
+		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '副主任'
+		order by u.user_id desc limit 1
 	</select>
 
 	<select id="selectDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
-		select u.user_id, u.nick_name from sys_user as u
-		left join sys_user_post as up on u.user_id = up.user_id
-		left join sys_post as p on up.post_id = p.post_id
-		where p.post_name = '主任' and u.dept_id = #{param}
+		select r.user_id, r.nick_name from
+		(select user_id, nick_name, dept_id from
+		sys_user where dept_id = #{param}) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '主任'
 	</select>
 
 	<select id="selectViceDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
-		select u.user_id, u.nick_name from sys_user as u
-		left join sys_user_post as up on u.user_id = up.user_id
-		left join sys_post as p on up.post_id = p.post_id
-		where p.post_name = '副主任' and u.dept_id = #{param} order by u.user_id desc limit 1
+		select r.user_id, r.nick_name from
+		(select user_id, nick_name, dept_id from
+		sys_user where dept_id = #{param}) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '副主任'
+		order by u.user_id desc limit 1
 	</select>
 
 	<delete id="deleteUserPostByUserId" parameterType="Long">

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-23 14:46:21
+ * @LastEditTime: 2024-05-23 15:53:29
 -->
 
 <template>
@@ -58,6 +58,15 @@
                   }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
+              <el-form-item label="设备选择：">
+                <el-select style="width: 100%;" v-model="form.devices" filterable multiple placeholder="请选择"
+                  clearable :disabled="taskName != '设备申请'">
+                  <el-option v-for="item in deviceList" :key="item.deviceId" 
+                    :label="item.name +'【' +  (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series  + '】': '')
+                     + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"  :value="item.deviceId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="申领事由：" prop="applyReason">
                 <el-input type="textarea" :rows="2" placeholder="请输入申领事由" v-model="form.applyReason"
                   :disabled="taskName != '设备申请'">
@@ -86,10 +95,10 @@
               </el-row>
               <!-- 安排设备意见 -->
               <el-divider></el-divider>
-              <el-form-item label-width="120px" label="设备选择：">
-                <el-select style="width: 100%;" v-model="form.devices" filterable multiple placeholder="请选择"
-                  clearable :disabled="taskName != '安排设备' && taskName != '设备申请'">
-                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status || item.status != '1'"
+              <el-form-item label-width="120px" label="拟发放设备：">
+                <el-select style="width: 100%;" v-model="form.modifyDevices" filterable multiple placeholder="请选择"
+                  clearable :disabled="taskName != '安排设备'">
+                  <el-option v-for="item in deviceList" :key="item.deviceId" 
                     :label="item.name +'【' +  (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series  + '】': '')
                      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"  :value="item.deviceId">
                   </el-option>
@@ -115,6 +124,7 @@
                 </el-col>
               </el-row>
               <!-- 分管审核意见 -->
+              <el-divider></el-divider>
               <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="showFormItem('分管审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
                   :disabled="taskName != '分管审核'">
@@ -233,7 +243,8 @@ export default {
         },
         applyDate: new Date(),
         days: "",
-        devices: []
+        devices: [],
+        modifyDevices: [],
       },
       projectList: [],
       chooseProject: {},
@@ -280,6 +291,16 @@ export default {
             }
             data.devices = arr;
           }
+          if (res.data.modifyDevices == null || res.data.modifyDevices == undefined || res.data.modifyDevices == "") {
+            data.modifyDevices = []
+          } else {
+            data.modifyDevices = data.modifyDevices.split(',');
+            let arr = []
+            for (let d of data.modifyDevices) {
+              arr.push(parseInt(d))
+            }
+            data.modifyDevices = arr;
+          }
           this.form = data;
           if (data.projectId) {
             getProject(data.projectId).then(response => {
@@ -391,6 +412,7 @@ export default {
     // 获取设备列表
     getDeviceList() {
       listDevice({
+        status: "1",
         pageNum: 1,
         pageSize: 99999999,
         type: '仪器设备'

oa-ui/src/views/oa/device/detail.vue

@@ -346,7 +346,7 @@ export default {
   },
   methods: {
     getList() {
-      this.queryParams.devices = this.$route.query.deviceId
+      this.queryParams.modifyDevices = this.$route.query.deviceId
       listDeviceApproval(this.queryParams).then(res => {
         this.approvalList = res.rows;
         this.total = res.total;