设备审批流程更新

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

@@ -96,6 +96,21 @@ public class CmcDeviceApprovalController extends BaseController
         cmcDeviceApproval.setBeginDate(formDataJson.getDate("beginDate"));
         cmcDeviceApproval.setEndDate(formDataJson.getDate("endDate"));
         cmcDeviceApproval.setDays(formDataJson.getLong("days"));
+        cmcDeviceApproval.setState("0");
+        if (formDataJson.getJSONArray("devices").size() > 0) {
+            String deviceString = formDataJson.getString("devices").substring(1, formDataJson.getString("devices").length() - 1);
+            cmcDeviceApproval.setDevices(deviceString);
+            String[] devices = deviceString.split(",");
+            BigDecimal estimateCost = new BigDecimal(0);
+            for (String device : devices) {
+                CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
+                cmcDevice.setStatus("0");
+                cmcDeviceService.updateCmcDevice(cmcDevice);
+                if (cmcDevice.getDayCost() != null)
+                    estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
+            }
+            cmcDeviceApproval.setEstimateCost(estimateCost);
+        }
         cmcDeviceApprovalService.insertCmcDeviceApproval(cmcDeviceApproval);
         return AjaxResult.success("提交设备审批表成功");
     }
@@ -119,18 +134,18 @@ public class CmcDeviceApprovalController extends BaseController
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcDeviceApproval cmcDeviceApproval = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(formDataJson.getString("deviceApplyId"));
-        if (formDataJson.getString("deptComment") != null && formDataJson.getString("managerComment") == null) {
-            cmcDeviceApproval.setDeptUserId(getLoginUser().getUserId());
-            cmcDeviceApproval.setDeptComment(formDataJson.getString("deptComment"));
-            cmcDeviceApproval.setDeptTime(new Date());
-        }
         if (formDataJson.getString("managerComment") != null && formDataJson.getString("dispatchComment") == null) {
             cmcDeviceApproval.setManagerUserId(getLoginUser().getUserId());
             cmcDeviceApproval.setManagerComment(formDataJson.getString("managerComment"));
             cmcDeviceApproval.setManagerTime(new Date());
         }
+        if (formDataJson.getDate("confirmDate") != null) {
+            cmcDeviceApproval.setState("1");
+            cmcDeviceApproval.setConfirmDate(formDataJson.getDate("confirmDate"));
+        }
         if (formDataJson.getDate("returnDate") != null) {
             cmcDeviceApproval.setRemark(formDataJson.getString("remark"));
+            cmcDeviceApproval.setState(formDataJson.getString("state"));
             cmcDeviceApproval.setReturnDate(formDataJson.getDate("returnDate"));
         }
         if (formDataJson.getString("dispatchComment") != null) {
@@ -146,6 +161,8 @@ public class CmcDeviceApprovalController extends BaseController
             BigDecimal estimateCost = new BigDecimal(0);
             for (String device : devices) {
                 CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
+                cmcDevice.setStatus("1");
+                cmcDeviceService.updateCmcDevice(cmcDevice);
                 if (cmcDevice.getDayCost() != null)
                     estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
             }

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

@@ -75,6 +75,10 @@ public class CmcDevice extends BaseEntity
     @Excel(name = "管理部门")
     private SysDept dept;
 
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
     public void setDeviceId(Integer deviceId)
     {
         this.deviceId = deviceId;
@@ -201,6 +205,15 @@ public class CmcDevice extends BaseEntity
     {
         return dept;
     }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
 
     @Override
     public String toString() {
@@ -219,6 +232,7 @@ public class CmcDevice extends BaseEntity
                 .append("place", getPlace())
                 .append("remark", getRemark())
                 .append("manageDept", getManageDept())
+                .append("status", getStatus())
                 .toString();
     }
 }

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

@@ -30,8 +30,6 @@ public class CmcDeviceApproval extends BaseEntity
 
     private SysUser applierUser;
 
-    private SysUser deptUser;
-
     private SysUser managerUser;
 
     private SysUser dispatchUser;
@@ -70,14 +68,6 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "天数")
     private Long days;
 
-    /** 部门审批人 */
-    @Excel(name = "部门审批人")
-    private Long deptUserId;
-
-    /** 部门审批意见 */
-    @Excel(name = "部门审批意见")
-    private String deptComment;
-
     /** 分管审批人 */
     @Excel(name = "分管审批人")
     private Long managerUserId;
@@ -103,16 +93,16 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date applyDate;
 
+    /** 确认日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "确认日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date confirmDate;
+
     /** 归还日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "归还日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date returnDate;
 
-    /** 部门审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date deptTime;
-
     /** 分管审批时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -155,15 +145,6 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return applierUser;
     }
-    public void setDeptUser(SysUser deptUser)
-    {
-        this.deptUser = deptUser;
-    }
-
-    public SysUser getDeptUser()
-    {
-        return deptUser;
-    }
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
@@ -263,24 +244,6 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return days;
     }
-    public void setDeptUserId(Long deptUserId) 
-    {
-        this.deptUserId = deptUserId;
-    }
-
-    public Long getDeptUserId() 
-    {
-        return deptUserId;
-    }
-    public void setDeptComment(String deptComment) 
-    {
-        this.deptComment = deptComment;
-    }
-
-    public String getDeptComment() 
-    {
-        return deptComment;
-    }
     public void setManagerUserId(Long managerUserId) 
     {
         this.managerUserId = managerUserId;
@@ -335,23 +298,23 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return applyDate;
     }
-    public void setReturnDate(Date returnDate)
+    public void setConfirmDate(Date confirmDate)
     {
-        this.returnDate = returnDate;
+        this.confirmDate = confirmDate;
     }
 
-    public Date getReturnDate()
+    public Date getConfirmDate()
     {
-        return returnDate;
+        return confirmDate;
     }
-    public void setDeptTime(Date deptTime)
+    public void setReturnDate(Date returnDate)
     {
-        this.deptTime = deptTime;
+        this.returnDate = returnDate;
     }
 
-    public Date getDeptTime()
+    public Date getReturnDate()
     {
-        return deptTime;
+        return returnDate;
     }
     public void setManagerTime(Date managerTime)
     {
@@ -392,14 +355,13 @@ public class CmcDeviceApproval extends BaseEntity
             .append("beginDate", getBeginDate())
             .append("endDate", getEndDate())
             .append("days", getDays())
-            .append("deptUserId", getDeptUserId())
-            .append("deptComment", getDeptComment())
             .append("managerUserId", getManagerUserId())
             .append("managerComment", getManagerComment())
             .append("dispatcher", getDispatcher())
             .append("dispatchComment", getDispatchComment())
             .append("estimateCost", getEstimateCost())
             .append("applyDate", getApplyDate())
+            .append("confirmDate", getConfirmDate())
             .append("returnDate", getReturnDate())
             .toString();
     }

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

@@ -76,6 +76,10 @@ public class CmcTechnical extends BaseEntity
     @Excel(name = "技术审核意见")
     private String technicalComment;
 
+    /** 总工审批人 */
+    @Excel(name = "总工审批人")
+    private Long managerUserId;
+
     /** 总工审核意见 */
     @Excel(name = "总工审核意见")
     private String manageComment;
@@ -158,6 +162,15 @@ public class CmcTechnical extends BaseEntity
     {
         return designUser;
     }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
     public void setPlanComment(String planComment)
     {
         this.planComment = planComment;
@@ -230,6 +243,15 @@ public class CmcTechnical extends BaseEntity
     {
         return technicalComment;
     }
+    public void setManagerUserId(Long managerUserId)
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId()
+    {
+        return managerUserId;
+    }
     public void setManageComment(String manageComment)
     {
         this.manageComment = manageComment;
@@ -281,6 +303,7 @@ public class CmcTechnical extends BaseEntity
                 .append("technicalDocument", getTechnicalDocument())
                 .append("designDescription", getDesignDescription())
                 .append("technicalComment", getTechnicalComment())
+                .append("managerUserId", getManagerUserId())
                 .append("manageComment", getManageComment())
                 .append("technicalUploadTime", getTechnicalUploadTime())
                 .append("techApprovalTime", getTechApprovalTime())

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

@@ -16,8 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="beginDate"    column="begin_date"    />
         <result property="endDate"    column="end_date"    />
         <result property="days"    column="days"    />
-        <result property="deptUserId"    column="dept_user_id"    />
-        <result property="deptComment"    column="dept_comment"    />
         <result property="managerUserId"    column="manager_user_id"    />
         <result property="managerComment"    column="manager_comment"    />
         <result property="dispatcher"    column="dispatcher"    />
@@ -25,13 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="estimateCost"    column="estimate_cost"    />
         <result property="remark"    column="remark"    />
         <result property="state"    column="state"    />
-        <result property="deptTime"    column="dept_time"    />
         <result property="managerTime"    column="manager_time"    />
         <result property="dispatchTime"    column="dispatch_time"    />
         <association property="applierUser"    javaType="SysUser"         resultMap="SysUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
-        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="dispatchUser"    javaType="SysUser"         resultMap="DispatchUserResult" />
     </resultMap>
@@ -41,11 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="applier_nick_name"    />
     </resultMap>
 
-    <resultMap type="SysUser" id="DeptUserResult">
-        <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="dept_nick_name"    />
-    </resultMap>
-
     <resultMap type="SysUser" id="ManagerUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="manager_nick_name"    />
@@ -69,13 +60,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <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.dept_user_id, u1.nick_name as dept_nick_name, da.state,
-               da.dept_comment, da.manager_user_id, u2.nick_name as manager_nick_name, da.manager_comment, da.dispatcher, u3.nick_name as dispatch_nick_name, da.dispatch_comment,
-               da.estimate_cost, da.remark, da.dept_time, da.manager_time, da.dispatch_time from cmc_device_approval as da
+               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.dept_user_id
-            left join sys_user as u2 on u2.user_id = da.manager_user_id
-            left join sys_user as u3 on u3.user_id = da.dispatcher
+            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
             left join sys_dept as d on d.dept_id = da.use_dept
             left join cmc_project as p on da.project_id = p.project_id
     </sql>
@@ -93,14 +82,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="beginDate != null "> and da.begin_date = #{beginDate}</if>
             <if test="endDate != null "> and da.end_date = #{endDate}</if>
             <if test="days != null "> and da.days = #{days}</if>
-            <if test="deptUserId != null "> and da.dept_user_id = #{deptUserId}</if>
-            <if test="deptComment != null  and deptComment != ''"> and da.dept_comment = #{deptComment}</if>
             <if test="managerUserId != null "> and da.manager_user_id = #{managerUserId}</if>
             <if test="managerComment != null  and managerComment != ''"> and da.manager_comment = #{managerComment}</if>
             <if test="dispatcher != null "> and da.dispatcher = #{dispatcher}</if>
             <if test="dispatchComment != null  and dispatchComment != ''"> and da.dispatch_comment = #{dispatchComment}</if>
             <if test="estimateCost != null "> and da.estimate_cost = #{estimateCost}</if>
-            <if test="deptTime != null "> and da.dept_time = #{deptTime}</if>
             <if test="managerTime != null "> and da.manager_time = #{managerTime}</if>
             <if test="dispatchTime != null "> and da.dispatch_time = #{dispatchTime}</if>
         </where>
@@ -125,8 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="beginDate != null">begin_date,</if>
             <if test="endDate != null">end_date,</if>
             <if test="days != null">days,</if>
-            <if test="deptUserId != null">dept_user_id,</if>
-            <if test="deptComment != null">dept_comment,</if>
             <if test="managerUserId != null">manager_user_id,</if>
             <if test="managerComment != null">manager_comment,</if>
             <if test="dispatcher != null">dispatcher,</if>
@@ -134,7 +118,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="estimateCost != null">estimate_cost,</if>
             <if test="remark != null">remark,</if>
             <if test="state != null">state,</if>
-            <if test="deptTime != null">dept_time,</if>
             <if test="managerTime != null">manager_time,</if>
             <if test="dispatchTime != null">dispatch_time,</if>
          </trim>
@@ -150,8 +133,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="beginDate != null">#{beginDate},</if>
             <if test="endDate != null">#{endDate},</if>
             <if test="days != null">#{days},</if>
-            <if test="deptUserId != null">#{deptUserId},</if>
-            <if test="deptComment != null">#{deptComment},</if>
             <if test="managerUserId != null">#{managerUserId},</if>
             <if test="managerComment != null">#{managerComment},</if>
             <if test="dispatcher != null">#{dispatcher},</if>
@@ -159,7 +140,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="estimateCost != null">#{estimateCost},</if>
             <if test="remark != null">#{remark},</if>
             <if test="state != null">#{state},</if>
-            <if test="deptTime != null">#{deptTime},</if>
             <if test="managerTime != null">#{managerTime},</if>
             <if test="dispatchTime != null">#{dispatchTime},</if>
          </trim>
@@ -178,8 +158,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="beginDate != null">begin_date = #{beginDate},</if>
             <if test="endDate != null">end_date = #{endDate},</if>
             <if test="days != null">days = #{days},</if>
-            <if test="deptUserId != null">dept_user_id = #{deptUserId},</if>
-            <if test="deptComment != null">dept_comment = #{deptComment},</if>
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="managerComment != null">manager_comment = #{managerComment},</if>
             <if test="dispatcher != null">dispatcher = #{dispatcher},</if>
@@ -187,7 +165,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="estimateCost != null">estimate_cost = #{estimateCost},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="state != null">state = #{state},</if>
-            <if test="deptTime != null">dept_time = #{deptTime},</if>
             <if test="managerTime != null">manager_time = #{managerTime},</if>
             <if test="dispatchTime != null">dispatch_time = #{dispatchTime},</if>
         </trim>

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

@@ -19,6 +19,7 @@
         <result property="place"    column="place"    />
         <result property="remark"    column="remark"    />
         <result property="manageDept"    column="manage_dept"    />
+        <result property="status"    column="status"    />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
     </resultMap>
 
@@ -28,7 +29,7 @@
     </resultMap>
 
     <sql id="selectCmcDeviceVo">
-        select d.device_id, d.device_number, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, dept.dept_name from cmc_device as d left join sys_dept as dept
+        select d.device_id, d.device_number, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, d.status, dept.dept_name from cmc_device as d left join sys_dept as dept
     </sql>
 
     <select id="selectCmcDeviceList" parameterType="CmcDevice" resultMap="CmcDeviceResult">
@@ -47,6 +48,7 @@
             <if test="dayCost != null "> and d.day_cost = #{dayCost}</if>
             <if test="place != null  and place != ''"> and d.place like concat('%', #{place}, '%')</if>
             <if test="manageDept != null "> and d.manage_dept = #{manageDept}</if>
+            <if test="status != null "> and d.status = #{status}</if>
         </where>
     </select>
 
@@ -76,6 +78,7 @@
             <if test="place != null">place,</if>
             <if test="remark != null">remark,</if>
             <if test="manageDept != null">manage_dept,</if>
+            <if test="status != null">status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceNumber != null">#{deviceNumber},</if>
@@ -91,6 +94,7 @@
             <if test="place != null">#{place},</if>
             <if test="remark != null">#{remark},</if>
             <if test="manageDept != null">#{manageDept},</if>
+            <if test="status != null">#{status},</if>
         </trim>
     </insert>
 
@@ -110,6 +114,7 @@
             <if test="place != null">place = #{place},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="manageDept != null">manage_dept = #{manageDept},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where device_id = #{deviceId}
     </update>

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

@@ -24,6 +24,7 @@
         <result property="manageApprovalTime"    column="manage_approval_time"    />
         <association property="planUser"    javaType="SysUser"         resultMap="PlanUserResult" />
         <association property="designUser"    javaType="SysUser"         resultMap="DesignUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="PlanUserResult">
@@ -36,12 +37,19 @@
         <result property="nickName"    column="design_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
     <sql id="selectCmcTechnicalVo">
         select t.technical_id, t.project_id, t.technical_director, t.technical_designer, u.nick_name as design_nick_name, t.technical_planner, u1.nick_name as plan_nick_name,
                t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.modify_document, t.final_document, t.design_description, t.technical_comment,
+               t.manager_user_id, u2.nick_name as manager_nick_name,
                t.manage_comment, t.technical_upload_time, t.tech_approval_time, t.manage_approval_time from cmc_technical as t
          left join sys_user as u on u.user_id = t.technical_designer
          left join sys_user as u1 on u1.user_id = t.technical_planner
+         left join sys_user as u2 on u2.user_id = t.manager_user_id
     </sql>
 
     <select id="selectCmcTechnicalList" parameterType="CmcTechnical" resultMap="CmcTechnicalResult">
@@ -57,6 +65,7 @@
             <if test="technicalDocument != null  and technicalDocument != ''"> and t.technical_document = #{technicalDocument}</if>
             <if test="designDescription != null  and designDescription != ''"> and t.design_description = #{designDescription}</if>
             <if test="technicalComment != null  and technicalComment != ''"> and t.technical_comment = #{technicalComment}</if>
+            <if test="managerUserId != null "> and t.manager_user_id = #{managerUserId}</if>
             <if test="manageComment != null  and manageComment != ''"> and t.manage_comment = #{manageComment}</if>
             <if test="technicalUploadTime != null "> and t.technical_upload_time = #{technicalUploadTime}</if>
             <if test="techApprovalTime != null "> and t.tech_approval_time = #{techApprovalTime}</if>
@@ -85,6 +94,7 @@
             <if test="finalDocument != null">final_document,</if>
             <if test="designDescription != null">design_description,</if>
             <if test="technicalComment != null">technical_comment,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
             <if test="manageComment != null">manage_comment,</if>
             <if test="technicalUploadTime != null">technical_upload_time,</if>
             <if test="techApprovalTime != null">tech_approval_time,</if>
@@ -104,6 +114,7 @@
             <if test="finalDocument != null">#{finalDocument},</if>
             <if test="designDescription != null">#{designDescription},</if>
             <if test="technicalComment != null">#{technicalComment},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
             <if test="manageComment != null">#{manageComment},</if>
             <if test="technicalUploadTime != null">#{technicalUploadTime},</if>
             <if test="techApprovalTime != null">#{techApprovalTime},</if>
@@ -126,6 +137,7 @@
             <if test="finalDocument != null">final_document = #{finalDocument},</if>
             <if test="designDescription != null">design_description = #{designDescription},</if>
             <if test="technicalComment != null">technical_comment = #{technicalComment},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="manageComment != null">manage_comment = #{manageComment},</if>
             <if test="technicalUploadTime != null">technical_upload_time = #{technicalUploadTime},</if>
             <if test="techApprovalTime != null">tech_approval_time = #{techApprovalTime},</if>

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

@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		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}
+		where p.post_name = '主任' and u.dept_id = #{param}
 	</select>
 
 	<select id="selectViceDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">

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-22 19:15:50
+ * @LastEditTime: 2024-05-23 14:46:21
 -->
 
 <template>
@@ -84,23 +84,33 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <!-- 安排设备意见 -->
               <el-divider></el-divider>
-
-              <!-- 部门审核意见 -->
-              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="showFormItem('部门审核')">
-                <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
-                  :disabled="taskName != '部门审核'">
+              <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'"
+                    :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="dispatchComment" label-width="120px">
+                <el-input type="textarea" :rows="2" placeholder="请输入安排设备意见" v-model="form.dispatchComment"
+                  :disabled="taskName != '安排设备'">
                 </el-input>
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('部门审核签名')">
-                    <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }} </span>
+                  <el-form-item label="签名：" label-width="120px"
+                    v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
+                    <span class="auditor"> {{ form.dispatchUser ? form.dispatchUser.nickName : dispatchUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('部门审核签名')">
-                    <span> {{ form.deptTime ? form.deptTime : deptTime }} </span>
+                  <el-form-item label="日期：" label-width="120px"
+                    v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
+                    <span> {{ form.dispatchTime ? form.dispatchTime : dispatchTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -122,53 +132,12 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <!-- 安排设备意见 -->
-              <el-divider></el-divider>
-              <el-form-item label="安排设备意见：" prop="dispatchComment" label-width="120px">
-                <el-input type="textarea" :rows="2" placeholder="请输入安排设备意见" v-model="form.dispatchComment"
-                  :disabled="taskName != '安排设备'">
-                </el-input>
-              </el-form-item>
-              <el-row>
-                <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px"
-                    v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
-                    <span class="auditor"> {{ form.dispatchUser ? form.dispatchUser.nickName : dispatchUser }} </span>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="日期：" label-width="120px"
-                    v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
-                    <span> {{ form.dispatchTime ? form.dispatchTime : dispatchTime }} </span>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <!-- 设备安排 -->
-              <el-form-item label-width="120px" label="设备选择：">
-                <el-select style="width: 300px;" v-model="form.devices" filterable multiple placeholder="请选择"
-                  @change="handleSelectDevice" clearable :disabled="taskName != '安排设备'">
-                  <el-option v-for="item in deviceList" :key="item.deviceId"
-                    :label="item.brand + item.series + item.name + item.code" :value="item.deviceId">
-                  </el-option>
-                </el-select>
-                <el-descriptions border v-if="isDeviceSelect" style="margin-top: 10px;" :column="1">
-                  <el-descriptions-item label="出厂编号" label-class-name="my-label">{{ chooseDevice.code
-                  }}</el-descriptions-item>
-                  <el-descriptions-item label="设备名称" label-class-name="my-label">{{ chooseDevice.name
-                  }}</el-descriptions-item>
-                  <el-descriptions-item label="设备品牌" label-class-name="my-label">{{ chooseDevice.brand
-                  }}</el-descriptions-item>
-                  <el-descriptions-item label="规格型号" label-class-name="my-label">{{ chooseDevice.series
-                  }}</el-descriptions-item>
-                  <el-descriptions-item label="存放地点" label-class-name="my-label">{{ chooseDevice.place
-                  }}</el-descriptions-item>
-                </el-descriptions>
-              </el-form-item>
+              <!-- 归还确认 -->
               <el-divider></el-divider>
               <el-form-item label="设备状况：" prop="state" label-width="120px">                
                 <el-radio-group v-model="form.state" size="small" :disabled="taskName != '归还确认'">
-                  <el-radio label="0">完好</el-radio>
-                  <el-radio label="1">需维修</el-radio>
+                  <el-radio label="2">完好</el-radio>
+                  <el-radio label="3">需维修</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="备注：" prop="remark" label-width="120px">
@@ -214,7 +183,7 @@ import { listDeviceApproval, getDeviceApproval, updateDeviceApproval, submitDevi
 import {
   complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm,
 } from "@/api/flowable/todo";
-import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
+import { getUsersManageLeader } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { getUserByRole } from "@/api/system/role";
@@ -233,10 +202,6 @@ export default {
     }
   },
   created() {
-    if (this.taskName == '部门审核') {
-      this.deptUser = this.$store.getters.name;
-      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
-    }
     if (this.taskName == '分管审核') {
       this.managerUser = this.$store.getters.name;
       this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -255,10 +220,8 @@ export default {
   },
   data() {
     return {
-      deptUser: '',
       managerUser: '',
       dispatchUser: '',
-      deptTime: undefined,
       managerTime: undefined,
       dispatchTime: undefined,
       form: {
@@ -288,8 +251,6 @@ export default {
         ],
       },
       deviceList: [],
-      chooseDevice: {},
-      isDeviceSelect: false,
       formTotal: 0
     }
   },
@@ -368,17 +329,16 @@ export default {
     },
     // 获取下一个审批人
     getNextFlowNodeApproval() {
-      if (this.taskName == '设备申请') {
-        getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
+      if (this.taskName == '设备申请') {        
+        getUserByRole({ roleId: 5 }).then(result => {
+          this.$set(this.taskForm.variables, "approval", result.data[0]);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack')
           });
-        })
-      } else if (this.taskName == '部门审核') {
-        getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+        });
+      } else if (this.taskName == '安排设备') {
+        getUsersManageLeader({ userId: this.form.applier }).then(res => {
           let userId = res.data.userId;
           this.$set(this.taskForm.variables, "approval", userId);
           complete(this.taskForm).then(response => {
@@ -387,14 +347,6 @@ export default {
           });
         })
       } else if (this.taskName == '分管审核') {
-        getUserByRole({ roleId: 5 }).then(result => {
-          this.$set(this.taskForm.variables, "approval", result.data[0]);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack')
-          });
-        });
-      } else if (this.taskName == '安排设备') {
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);
           this.$emit('goBack')
@@ -446,17 +398,6 @@ export default {
         this.deviceList = res.rows
       })
     },
-    // 选择设备
-    handleSelectDevice(val) {
-      if (val != "" && val != undefined && val != null) {
-        getDevice(val[val.length - 1]).then(res => {
-          this.chooseDevice = res.data;
-          this.isDeviceSelect = true
-        })
-      } else {
-        this.isDeviceSelect = false
-      }
-    },
     // 计算天数
     calculateDay() {
       if (this.form.beginDate && this.form.endDate) {
@@ -483,12 +424,8 @@ export default {
     },
     showFormItem(name) {
       let isShow = false;
-      if (name == '部门审核')
-        isShow = (this.taskName == '设备申请' || this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.deptUserId != null);
-      else if (name == '分管审核')
+      if (name == '分管审核')
         isShow = (this.taskName == '设备申请' || this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
-      else if (name == '部门审核签名')
-        isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.deptUserId != null);
       else if (name == '分管审核签名')
         isShow = this.taskName == '分管审核' || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
       return isShow;

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

@@ -117,7 +117,7 @@
             <el-table-column type="index" width="55" align="center" label="序号" />
             <el-table-column label="费用类型" align="center" prop="expenseType">
               <template slot-scope="scope">
-                <el-tag :type="typeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
+                <el-tag :type="expenseTypeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
               </template>
             </el-table-column>
             <el-table-column label="费用金额" align="center" prop="expense">
@@ -200,10 +200,16 @@
                 {{ scope.row.beginDate }}
               </template>
             </el-table-column>
-            <el-table-column label="归还时间" align="center" prop="returnDate" width="180">
+            <el-table-column label="归还时间" align="center" prop="returnDate">
               <template slot-scope="scope">
                 {{ scope.row.returnDate }}
               </template>
+            </el-table-column>            
+            <el-table-column label="设备状况" align="center" prop="state">
+              <template slot-scope="scope">
+                <el-tag :type="stateTypeStyle(scope.row.state)">{{ stateTypeText(scope.row.state) }}</el-tag>
+                {{ scope.row.state ? (scope.row.state == '0' ? '完好' : '需维修') : '使用中' }}
+              </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
@@ -454,7 +460,7 @@ export default {
         return '检定费'
       }
     },
-    typeStyle(row) {
+    expenseTypeStyle(row) {
       if (row == '0') {
         return 'primary'
       }
@@ -464,6 +470,34 @@ export default {
       if (row == '2') {
         return 'success'
       }
+    },
+    stateTypeText(row) {
+      if (row == '0') {
+        return '申领中'
+      }
+      if (row == '1') {
+        return '被领取'
+      }
+      if (row == '2') {
+        return '完好'
+      }
+      if (row == '3') {
+        return '需维修'
+      }
+    },
+    stateTypeStyle(row) {
+      if (row == '0') {
+        return 'primary'
+      }
+      if (row == '1') {
+        return 'warning'
+      }
+      if (row == '2') {
+        return 'success'
+      }
+      if (row == '3') {
+        return 'danger'
+      }
     }
   },
 }

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

@@ -37,6 +37,11 @@
     <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="设备id" align="center" prop="deviceId" /> -->
+      <el-table-column label="设备状态" align="center" prop="status" >
+        <template slot-scope="scope">
+                <el-tag :type="stateTypeStyle(scope.row.status)">{{ stateTypeText(scope.row.status) }}</el-tag>
+              </template>
+      </el-table-column>
       <el-table-column label="出厂编号" align="center" prop="code" />
       <el-table-column label="设备名称" align="center" prop="name" />
       <el-table-column label="设备类别" align="center" prop="type" />
@@ -308,6 +313,28 @@ export default {
       this.download('oa/device/export', {
         ...this.queryParams
       }, `device_${new Date().getTime()}.xlsx`)
+    },
+    stateTypeText(row) {
+      if (row == '0') {
+        return '被领用'
+      }
+      if (row == '1') {
+        return '可领用'
+      }
+      if (row == '2') {
+        return '已停用'
+      }
+    },
+    stateTypeStyle(row) {
+      if (row == '0') {
+        return 'warning'
+      }
+      if (row == '1') {
+        return 'success'
+      }
+      if (row == '2') {
+        return 'info'
+      }
     }
   }
 };