字段调整

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsJobTicketLockset.java

@@ -1,14 +1,15 @@
 package com.ktg.iscs.domain;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * 作业票锁具对象 is_job_ticket_lockset
@@ -46,7 +47,17 @@ public class IsJobTicketLockset extends BaseBean
     @Excel(name = "归还硬件ID")
     private Long toHardwareId;
 
-    @ApiModelProperty(value = "附件状态")
+    @ApiModelProperty(value = "所需锁具类型ID")
+    @Excel(name = "所需锁具类型ID")
+    private Long locksetTypeId;
+
+    @ApiModelProperty(value = "附件状态(0待取出（点击开始作业）" +
+            "1已取出（锁具出柜子）" +
+            "2待使用（上锁钥匙出机柜）" +
+            "3使用中（上锁钥匙还机柜）" +
+            "4待拆除（解锁钥匙出机柜）" +
+            "5待归还（解锁钥匙还机柜，但锁具为归还）" +
+            "6已归还（锁具还物资柜）)")
     @Excel(name = "附件状态")
     private String locksetStatus;
 

ktg-iscs/src/main/resources/mapper/IsJobTicketLocksetMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsJobTicketLocksetMapper">
-    
+
     <resultMap type="IsJobTicketLockset" id="IsJobTicketLocksetResult">
         <result property="recordId"    column="record_id"    />
         <result property="jobTicketId"    column="job_ticket_id"    />
@@ -20,15 +20,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="remark"    column="remark"    />
+        <result property="locksetTypeId"    column="lockset_type_id"    />
     </resultMap>
 
     <sql id="selectIsJobTicketLocksetVo">
-        select record_id, job_ticket_id, point_id, lockset_id, from_hardware_id, to_hardware_id, lockset_status, collect_time, give_back_time, del_flag, create_by, create_time, update_time, update_by, remark from is_job_ticket_lockset
+        select * from is_job_ticket_lockset
     </sql>
 
     <select id="selectIsJobTicketLocksetList" parameterType="IsJobTicketLockset" resultMap="IsJobTicketLocksetResult">
         <include refid="selectIsJobTicketLocksetVo"/>
-        <where>  
+        <where>
             <if test="jobTicketId != null "> and job_ticket_id = #{jobTicketId}</if>
             <if test="pointId != null "> and point_id = #{pointId}</if>
             <if test="locksetId != null "> and lockset_id = #{locksetId}</if>
@@ -39,12 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="giveBackTime != null "> and give_back_time = #{giveBackTime}</if>
         </where>
     </select>
-    
+
     <select id="selectIsJobTicketLocksetByRecordId" parameterType="Long" resultMap="IsJobTicketLocksetResult">
         <include refid="selectIsJobTicketLocksetVo"/>
         where record_id = #{recordId}
     </select>
-        
+
     <insert id="insertIsJobTicketLockset" parameterType="IsJobTicketLockset" useGeneratedKeys="true" keyProperty="recordId">
         insert into is_job_ticket_lockset
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -62,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="remark != null">remark,</if>
+            <if test="locksetTypeId != null">lockset_type_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobTicketId != null">#{jobTicketId},</if>
@@ -78,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="locksetTypeId != null">#{locksetTypeId},</if>
          </trim>
     </insert>
 
@@ -98,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="locksetTypeId != null">lockset_type_id = #{locksetTypeId},</if>
         </trim>
         where record_id = #{recordId}
     </update>
@@ -107,9 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsJobTicketLocksetByRecordIds" parameterType="String">
-        delete from is_job_ticket_lockset where record_id in 
+        delete from is_job_ticket_lockset where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">
             #{recordId}
         </foreach>
     </delete>
-</mapper>
+</mapper>