巡检记录添加字段

gassafety-system/src/main/java/com/zehong/system/domain/TInspectionData.java

@@ -26,6 +26,10 @@ public class TInspectionData extends BaseEntity
     @Excel(name = "设备编号")
     private String deviceCode;
 
+    /** 设备类型 */
+    @Excel(name = "设备类型")
+    private String deviceType;
+
     /** 处理状态（1不需处理，2已处理完成，3未处理完成） */
     @Excel(name = "处理状态", readConverterExp = "1=不需处理，2已处理完成，3未处理完成")
     private String dealStatus;
@@ -61,6 +65,15 @@ public class TInspectionData extends BaseEntity
     {
         return deviceCode;
     }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
     public void setDealStatus(String dealStatus)
     {
         this.dealStatus = dealStatus;
@@ -86,6 +99,7 @@ public class TInspectionData extends BaseEntity
             .append("dataId", getDataId())
             .append("planId", getPlanId())
             .append("deviceCode", getDeviceCode())
+            .append("deviceType", getDeviceType())
             .append("dealStatus", getDealStatus())
             .append("updateTime", getUpdateTime())
             .append("createTime", getCreateTime())

gassafety-system/src/main/resources/mapper/system/TInspectionDataMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataId"    column="data_id"    />
         <result property="planId"    column="plan_id"    />
         <result property="deviceCode"    column="device_code"    />
+        <result property="deviceType"    column="device_type"    />
         <result property="dealStatus"    column="deal_status"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createTime"    column="create_time"    />
@@ -15,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTInspectionDataVo">
-        select data_id, plan_id, device_code, deal_status, update_time, create_time, remarks from t_inspection_data
+        select data_id, plan_id, device_code, device_type, deal_status, update_time, create_time, remarks from t_inspection_data
     </sql>
 
     <select id="selectTInspectionDataList" parameterType="TInspectionData" resultMap="TInspectionDataResult">
@@ -23,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="planId != null "> and plan_id = #{planId}</if>
             <if test="deviceCode != null "> and device_code = #{deviceCode}</if>
+            <if test="deviceType != null "> and device_type = #{deviceType}</if>
             <if test="dealStatus != null  and dealStatus != ''"> and deal_status = #{dealStatus}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dataId != null">data_id,</if>
             <if test="planId != null">plan_id,</if>
             <if test="deviceCode != null">device_code,</if>
+            <if test="deviceType != null">device_type,</if>
             <if test="dealStatus != null">deal_status,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createTime != null">create_time,</if>
@@ -59,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dataId != null">#{dataId},</if>
             <if test="planId != null">#{planId},</if>
             <if test="deviceCode != null">#{deviceCode},</if>
+            <if test="deviceType != null">#{deviceType},</if>
             <if test="dealStatus != null">#{dealStatus},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -71,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="planId != null">plan_id = #{planId},</if>
             <if test="deviceCode != null">device_code = #{deviceCode},</if>
+            <if test="deviceType != null">device_type = #{deviceType},</if>
             <if test="dealStatus != null">deal_status = #{dealStatus},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>