车车 преди 1 година
родител
ревизия
0cd03fff31
променени са 2 файла, в които са добавени 16 реда и са изтрити 7 реда
  1. 3 0
      ktg-iscs/src/main/java/com/ktg/iscs/domain/IsJobTicketUser.java
  2. 13 7
      ktg-iscs/src/main/resources/mapper/IsJobTicketUserMapper.xml

+ 3 - 0
ktg-iscs/src/main/java/com/ktg/iscs/domain/IsJobTicketUser.java

@@ -50,6 +50,9 @@ public class IsJobTicketUser extends BaseBean
     @Excel(name = "作业票角色")
     private String userRole;
 
+    @ApiModelProperty(value = "作业状态(0未开始,1 取锁具, 2取钥匙, 3待上锁,4 已上锁,5 已解锁)")
+    private Integer jobStatus;
+
     /** 删除标志(0代表存在 2代表删除) */
     @ApiModelProperty(value = "删除标志(0代表存在 2代表删除)")
     private String delFlag;

+ 13 - 7
ktg-iscs/src/main/resources/mapper/IsJobTicketUserMapper.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.IsJobTicketUserMapper">
-    
+
     <resultMap type="IsJobTicketUser" id="IsJobTicketUserResult">
         <result property="recordId"    column="record_id"    />
         <result property="ticketId"    column="ticket_id"    />
@@ -16,15 +16,18 @@ 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="jobStatus"    column="job_status"    />
+
     </resultMap>
 
     <sql id="selectIsJobTicketUserVo">
-        select record_id, ticket_id, user_id, user_name, user_type, user_role, del_flag, create_by, create_time, update_time, update_by from is_job_ticket_user
+        select record_id, ticket_id, user_id, user_name, user_type, user_role, del_flag, create_by, create_time, update_time,
+               update_by, job_status from is_job_ticket_user
     </sql>
 
     <select id="selectIsJobTicketUserList" parameterType="IsJobTicketUser" resultMap="IsJobTicketUserResult">
         <include refid="selectIsJobTicketUserVo"/>
-        <where>  
+        <where>
             <if test="ticketId != null "> and ticket_id = #{ticketId}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
@@ -32,12 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userRole != null  and userRole != ''"> and user_role = #{userRole}</if>
         </where>
     </select>
-    
+
     <select id="selectIsJobTicketUserByRecordId" parameterType="Long" resultMap="IsJobTicketUserResult">
         <include refid="selectIsJobTicketUserVo"/>
         where record_id = #{recordId}
     </select>
-        
+
     <insert id="insertIsJobTicketUser" parameterType="IsJobTicketUser" useGeneratedKeys="true" keyProperty="recordId">
         insert into is_job_ticket_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -51,6 +54,7 @@ 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="jobStatus != null">job_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ticketId != null">#{ticketId},</if>
@@ -63,6 +67,7 @@ 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="jobStatus != null">#{jobStatus},</if>
          </trim>
     </insert>
 
@@ -79,6 +84,7 @@ 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="jobStatus != null">job_status = #{jobStatus},</if>
         </trim>
         where record_id = #{recordId}
     </update>
@@ -88,9 +94,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsJobTicketUserByRecordIds" parameterType="String">
-        delete from is_job_ticket_user where record_id in 
+        delete from is_job_ticket_user where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">
             #{recordId}
         </foreach>
     </delete>
-</mapper>
+</mapper>