巡检计划添加地址字段

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

@@ -38,6 +38,10 @@ public class TInspectionPlan extends BaseEntity
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
     /** 计划状态（0未下发，1已下发，2进行中，3已完成） */
     @Excel(name = "计划状态（0未下发，1已下发，2进行中，3已完成）")
     private String planStatus;
@@ -100,7 +104,15 @@ public class TInspectionPlan extends BaseEntity
         return endTime;
     }
 
-    public void setPlanStatus(String planStatus) 
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public void setPlanStatus(String planStatus)
     {
         this.planStatus = planStatus;
     }

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderId"    column="order_id"    />
         <result property="startTime"    column="start_time"    />
         <result property="endTime"    column="end_time"    />
+        <result property="address"    column="address"    />
         <result property="planStatus"    column="plan_status"    />
         <result property="isDel"    column="is_del"    />
         <result property="updateTime"    column="update_time"    />
@@ -18,13 +19,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTInspectionPlanVo">
-        select plan_id, plan_name, order_id, start_time, end_time, plan_status, is_del, update_time, create_time, remarks from t_inspection_plan
+        select plan_id, plan_name, order_id, start_time, end_time, address, plan_status, is_del, update_time, create_time, remarks from t_inspection_plan
     </sql>
 
     <select id="selectTInspectionPlanList" parameterType="InspectionPlanForm" resultMap="TInspectionPlanResult">
         <include refid="selectTInspectionPlanVo"/>
         <where>
-            is_del = '0'
+            and is_del = '0'
             <if test="planName != null  and planName != ''"> and plan_name like concat('%', #{planName}, '%')</if>
             <if test="orderId != null  and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
             <if test="startTime1 != null "> and start_time &gt;= #{startTime1}</if>
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderId != null">order_id,</if>
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
+            <if test="address != null">address,</if>
             <if test="planStatus != null">plan_status,</if>
             <if test="isDel != null">is_del,</if>
             <if test="updateTime != null">update_time,</if>
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderId != null">#{orderId},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
+            <if test="address != null">#{address},</if>
             <if test="planStatus != null">#{planStatus},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -74,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderId != null">order_id = #{orderId},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="address != null">address = #{address},</if>
             <if test="planStatus != null">plan_status = #{planStatus},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>