Explorar el Código

IS_ISOLATION_POINT新增pointNfc

车车 hace 11 meses
padre
commit
ed6a1a9b75

+ 4 - 0
ktg-iscs/src/main/java/com/ktg/iscs/domain/IsIsolationPoint.java

@@ -40,6 +40,10 @@ public class IsIsolationPoint extends BaseBean
     @Excel(name = "隔离点类型")
     private String pointType;
 
+    @ApiModelProperty(value = "隔离点nfc")
+    @Excel(name = "隔离点nfc")
+    private String pointNfc;
+
     /** 所属车间ID */
     @ApiModelProperty(value = "所属车间ID")
     @Excel(name = "所属车间ID")

+ 3 - 0
ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointDetailVO.java

@@ -32,6 +32,9 @@ public class PointDetailVO extends BaseBean
     @ApiModelProperty(value = "隔离点类型Name")
     private String pointTypeName;
 
+    @ApiModelProperty(value = "隔离点nfc")
+    private String pointNfc;
+
     @ApiModelProperty(value = "所属车间ID")
     private Long workshopId;
 

+ 3 - 0
ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointPageVO.java

@@ -32,6 +32,9 @@ public class PointPageVO extends BaseBean
     @ApiModelProperty(value = "隔离点类型")
     private String pointType;
 
+    @ApiModelProperty(value = "隔离点nfc")
+    private String pointNfc;
+
     @ApiModelProperty(value = "所属车间ID")
     private Long workshopId;
 

+ 5 - 1
ktg-iscs/src/main/resources/mapper/IsIsolationPointMapper.xml

@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="lockTypeId"    column="lock_type_id"    />
+        <result property="pointNfc"    column="point_nfc"    />
     </resultMap>
 
     <sql id="selectIsIsolationPointVo">
-        select point_id, point_code, point_name, point_type, workshop_id, workarea_id, power_type, isolation_method,
+        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
@@ -65,6 +66,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="lockTypeId != null and lockTypeId != ''">lock_type_id,</if>
+            <if test="pointNfc != null and pointNfc != ''">point_nfc,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pointCode != null and pointCode != ''">#{pointCode},</if>
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="lockTypeId != null and lockTypeId != ''">#{lockTypeId},</if>
+            <if test="pointNfc != null and pointNfc != ''">#{pointNfc},</if>
          </trim>
     </insert>
 
@@ -103,6 +106,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="lockTypeId != null and lockTypeId != ''">lock_type_id = #{lockTypeId},</if>
+            <if test="pointNfc != null and pointNfc != ''">point_nfc = #{pointNfc},</if>
         </trim>
         where point_id = #{pointId}
     </update>