|
|
@@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="appealTime" column="appeal_time" />
|
|
|
<result property="appealReason" column="appeal_reason" />
|
|
|
<result property="suspendExplain" column="suspend_explain" />
|
|
|
+ <result property="orderAttachment" column="order_attachment" />
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap type="GxtRepairOrder" id="GxtRepairOrderWithPersonResult" extends="GxtRepairOrderResult">
|
|
|
@@ -138,7 +139,7 @@ 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, appeal_user_name, appeal_user_id, appeal_time, appeal_reason, suspend_explain, order_entry_type from gxt_repair_order t
|
|
|
+ wwry_num, wlry_num, work_area, info_entry, real_failure_reason, lost_power, work_permit_num, appeal_user_name, appeal_user_id, appeal_time, appeal_reason, suspend_explain, order_entry_type, order_attachment 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>
|
|
|
@@ -303,6 +304,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="appealReason != null and appealReason != ''">appeal_reason,</if>
|
|
|
<if test="suspendExplain != null and suspendExplain != ''">suspend_explain,</if>
|
|
|
<if test="orderEntryType != null and orderEntryType != ''">order_entry_type,</if>
|
|
|
+ <if test="orderAttachment != null and orderAttachment != ''">order_attachment,</if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="workOrderProjectNo != null and workOrderProjectNo != ''">#{workOrderProjectNo},</if>
|
|
|
@@ -378,6 +380,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="appealReason != null and appealReason != ''">#{appealReason},</if>
|
|
|
<if test="suspendExplain != null and suspendExplain != ''">#{suspendExplain},</if>
|
|
|
<if test="orderEntryType != null and orderEntryType != ''">#{orderEntryType},</if>
|
|
|
+ <if test="orderAttachment != null and orderAttachment != ''">#{orderAttachment},</if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
|
|
|
@@ -457,6 +460,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="appealReason != null and appealReason != ''">appeal_reason = #{appealReason},</if>
|
|
|
<if test="suspendExplain != null and suspendExplain != ''">suspend_explain = #{suspendExplain},</if>
|
|
|
<if test="orderEntryType != null and orderEntryType != ''">order_entry_type = #{orderEntryType},</if>
|
|
|
+ <if test="orderAttachment != null and orderAttachment != ''">order_attachment = #{orderAttachment},</if>
|
|
|
</trim>
|
|
|
where id = #{id}
|
|
|
</update>
|
|
|
@@ -598,6 +602,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
t1.remark,
|
|
|
t1.return_type,
|
|
|
t1.return_reason,
|
|
|
+ t1.order_attachment,
|
|
|
t2.id as person_id,
|
|
|
t2.user_id as person_user_id,
|
|
|
t2.nick_name as person_nick_name,
|