ouyj 2 週間 前
コミット
c0f06ba71d

+ 12 - 0
ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtRepairOrder.java

@@ -290,6 +290,9 @@ public class GxtRepairOrder extends BaseEntity
     /** 接单退回说明 */
     private String acceptReturnReason;
 
+    /** 超停状态(0-未超停,1-已超停未处理,2-已超停已处理) */
+    private Integer overStopStatus;
+
     private String monthPeriod;
 
     private String leader;
@@ -1005,6 +1008,14 @@ public class GxtRepairOrder extends BaseEntity
         this.acceptReturnReason = acceptReturnReason;
     }
 
+    public Integer getOverStopStatus() {
+        return overStopStatus;
+    }
+
+    public void setOverStopStatus(Integer overStopStatus) {
+        this.overStopStatus = overStopStatus;
+    }
+
     public String getMonthPeriod() {
         return monthPeriod;
     }
@@ -1094,6 +1105,7 @@ public class GxtRepairOrder extends BaseEntity
             .append("invalidReason", getInvalidReason())
             .append("appealReason", getAppealReason())
             .append("extraWork", getExtraWork())
+            .append("overStopStatus", getOverStopStatus())
             .toString();
     }
 }

+ 12 - 0
ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtWorkOrder.java

@@ -294,6 +294,9 @@ public class GxtWorkOrder extends BaseEntity
     /** 评分退回理由 */
     private String scoreReturnReason;
 
+    /** 超停状态(0-未超停,1-已超停未处理,2-已超停已处理) */
+    private Integer overStopStatus;
+
     private String monthPeriod;
 
     private String leader;
@@ -973,6 +976,14 @@ public class GxtWorkOrder extends BaseEntity
         this.scoreReturnReason = scoreReturnReason;
     }
 
+    public Integer getOverStopStatus() {
+        return overStopStatus;
+    }
+
+    public void setOverStopStatus(Integer overStopStatus) {
+        this.overStopStatus = overStopStatus;
+    }
+
     public String getMonthPeriod() {
         return monthPeriod;
     }
@@ -1095,6 +1106,7 @@ public class GxtWorkOrder extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .append("invalidReason", getInvalidReason())
+            .append("overStopStatus", getOverStopStatus())
             .toString();
     }
 

+ 6 - 1
ygtx-gxt/src/main/resources/mapper/gxt/GxtRepairOrderMapper.xml

@@ -85,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="acceptReturnType"    column="accept_return_type"    />
         <result property="acceptReturnReason"    column="accept_return_reason"    />
         <result property="scoreReturnReason"    column="score_return_reason"    />
+        <result property="overStopStatus"    column="over_stop_status"    />
         <result property="leader"    column="leader"    />
         <result property="userId"    column="user_id" />
     </resultMap>
@@ -152,7 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                review_content, maintenance_type, occur_time, fault_barcode, suspend_reason, suspend_description, approval_status,
                rejection_reason, modify_reason, finalization_remark, related_order_code, related_order_content, mis_order_no, restart_time,
                scoring_status, pcs_station_pid, attachment_urls, review_score_num, final_coefficient, order_type, repair_method, reset_method, invalid_reason, return_type, return_reason, feedback_reason, confirm_status,
-                wwry_num, wlry_num, work_area, info_entry, real_failure_reason, lost_power, work_permit_num, finalize_method, appeal_user_name, appeal_user_id, appeal_time, appeal_reason, suspend_explain, order_entry_type, order_attachment, extra_work, accept_return_type, accept_return_reason, score_return_reason from gxt_repair_order t
+                wwry_num, wlry_num, work_area, info_entry, real_failure_reason, lost_power, work_permit_num, finalize_method, appeal_user_name, appeal_user_id, appeal_time, appeal_reason, suspend_explain, order_entry_type, order_attachment, extra_work, accept_return_type, accept_return_reason, score_return_reason, over_stop_status
+        from gxt_repair_order t
         left join sys_user u on u.user_name = t.create_by
         left join sys_dept d on u.dept_id = d.dept_id
     </sql>
@@ -344,6 +346,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="acceptReturnReason != null and acceptReturnReason != ''">accept_return_reason,</if>
             <if test="scoreReturnReason != null and scoreReturnReason != ''">score_return_reason,</if>
             <if test="finalizeMethod != null and finalizeMethod != ''">finalize_method,</if>
+            <if test="overStopStatus != null">over_stop_status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workOrderProjectNo != null and workOrderProjectNo != ''">#{workOrderProjectNo},</if>
@@ -425,6 +428,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="acceptReturnReason != null and acceptReturnReason != ''">#{acceptReturnReason},</if>
             <if test="scoreReturnReason != null and scoreReturnReason != ''">#{scoreReturnReason},</if>
             <if test="finalizeMethod != null and finalizeMethod != ''">#{finalizeMethod},</if>
+            <if test="overStopStatus != null">#{overStopStatus},</if>
         </trim>
     </insert>
 
@@ -514,6 +518,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="scoreReturnReason != null and scoreReturnReason != ''">score_return_reason = #{scoreReturnReason},</if>
             <if test="finalizeMethod != null and finalizeMethod != ''">finalize_method = #{finalizeMethod},</if>
+            <if test="overStopStatus != null">over_stop_status = #{overStopStatus},</if>
         </trim>
         where id = #{id}
     </update>

+ 6 - 1
ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -82,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="appealReason"    column="appeal_reason"    />
         <result property="suspendExplain"    column="suspend_explain"    />
         <result property="scoreReturnReason"    column="score_return_reason"    />
+        <result property="overStopStatus"    column="over_stop_status"    />
         <result property="leader"    column="leader"    />
         <result property="runningDays"    column="running_days" />
         <result property="stopDays"    column="stop_days" />
@@ -126,7 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                content, real_content, fault_code, fault_desc, order_type, priority_type, score, review_content, issuer_name,
                permitter_name, scoring_status, t.create_by, t.create_time, t.update_by, t.update_time, t.remark, t.attachment_urls,
                item_completion_factor, item_completion_factor_sum, review_score_num, final_coefficient, is_deferred, invalid_reason, feedback_reason, confirm_status,
-               wwry_num, wlry_num, info_entry, lost_power, work_permit_num, finalize_method, appeal_user_id, appeal_user_name, appeal_time, appeal_reason, suspend_explain, order_entry_type, score_return_reason
+               wwry_num, wlry_num, info_entry, lost_power, work_permit_num, finalize_method, appeal_user_id, appeal_user_name, appeal_time, appeal_reason, suspend_explain, order_entry_type, score_return_reason,
+               over_stop_status
         from gxt_work_order t
          left join sys_user u on u.user_name = t.create_by
          left join sys_dept d on u.dept_id = d.dept_id
@@ -309,6 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderEntryType != null and orderEntryType != ''">order_entry_type,</if>
             <if test="scoreReturnReason != null and scoreReturnReason != ''">score_return_reason,</if>
             <if test="finalizeMethod != null and finalizeMethod != ''">finalize_method,</if>
+            <if test="overStopStatus != null">over_stop_status,</if>
             </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workOrderProjectNo != null and workOrderProjectNo != ''">#{workOrderProjectNo},</if>
@@ -385,6 +388,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderEntryType != null and orderEntryType != ''">#{orderEntryType},</if>
             <if test="scoreReturnReason != null and scoreReturnReason != ''">#{scoreReturnReason},</if>
             <if test="finalizeMethod != null and finalizeMethod != ''">#{finalizeMethod},</if>
+            <if test="overStopStatus != null">#{overStopStatus},</if>
         </trim>
     </insert>
 
@@ -485,6 +489,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderEntryType != null and orderEntryType != ''">order_entry_type = #{orderEntryType},</if>
             <if test="scoreReturnReason != null and scoreReturnReason != ''">score_return_reason = #{scoreReturnReason},</if>
             <if test="finalizeMethod != null and finalizeMethod != ''">finalize_method = #{finalizeMethod},</if>
+            <if test="overStopStatus != null">over_stop_status = #{overStopStatus},</if>
         </trim>
         where id = #{id}
     </update>