挂起其他说明

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtRepairOrder.java

@@ -158,7 +158,10 @@ public class GxtRepairOrder extends BaseEntity
 
     /** 挂起说明 */
     private String suspendDescription;
-
+    
+    /** 挂起其他说明 */
+    private String suspendExplain;
+    
     /** 审批状态 */
     private String approvalStatus;
 
@@ -605,6 +608,14 @@ public class GxtRepairOrder extends BaseEntity
         this.suspendDescription = suspendDescription;
     }
 
+    public String getSuspendExplain() {
+        return suspendExplain;
+    }
+
+    public void setSuspendExplain(String suspendExplain) {
+        this.suspendExplain = suspendExplain;
+    }
+
     public String getApprovalStatus() {
         return approvalStatus;
     }

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtWorkOrder.java

@@ -139,7 +139,10 @@ public class GxtWorkOrder extends BaseEntity
 
     /** 挂起原因 */
     private String suspendReason;
-
+    
+    /** 挂起其他说明 */
+    private String suspendExplain;
+    
     /** 挂起时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date suspendTime;
@@ -554,6 +557,14 @@ public class GxtWorkOrder extends BaseEntity
     {
         return suspendReason;
     }
+    
+    public String getSuspendExplain() {
+        return suspendExplain;
+    }
+    
+    public void setSuspendExplain(String suspendExplain) {
+        this.suspendExplain = suspendExplain;
+    }
 
     public void setSuspendTime(Date suspendTime)
     {

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtWorkOrderServiceImpl.java

@@ -543,6 +543,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         order.setSuspendReason(gxtWorkOrder.getSuspendReason());
         order.setSuspendTime(DateUtils.getNowDate());
         order.setWorkOrderStatus("to_approve");
+        order.setSuspendExplain(gxtWorkOrder.getSuspendExplain());
         order.setUpdateTime(DateUtils.getNowDate());
         order.setUpdateBy(SecurityUtils.getUsername());
 

ygtx-gxt/src/main/resources/mapper/gxt/GxtRepairOrderMapper.xml

@@ -77,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="appealUserId"    column="appeal_user_id"    />
         <result property="appealTime"    column="appeal_time"    />
         <result property="appealReason"    column="appeal_reason"    />
+        <result property="suspendExplain"    column="suspend_explain"    />
     </resultMap>
 
     <resultMap type="GxtRepairOrder" id="GxtRepairOrderWithPersonResult" extends="GxtRepairOrderResult">
@@ -130,8 +131,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
-        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        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>
@@ -292,6 +292,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appealUserId != null">appeal_user_id,</if>
             <if test="appealTime != null">appeal_time,</if>
             <if test="appealReason != null and appealReason != ''">appeal_reason,</if>
+            <if test="suspendExplain != null and suspendExplain != ''">suspend_explain,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workOrderProjectNo != null and workOrderProjectNo != ''">#{workOrderProjectNo},</if>
@@ -365,6 +366,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appealUserId != null">#{appealUserId},</if>
             <if test="appealTime != null">#{appealTime},</if>
             <if test="appealReason != null and appealReason != ''">#{appealReason},</if>
+            <if test="suspendExplain != null and suspendExplain != ''">#{suspendExplain},</if>
          </trim>
     </insert>
 
@@ -442,6 +444,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appealUserId != null">appeal_user_id = #{appealUserId},</if>
             <if test="appealTime != null">appeal_time = #{appealTime},</if>
             <if test="appealReason != null and appealReason != ''">appeal_reason = #{appealReason},</if>
+            <if test="suspendExplain != null and suspendExplain != ''">suspend_explain = #{suspendExplain},</if>
         </trim>
         where id = #{id}
     </update>

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="appealUserName"    column="appeal_user_name"    />
         <result property="appealTime"    column="appeal_time"    />
         <result property="appealReason"    column="appeal_reason"    />
+        <result property="suspendExplain"    column="suspend_explain"    />
     </resultMap>
 
     <resultMap type="GxtOrderData" id="GxtOrderDataResult">
@@ -116,7 +117,7 @@ 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, appeal_user_id, appeal_user_name, appeal_time, appeal_reason
+               wwry_num, wlry_num, info_entry, lost_power, work_permit_num, appeal_user_id, appeal_user_name, appeal_time, appeal_reason, suspend_explain
         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
@@ -250,6 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appealUserName != null and appealUserName != ''">appeal_user_name,</if>
             <if test="appealTime != null">appeal_time,</if>
             <if test="appealReason != null and appealReason != ''">appeal_reason,</if>
+            <if test="suspendExplain != null and suspendExplain != ''">suspend_explain,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workOrderProjectNo != null and workOrderProjectNo != ''">#{workOrderProjectNo},</if>
@@ -322,6 +324,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appealUserName != null and appealUserName != ''">#{appealUserName},</if>
             <if test="appealTime != null">#{appealTime},</if>
             <if test="appealReason != null and appealReason != ''">#{appealReason},</if>
+            <if test="suspendExplain != null and suspendExplain != ''">#{suspendExplain},</if>
          </trim>
     </insert>
 
@@ -418,6 +421,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appealUserName != null and appealUserName != ''">appeal_user_name = #{appealUserName},</if>
             <if test="appealTime != null">appeal_time = #{appealTime},</if>
             <if test="appealReason != null and appealReason != ''">appeal_reason = #{appealReason},</if>
+            <if test="suspendExplain != null and suspendExplain != ''">suspend_explain = #{suspendExplain},</if>
         </trim>
         where id = #{id}
     </update>

ygtx-ui/src/components/gxtOrder/suspend.vue

@@ -18,7 +18,7 @@
             <el-input v-model="formData.content" type="textarea" :rows="3" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="挂起原因" prop="suspendReason">
             <el-select v-model="formData.suspendReason" placeholder="请选择挂起原因" style="width: 100%">
               <el-option
@@ -30,6 +30,18 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="挂起其他说明" prop="suspendExplain">
+            <el-input
+              v-model="formData.suspendExplain"
+              type="textarea"
+              :rows="3"
+              placeholder="请输入挂起其他说明（选填）"
+              maxlength="1000"
+              show-word-limit
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>

ygtx-ui/src/components/repairOrder/suspend.vue

@@ -18,7 +18,7 @@
             <el-input v-model="formData.faultBarcode" type="textarea" :rows="3" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="挂起原因" prop="suspendReason">
             <el-select v-model="formData.suspendReason" placeholder="请选择挂起原因" style="width: 100%">
               <el-option
@@ -30,6 +30,18 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="挂起其他说明" prop="suspendExplain">
+            <el-input
+              v-model="formData.suspendExplain"
+              type="textarea"
+              :rows="3"
+              placeholder="请输入挂起其他说明（选填）"
+              maxlength="1000"
+              show-word-limit
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>