新增隔离点类型字段

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

@@ -78,8 +78,10 @@ public class IsIsolationPoint extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
-    @ApiModelProperty(value = "锁具类型id")
+    @ApiModelProperty(value = "挂锁类型id")
     private Long lockTypeId;
 
+    @ApiModelProperty(value = "锁具类型id")
+    private Long locksetTypeId;
 
 }

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

@@ -22,13 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="lockTypeId"    column="lock_type_id"    />
         <result property="pointNfc"    column="point_nfc"    />
+        <result property="locksetTypeId"    column="lockset_type_id"    />
     </resultMap>
 
     <sql id="selectIsIsolationPointVo">
-        select point_id, point_code, point_name, point_type, point_nfc, workshop_id, workarea_id, power_type, isolation_method,
-               point_icon, point_picture, del_flag, create_by, create_time, update_time, update_by,
-               lock_type_id
-               from is_isolation_point
+        select * from is_isolation_point
     </sql>
 
     <select id="selectIsIsolationPointList" parameterType="IsIsolationPoint" resultMap="IsIsolationPointResult">
@@ -65,8 +63,9 @@ 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="lockTypeId != null and lockTypeId != ''">lock_type_id,</if>
+            <if test="lockTypeId != null">lock_type_id,</if>
             <if test="pointNfc != null and pointNfc != ''">point_nfc,</if>
+            <if test="locksetTypeId != null">lockset_type_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pointCode != null and pointCode != ''">#{pointCode},</if>
@@ -83,8 +82,9 @@ 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="lockTypeId != null and lockTypeId != ''">#{lockTypeId},</if>
+            <if test="lockTypeId != null">#{lockTypeId},</if>
             <if test="pointNfc != null and pointNfc != ''">#{pointNfc},</if>
+            <if test="locksetTypeId != null">#{locksetTypeId},</if>
          </trim>
     </insert>
 
@@ -105,8 +105,9 @@ 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="lockTypeId != null and lockTypeId != ''">lock_type_id = #{lockTypeId},</if>
+            <if test="lockTypeId != null">lock_type_id = #{lockTypeId},</if>
             <if test="pointNfc != null and pointNfc != ''">point_nfc = #{pointNfc},</if>
+            <if test="locksetTypeId != null">lockset_type_id = #{locksetTypeId},</if>
         </trim>
         where point_id = #{pointId}
     </update>