Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

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

@@ -32,10 +32,13 @@ public class TWorkOrder extends BaseEntity
     @Excel(name = "工单名称")
     private String orderName;
 
-    /** 工单状态（0未接收，1已接收，2进行中，3已反馈，4已归档） */
+    /** 工单状态（0未接收，1已接收，2已反馈，3已归档） */
     @Excel(name = "工单状态", readConverterExp = "0未接收，1已接收，2进行中，3已反馈，4已归档")
     private String orderStatus;
 
+    /** 归档信息 */
+    private String archiving;
+
     /** 指定执行人员（巡检员id） */
     @Excel(name = "指定执行人员", readConverterExp = "巡检员id")
     private Long appointInspector;
@@ -67,6 +70,7 @@ public class TWorkOrder extends BaseEntity
     {
         return orderId;
     }
+
     public void setOrderType(String orderType) 
     {
         this.orderType = orderType;
@@ -94,6 +98,7 @@ public class TWorkOrder extends BaseEntity
     {
         return orderName;
     }
+
     public void setOrderStatus(String orderStatus) 
     {
         this.orderStatus = orderStatus;
@@ -103,6 +108,15 @@ public class TWorkOrder extends BaseEntity
     {
         return orderStatus;
     }
+
+    public String getArchiving() {
+        return archiving;
+    }
+
+    public void setArchiving(String archiving) {
+        this.archiving = archiving;
+    }
+
     public void setAppointInspector(Long appointInspector)
     {
         this.appointInspector = appointInspector;
@@ -112,15 +126,17 @@ public class TWorkOrder extends BaseEntity
     {
         return appointInspector;
     }
+
     public void setAllotTime(Date allotTime) 
     {
         this.allotTime = allotTime;
     }
 
-    public Date getAllotTime() 
+    public Date getAllotTime()
     {
         return allotTime;
     }
+
     public void setActualInspector(Long actualInspector)
     {
         this.actualInspector = actualInspector;
@@ -130,6 +146,7 @@ public class TWorkOrder extends BaseEntity
     {
         return actualInspector;
     }
+
     public void setActualTime(Date actualTime) 
     {
         this.actualTime = actualTime;
@@ -139,6 +156,7 @@ public class TWorkOrder extends BaseEntity
     {
         return actualTime;
     }
+
     public void setRemarks(String remarks) 
     {
         this.remarks = remarks;

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="resourceId"    column="resource_id"    />
         <result property="orderName"    column="order_name"    />
         <result property="orderStatus"    column="order_status"    />
+        <result property="archiving"    column="archiving"    />
         <result property="updateTime"    column="update_time"    />
         <result property="appointInspector"    column="appoint_inspector"    />
         <result property="allotTime"    column="allot_time"    />
@@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <sql id="selectTWorkOrderVo">
-        select t.order_id, t.order_type, t.resource_id, t.order_name, t.order_status, t.update_time, t.appoint_inspector, t.allot_time, t.actual_inspector, t.actual_time, t.remarks
+        select t.order_id, t.order_type, t.resource_id, t.order_name, t.order_status, t.archiving, t.update_time, t.appoint_inspector, t.allot_time, t.actual_inspector, t.actual_time, t.remarks
         from t_work_order t
         left join sys_user s on t.appoint_inspector = s.user_id
     </sql>
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="resourceId != null">resource_id,</if>
             <if test="orderName != null">order_name,</if>
             <if test="orderStatus != null">order_status,</if>
+            <if test="archiving != null">archiving,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="appointInspector != null">appoint_inspector,</if>
             <if test="allotTime != null">allot_time,</if>
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="resourceId != null">#{resourceId},</if>
             <if test="orderName != null">#{orderName},</if>
             <if test="orderStatus != null">#{orderStatus},</if>
+            <if test="archiving != null">#{archiving},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="appointInspector != null">#{appointInspector},</if>
             <if test="allotTime != null">#{allotTime},</if>
@@ -83,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderType != null">order_type = #{orderType},</if>
             <if test="orderName != null">order_name = #{orderName},</if>
             <if test="orderStatus != null">order_status = #{orderStatus},</if>
+            <if test="archiving != null">archiving = #{archiving},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="appointInspector != null">appoint_inspector = #{appointInspector},</if>
             <if test="allotTime != null">allot_time = #{allotTime},</if>