设备表更新

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

@@ -163,19 +163,20 @@ public class CmcCarApprovalController extends BaseController
         if (formDataJson.getString("dispatchComment") != null) {
             cmcCarApproval.setDispatcher(getLoginUser().getUserId());
             cmcCarApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
-            if (formDataJson.getString("cars") != null && formDataJson.getString("drivers") != null) {
-                String carString = formDataJson.getString("cars").substring(1, formDataJson.getString("cars").length() - 1);
-                cmcCarApproval.setCars(carString);
-                cmcCarApproval.setDrivers(formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1));
-                String[] cars = carString.split(",");
-                BigDecimal estimateCost = new BigDecimal(0);
-                for (String car : cars) {
-                    CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(Integer.parseInt(car));
-                    if (cmcCar.getDayCost() != null)
-                        estimateCost = estimateCost.add(cmcCar.getDayCost().multiply(new BigDecimal(cmcCarApproval.getDays())));
-                }
-                cmcCarApproval.setEstimateCost(estimateCost);
+        }
+        if (formDataJson.getString("cars") != null && formDataJson.getString("drivers") != null) {
+            cmcCarApproval.setDispatcher(getLoginUser().getUserId());
+            String carString = formDataJson.getString("cars").substring(1, formDataJson.getString("cars").length() - 1);
+            cmcCarApproval.setCars(carString);
+            cmcCarApproval.setDrivers(formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1));
+            String[] cars = carString.split(",");
+            BigDecimal estimateCost = new BigDecimal(0);
+            for (String car : cars) {
+                CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(Integer.parseInt(car));
+                if (cmcCar.getDayCost() != null)
+                    estimateCost = estimateCost.add(cmcCar.getDayCost().multiply(new BigDecimal(cmcCarApproval.getDays())));
             }
+            cmcCarApproval.setEstimateCost(estimateCost);
         }
         cmcCarApprovalService.updateCmcCarApproval(cmcCarApproval);
         return AjaxResult.success("修改用车审批表成功");

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

@@ -74,7 +74,7 @@ public class CmcCarController extends BaseController
         CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(carId);
         jsonObject.put("carId", cmcCar.getCarId());
         jsonObject.put("licensePlate", cmcCar.getLicensePlate());
-        jsonObject.put("driver", userService.selectUserById(cmcCar.getDriver()).getNickName());
+        jsonObject.put("driver", cmcCar.getDriver() != null ? userService.selectUserById(cmcCar.getDriver()).getNickName() : "");
         jsonObject.put("brand", cmcCar.getBrand());
         jsonObject.put("series", cmcCar.getSeries());
         jsonObject.put("cost", cmcCar.getCost());

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

@@ -152,25 +152,25 @@ public class CmcDeviceApprovalController extends BaseController
             cmcDeviceApproval.setManagerUserId(getLoginUser().getUserId());
             cmcDeviceApproval.setManagerComment(formDataJson.getString("managerComment"));
         }
-
         if (formDataJson.getDate("returnDate") != null) {
             cmcDeviceApproval.setReturnDate(formDataJson.getDate("returnDate"));
         }
         if (formDataJson.getString("dispatchComment") != null) {
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
             cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
-            if (formDataJson.getString("devices") != null) {
-                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));
-                    if (cmcDevice.getDayCost() != null)
-                        estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
-                }
-                cmcDeviceApproval.setEstimateCost(estimateCost);
+        }
+        if (formDataJson.getString("devices") != null) {
+            cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
+            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));
+                if (cmcDevice.getDayCost() != null)
+                    estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
             }
+            cmcDeviceApproval.setEstimateCost(estimateCost);
         }
         cmcDeviceApprovalService.updateCmcDeviceApproval(cmcDeviceApproval);
         return AjaxResult.success("修改设备审批表成功");

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

@@ -10,9 +10,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cmc设备信息对象 cmc_device
- * 
+ *
  * @author cmc
- * @date 2024-03-05
+ * @date 2024-03-14
  */
 public class CmcDevice extends BaseEntity
 {
@@ -21,10 +21,14 @@ public class CmcDevice extends BaseEntity
     /** 设备id */
     private Integer deviceId;
 
-    /** 设备编号 */
-    @Excel(name = "设备编号")
+    /** 出厂编号 */
+    @Excel(name = "出厂编号")
     private String code;
 
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String name;
+
     /** 设备类别 */
     @Excel(name = "设备类别")
     private String type;
@@ -34,22 +38,47 @@ public class CmcDevice extends BaseEntity
     @Excel(name = "购置时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date acquisitionTime;
 
-    /** 总价 */
-    @Excel(name = "总价")
+    /** 购买价格 */
+    @Excel(name = "购买价格")
     private BigDecimal cost;
 
     /** 预计使用年限 */
     @Excel(name = "预计使用年限")
     private Integer expectLife;
 
-    /** 设备系列 */
-    @Excel(name = "设备系列")
+    /** 规格型号 */
+    @Excel(name = "规格型号")
     private String series;
 
+    /** 设备品牌 */
+    @Excel(name = "设备品牌")
+    private String brand;
+
     /** 单日成本 */
     @Excel(name = "单日成本")
     private BigDecimal dayCost;
 
+    /** 存放地点 */
+    @Excel(name = "存放地点")
+    private String place;
+
+    /** 校验周期（年） */
+    @Excel(name = "校验周期", readConverterExp = "年=")
+    private Integer checkTerm;
+
+    /** 校验时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "校验时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date checkTime;
+
+    /** 保修期（月） */
+    @Excel(name = "保修期", readConverterExp = "月=")
+    private Integer warranty;
+
+    /** 管理部门 */
+    @Excel(name = "管理部门")
+    private Long manageDept;
+
     public void setDeviceId(Integer deviceId)
     {
         this.deviceId = deviceId;
@@ -59,60 +88,78 @@ public class CmcDevice extends BaseEntity
     {
         return deviceId;
     }
-    public void setCode(String code) 
+    public void setCode(String code)
     {
         this.code = code;
     }
 
-    public String getCode() 
+    public String getCode()
     {
         return code;
     }
-    public void setType(String type) 
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setType(String type)
     {
         this.type = type;
     }
 
-    public String getType() 
+    public String getType()
     {
         return type;
     }
-    public void setAcquisitionTime(Date acquisitionTime) 
+    public void setAcquisitionTime(Date acquisitionTime)
     {
         this.acquisitionTime = acquisitionTime;
     }
 
-    public Date getAcquisitionTime() 
+    public Date getAcquisitionTime()
     {
         return acquisitionTime;
     }
-    public void setCost(BigDecimal cost) 
+    public void setCost(BigDecimal cost)
     {
         this.cost = cost;
     }
 
-    public BigDecimal getCost() 
+    public BigDecimal getCost()
     {
         return cost;
     }
-    public void setExpectLife(Integer expectLife) 
+    public void setExpectLife(Integer expectLife)
     {
         this.expectLife = expectLife;
     }
 
-    public Integer getExpectLife() 
+    public Integer getExpectLife()
     {
         return expectLife;
     }
-    public void setSeries(String series) 
+    public void setSeries(String series)
     {
         this.series = series;
     }
 
-    public String getSeries() 
+    public String getSeries()
     {
         return series;
     }
+    public void setBrand(String brand)
+    {
+        this.brand = brand;
+    }
+
+    public String getBrand()
+    {
+        return brand;
+    }
     public void setDayCost(BigDecimal dayCost)
     {
         this.dayCost = dayCost;
@@ -122,18 +169,71 @@ public class CmcDevice extends BaseEntity
     {
         return dayCost;
     }
+    public void setPlace(String place)
+    {
+        this.place = place;
+    }
+
+    public String getPlace()
+    {
+        return place;
+    }
+    public void setCheckTerm(Integer checkTerm)
+    {
+        this.checkTerm = checkTerm;
+    }
+
+    public Integer getCheckTerm()
+    {
+        return checkTerm;
+    }
+    public void setCheckTime(Date checkTime)
+    {
+        this.checkTime = checkTime;
+    }
+
+    public Date getCheckTime()
+    {
+        return checkTime;
+    }
+    public void setWarranty(Integer warranty)
+    {
+        this.warranty = warranty;
+    }
+
+    public Integer getWarranty()
+    {
+        return warranty;
+    }
+    public void setManageDept(Long manageDept)
+    {
+        this.manageDept = manageDept;
+    }
+
+    public Long getManageDept()
+    {
+        return manageDept;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deviceId", getDeviceId())
-            .append("code", getCode())
-            .append("type", getType())
-            .append("acquisitionTime", getAcquisitionTime())
-            .append("cost", getCost())
-            .append("expectLife", getExpectLife())
-            .append("series", getSeries())
-            .append("dayCost", getDayCost())
-            .toString();
+                .append("deviceId", getDeviceId())
+                .append("code", getCode())
+                .append("name", getName())
+                .append("type", getType())
+                .append("acquisitionTime", getAcquisitionTime())
+                .append("cost", getCost())
+                .append("expectLife", getExpectLife())
+                .append("series", getSeries())
+                .append("brand", getBrand())
+                .append("dayCost", getDayCost())
+                .append("place", getPlace())
+                .append("remark", getRemark())
+                .append("checkTerm", getCheckTerm())
+                .append("checkTime", getCheckTime())
+                .append("warranty", getWarranty())
+                .append("manageDept", getManageDept())
+                .toString();
     }
 }

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

@@ -7,28 +7,43 @@
     <resultMap type="CmcDevice" id="CmcDeviceResult">
         <result property="deviceId"    column="device_id"    />
         <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
         <result property="type"    column="type"    />
         <result property="acquisitionTime"    column="acquisition_time"    />
         <result property="cost"    column="cost"    />
         <result property="expectLife"    column="expect_life"    />
         <result property="series"    column="series"    />
-        <result property="dayCost"    column="dayCost"    />
+        <result property="brand"    column="brand"    />
+        <result property="dayCost"    column="day_cost"    />
+        <result property="place"    column="place"    />
+        <result property="remark"    column="remark"    />
+        <result property="checkTerm"    column="check_term"    />
+        <result property="checkTime"    column="check_time"    />
+        <result property="warranty"    column="warranty"    />
+        <result property="manageDept"    column="manage_dept"    />
     </resultMap>
 
     <sql id="selectCmcDeviceVo">
-        select device_id, code, type, acquisition_time, cost, expect_life, series, day_cost from cmc_device
+        select device_id, code, name, type, acquisition_time, cost, expect_life, series, brand, day_cost, place, remark, check_term, check_time, warranty, manage_dept from cmc_device
     </sql>
 
     <select id="selectCmcDeviceList" parameterType="CmcDevice" resultMap="CmcDeviceResult">
         <include refid="selectCmcDeviceVo"/>
         <where>
-            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
-            <if test="type != null  and type != ''"> and type like concat('%', #{type}, '%')</if>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="acquisitionTime != null "> and acquisition_time = #{acquisitionTime}</if>
             <if test="cost != null "> and cost = #{cost}</if>
-            <if test="dayCost != null "> and day_cost = #{dayCost}</if>
             <if test="expectLife != null "> and expect_life = #{expectLife}</if>
-            <if test="series != null  and series != ''"> and series like concat('%', #{series}, '%')</if>
+            <if test="series != null  and series != ''"> and series = #{series}</if>
+            <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
+            <if test="dayCost != null "> and day_cost = #{dayCost}</if>
+            <if test="place != null  and place != ''"> and place = #{place}</if>
+            <if test="checkTerm != null "> and check_term = #{checkTerm}</if>
+            <if test="checkTime != null "> and check_time = #{checkTime}</if>
+            <if test="warranty != null "> and warranty = #{warranty}</if>
+            <if test="manageDept != null "> and manage_dept = #{manageDept}</if>
         </where>
     </select>
 
@@ -41,21 +56,37 @@
         insert into cmc_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="code != null">code,</if>
+            <if test="name != null">name,</if>
             <if test="type != null">type,</if>
             <if test="acquisitionTime != null">acquisition_time,</if>
             <if test="cost != null">cost,</if>
-            <if test="dayCost != null">day_cost,</if>
             <if test="expectLife != null">expect_life,</if>
             <if test="series != null">series,</if>
+            <if test="brand != null">brand,</if>
+            <if test="dayCost != null">day_cost,</if>
+            <if test="place != null">place,</if>
+            <if test="remark != null">remark,</if>
+            <if test="checkTerm != null">check_term,</if>
+            <if test="checkTime != null">check_time,</if>
+            <if test="warranty != null">warranty,</if>
+            <if test="manageDept != null">manage_dept,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="code != null">#{code},</if>
+            <if test="name != null">#{name},</if>
             <if test="type != null">#{type},</if>
             <if test="acquisitionTime != null">#{acquisitionTime},</if>
             <if test="cost != null">#{cost},</if>
-            <if test="dayCost != null">#{dayCost},</if>
             <if test="expectLife != null">#{expectLife},</if>
             <if test="series != null">#{series},</if>
+            <if test="brand != null">#{brand},</if>
+            <if test="dayCost != null">#{dayCost},</if>
+            <if test="place != null">#{place},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="checkTerm != null">#{checkTerm},</if>
+            <if test="checkTime != null">#{checkTime},</if>
+            <if test="warranty != null">#{warranty},</if>
+            <if test="manageDept != null">#{manageDept},</if>
         </trim>
     </insert>
 
@@ -63,17 +94,25 @@
         update cmc_device
         <trim prefix="SET" suffixOverrides=",">
             <if test="code != null">code = #{code},</if>
+            <if test="name != null">name = #{name},</if>
             <if test="type != null">type = #{type},</if>
             <if test="acquisitionTime != null">acquisition_time = #{acquisitionTime},</if>
             <if test="cost != null">cost = #{cost},</if>
-            <if test="dayCost != null">day_cost = #{dayCost},</if>
             <if test="expectLife != null">expect_life = #{expectLife},</if>
             <if test="series != null">series = #{series},</if>
+            <if test="brand != null">brand = #{brand},</if>
+            <if test="dayCost != null">day_cost = #{dayCost},</if>
+            <if test="place != null">place = #{place},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="checkTerm != null">check_term = #{checkTerm},</if>
+            <if test="checkTime != null">check_time = #{checkTime},</if>
+            <if test="warranty != null">warranty = #{warranty},</if>
+            <if test="manageDept != null">manage_dept = #{manageDept},</if>
         </trim>
         where device_id = #{deviceId}
     </update>
 
-    <delete id="deleteCmcDeviceByDeviceId" parameterType="Long">
+    <delete id="deleteCmcDeviceByDeviceId" parameterType="Integer">
         delete from cmc_device where device_id = #{deviceId}
     </delete>
 

oa-back/sql/sql.sql

@@ -1489,13 +1489,21 @@ create table `cmc_car_approval`  (
 drop table if exists `cmc_device`;
 create table `cmc_device`  (
   `device_id`			int					not null auto_increment		comment '设备id',
-  `code`				varchar(20)			default null				comment '设备编号',
+  `code`				varchar(20)			default null				comment '出厂编号',
+  `name`				varchar(20)			default null				comment '设备名称',
   `type`				varchar(10)			default null				comment '设备类别',
   `acquisition_time`	datetime			default null				comment '购置时间',
-  `cost`				decimal(10,2)		default null				comment '总价',
+  `cost`				decimal(10,2)		default null				comment '购买价格',
   `expect_life`			int					default null				comment '预计使用年限',
-  `series`				varchar(20)			default null				comment '设备系列',
+  `series`				varchar(20)			default null				comment '规格型号',
+  `brand`				varchar(20)			default null				comment '设备品牌',
   `day_cost`			decimal(10,2)		default null				comment '单日成本',
+  `place`				varchar(50)			default null				comment '存放地点',
+  `remark`				varchar(255)		default null				comment '备注',
+  `check_term`			int					default null				comment '校验周期（年）',
+  `warranty`			int					default null				comment '保修期（月）',
+  `check_time`			datetime			default null				comment '校验日期',
+  `manage_dept`			bigint				default null				comment '管理部门',
   primary key (`device_id`)
 ) engine = innodb comment = 'cmc设备信息表';