设备字段修改

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

@@ -75,7 +75,6 @@ public class CmcCarController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcCar cmcCar)
     {
-        if (cmcCar.getIsRent())
         if (cmcCar.getAcquisitionTime() != null && cmcCar.getCost() != null && cmcCar.getDayCost() != null) {
             // 年数总和法折旧
             int acquisitionYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcCar.getAcquisitionTime()));

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

@@ -1,17 +1,15 @@
 package com.ruoyi.web.controller.oa;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.oa.domain.CmcCar;
-import com.ruoyi.oa.domain.CmcDevice;
-import com.ruoyi.oa.domain.CmcDeviceApproval;
+import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.ICmcDeviceService;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -39,6 +37,12 @@ public class CmcDeviceApprovalController extends BaseController
     @Autowired
     private ICmcDeviceService cmcDeviceService;
 
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询cmc设备审批列表
      */
@@ -68,6 +72,23 @@ public class CmcDeviceApprovalController extends BaseController
     @GetMapping(value = "/{deviceApplyId}")
     public AjaxResult getInfo(@PathVariable("deviceApplyId") String deviceApplyId)
     {
+        JSONObject formData = new JSONObject();
+        CmcDeviceApproval cmcDeviceApproval = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(deviceApplyId);
+        formData.put("user", userService.selectUserById(cmcDeviceApproval.getApplier()).getNickName());
+        formData.put("deptName", deptService.selectDeptById(userService.selectUserById(cmcDeviceApproval.getApplier()).getDeptId()).getDeptName());
+        formData.put("date", cmcDeviceApproval.getApplyDate());
+        formData.put("startTime", cmcDeviceApproval.getBeginDate());
+        formData.put("endTime", cmcDeviceApproval.getEndDate());
+        formData.put("day", cmcDeviceApproval.getDays());
+        formData.put("projectNumber", cmcDeviceApproval.getProjectNumber());
+        formData.put("applyReason", cmcDeviceApproval.getApplyReason());
+        formData.put("deptUser", userService.selectUserById(cmcDeviceApproval.getDeptUserId()).getNickName());
+        formData.put("deptComment", cmcDeviceApproval.getDeptComment());
+        formData.put("managerUser", userService.selectUserById(cmcDeviceApproval.getManagerUserId()).getNickName());
+        formData.put("managerComment", cmcDeviceApproval.getManagerComment());
+        formData.put("dispatcher", userService.selectUserById(cmcDeviceApproval.getDispatcher()).getNickName());
+        formData.put("dispatchComment", cmcDeviceApproval.getDispatchComment());
+        formData.put("devices", cmcDeviceApproval.getDevices());
         return success(cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(deviceApplyId));
     }
 
@@ -90,7 +111,7 @@ public class CmcDeviceApprovalController extends BaseController
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcDeviceApproval cmcDeviceApproval = new CmcDeviceApproval();
-        cmcDeviceApproval.setDeviceId(formDataJson.getString("formId"));
+        cmcDeviceApproval.setDeviceApplyId(formDataJson.getString("formId"));
         cmcDeviceApproval.setApplier(getLoginUser().getUserId());
         cmcDeviceApproval.setApplyDate(DateUtils.getNowDate());
         cmcDeviceApproval.setProjectNumber(formDataJson.getString("projectNumber"));

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

@@ -27,7 +27,7 @@ public class CmcDeviceApproval extends BaseEntity
 
     /** 设备id */
     @Excel(name = "设备id")
-    private String deviceId;
+    private String devices;
 
     /** 项目编号 */
     @Excel(name = "项目编号")
@@ -115,14 +115,14 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return applier;
     }
-    public void setDeviceId(String deviceId) 
+    public void setDevices(String devices)
     {
-        this.deviceId = deviceId;
+        this.devices = devices;
     }
 
-    public String getDeviceId() 
+    public String getDevices()
     {
-        return deviceId;
+        return devices;
     }
     public void setProjectNumber(String projectNumber) 
     {
@@ -274,7 +274,7 @@ public class CmcDeviceApproval extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("deviceApplyId", getDeviceApplyId())
             .append("applier", getApplier())
-            .append("deviceId", getDeviceId())
+            .append("deviceId", getDevices())
             .append("projectNumber", getProjectNumber())
             .append("applyReason", getApplyReason())
             .append("beginDate", getBeginDate())

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

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcDeviceApproval" id="CmcDeviceApprovalResult">
         <result property="deviceApplyId"    column="device_apply_id"    />
         <result property="applier"    column="applier"    />
-        <result property="deviceId"    column="device_id"    />
+        <result property="devices"    column="devices"    />
         <result property="projectNumber"    column="project_number"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="applyDate"    column="apply_date"    />
@@ -27,14 +27,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDeviceApprovalVo">
-        select device_apply_id, applier, device_id, project_number, apply_reason, apply_date, return_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, dispatcher, dispatch_comment, estimate_cost from cmc_device_approval
+        select device_apply_id, applier, devices, project_number, apply_reason, apply_date, return_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, dispatcher, dispatch_comment, estimate_cost from cmc_device_approval
     </sql>
 
     <select id="selectCmcDeviceApprovalList" parameterType="CmcDeviceApproval" resultMap="CmcDeviceApprovalResult">
         <include refid="selectCmcDeviceApprovalVo"/>
         <where>  
             <if test="applier != null "> and applier = #{applier}</if>
-            <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
+            <if test="devices != null  and devices != ''"> and devices = #{devices}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and project_number = #{projectNumber}</if>
             <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
             <if test="applyDate != null "> and apply_date = #{applyDate}</if>
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceApplyId != null">device_apply_id,</if>
             <if test="applier != null">applier,</if>
-            <if test="deviceId != null">device_id,</if>
+            <if test="devices != null">devices,</if>
             <if test="projectNumber != null">project_number,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="applyDate != null">apply_date,</if>
@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceApplyId != null">#{deviceApplyId},</if>
             <if test="applier != null">#{applier},</if>
-            <if test="deviceId != null">#{deviceId},</if>
+            <if test="devices != null">#{devices},</if>
             <if test="projectNumber != null">#{projectNumber},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="applyDate != null">#{applyDate},</if>
@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_device_approval
         <trim prefix="SET" suffixOverrides=",">
             <if test="applier != null">applier = #{applier},</if>
-            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="devices != null">devices = #{devices},</if>
             <if test="projectNumber != null">project_number = #{projectNumber},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="applyDate != null">apply_date = #{applyDate},</if>

oa-back/sql/sql.sql

@@ -1476,7 +1476,7 @@ drop table if exists `cmc_device_approval`;
 create table `cmc_device_approval`  (
   `device_apply_id`		char(19)		not null		comment '设备申请id',
   `applier`				bigint			default null	comment '申请人',
-  `device_id`			varchar(10)		default null	comment '设备id',
+  `devices`				varchar(50)		default null	comment '设备id',
   `project_number`		varchar(10)		default null	comment '项目编号',
   `apply_reason`		varchar(255)	default null 	comment '申领事由',
   `begin_date`			date			default null 	comment '开始日期',