新增字段

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

@@ -2,12 +2,16 @@ package com.ktg.iscs.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 作业票隔离点对象 is_job_ticket_points
  *
@@ -54,5 +58,21 @@ public class IsJobTicketPoints extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "挂锁ID")
+    private Long lockId;
+
+    @ApiModelProperty(value = "上锁钥匙ID")
+    private Long lockedByKeyId;
+
+    @ApiModelProperty(value = "解锁钥匙ID")
+    private Long unlockedByKeyId;
+
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "上锁时间")
+    private Date lockTime;
+
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "解锁时间")
+    private Date unlockTime;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/ticket/JobTicketDetailVO.java

@@ -5,6 +5,7 @@ import com.ktg.common.core.domain.model.BaseBean;
 import com.ktg.iscs.domain.IsJobTicketUser;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -70,6 +71,23 @@ public class JobTicketDetailVO extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "挂锁ID")
+    private Long lockId;
+
+    @ApiModelProperty(value = "上锁钥匙ID")
+    private Long lockedByKeyId;
+
+    @ApiModelProperty(value = "解锁钥匙ID")
+    private Long unlockedByKeyId;
+
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "上锁时间")
+    private Date lockTime;
+
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "解锁时间")
+    private Date unlockTime;
+
     @ApiModelProperty(value = "隔离点数据")
     private List<PointDetailVO> pointDetailVOList;
 

ktg-iscs/src/main/resources/mapper/IsJobTicketPointsMapper.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.IsJobTicketPointsMapper">
-    
+
     <resultMap type="IsJobTicketPoints" id="IsJobTicketPointsResult">
         <result property="recordId"    column="record_id"    />
         <result property="ticketId"    column="ticket_id"    />
@@ -16,15 +16,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
+        <result property="lockId"    column="lock_id"    />
+        <result property="lockedByKeyId"    column="locked_by_key_id"    />
+        <result property="unlockedByKeyId"    column="unlocked_by_key_id"    />
+        <result property="lockTime"    column="lock_time"    />
+        <result property="unlockTime"    column="unlock_time"    />
     </resultMap>
 
     <sql id="selectIsJobTicketPointsVo">
-        select record_id, ticket_id, workshop_id, workarea_id, point_id, point_status, del_flag, create_by, create_time, update_time, update_by from is_job_ticket_points
+        select * from is_job_ticket_points
     </sql>
 
     <select id="selectIsJobTicketPointsList" parameterType="IsJobTicketPoints" resultMap="IsJobTicketPointsResult">
         <include refid="selectIsJobTicketPointsVo"/>
-        <where>  
+        <where>
             <if test="ticketId != null "> and ticket_id = #{ticketId}</if>
             <if test="workshopId != null "> and workshop_id = #{workshopId}</if>
             <if test="workareaId != null "> and workarea_id = #{workareaId}</if>
@@ -32,12 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pointStatus != null  and pointStatus != ''"> and point_status = #{pointStatus}</if>
         </where>
     </select>
-    
+
     <select id="selectIsJobTicketPointsByRecordId" parameterType="Long" resultMap="IsJobTicketPointsResult">
         <include refid="selectIsJobTicketPointsVo"/>
         where record_id = #{recordId}
     </select>
-        
+
     <insert id="insertIsJobTicketPoints" parameterType="IsJobTicketPoints" useGeneratedKeys="true" keyProperty="recordId">
         insert into is_job_ticket_points
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -51,6 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="lockId != null">lock_id,</if>
+            <if test="lockedByKeyId != null">locked_by_key_id,</if>
+            <if test="unlockedByKeyId != null">unlocked_by_key_id,</if>
+            <if test="lockTime != null">lock_time,</if>
+            <if test="unlockTime != null">unlock_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ticketId != null">#{ticketId},</if>
@@ -63,6 +73,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="lockId != null">#{lockId},</if>
+            <if test="lockedByKeyId != null">#{lockedByKeyId},</if>
+            <if test="unlockedByKeyId != null">#{unlockedByKeyId},</if>
+            <if test="lockTime != null">#{lockTime},</if>
+            <if test="unlockTime != null">#{unlockTime},</if>
          </trim>
     </insert>
 
@@ -79,6 +94,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="lockId != null">lock_id = #{lockId},</if>
+            <if test="lockedByKeyId != null">locked_by_key_id = #{lockedByKeyId},</if>
+            <if test="unlockedByKeyId != null">unlocked_by_key_id = #{unlockedByKeyId},</if>
+            <if test="lockTime != null">lock_time = #{lockTime},</if>
+            <if test="unlockTime != null">unlock_time = #{unlockTime},</if>
         </trim>
         where record_id = #{recordId}
     </update>
@@ -88,9 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsJobTicketPointsByRecordIds" parameterType="String">
-        delete from is_job_ticket_points where record_id in 
+        delete from is_job_ticket_points where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">
             #{recordId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

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

@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="materialsCode != null and materialsCode != ''">#{materialsCode},</if>
             <if test="materialsName != null and materialsName != ''">#{materialsName},</if>
-            <if test="materialsTypeId != null">materialsTypeId,</if>
+            <if test="materialsTypeId != null">#{materialsTypeId},</if>
             <if test="workareaId != null">#{workareaId},</if>
             <if test="materialsCabinetId != null">#{materialsCabinetId},</if>
             <if test="serviceLife != null">#{serviceLife},</if>