APP维保结单

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/mobile/GxtMobileOrderController.java

@@ -441,4 +441,17 @@ public class GxtMobileOrderController extends BaseController
 
         return toAjax(result);
     }
+
+    /**
+     * 结单工单
+     */
+    @Log(title = "结单", businessType = BusinessType.UPDATE)
+    @ApiOperation("结单工单")
+    @PutMapping("/finish")
+    public AjaxResult finishOrder(@RequestBody GxtWorkOrder gxtWorkOrder)
+    {
+        int result = 0;
+        result = gxtWorkOrderService.completeWorkOrder(gxtWorkOrder);
+        return toAjax(result);
+    }
 }

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

@@ -243,6 +243,9 @@ public class OrderScoreInfo {
     /** 评分退回理由 */
     private String scoreReturnReason;
 
+    /** 工单录入类别（1默认，2补录工单） */
+    private String orderEntryType;
+
     public Integer getOrderType() {
         return orderType;
     }
@@ -828,4 +831,12 @@ public class OrderScoreInfo {
     public void setScoreReturnReason(String scoreReturnReason) {
         this.scoreReturnReason = scoreReturnReason;
     }
+
+    public String getOrderEntryType() {
+        return orderEntryType;
+    }
+
+    public void setOrderEntryType(String orderEntryType) {
+        this.orderEntryType = orderEntryType;
+    }
 }

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

@@ -918,7 +918,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
                     }
                 }
 
-                if (gxtWorkOrder.getWorkOrderFlowList().size() > 0) {
+                if (null != gxtWorkOrder.getWorkOrderFlowList() && gxtWorkOrder.getWorkOrderFlowList().size() > 0) {
                     GxtWorkOrderFlow  workOrderFlow = gxtWorkOrder.getWorkOrderFlowList().get(0);
                     gxtWorkOrderFlowMapper.updateGxtWorkOrderFlow(workOrderFlow);
                 }

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

@@ -62,6 +62,7 @@
         <result property="appealReason"    column="appeal_reason"    />
         <!-- 评分退回理由 -->
         <result property="scoreReturnReason"    column="score_return_reason"    />
+        <result property="orderEntryType"    column="order_entry_type"    />
     </resultMap>
 
     <select id="selectUnionOrderList" resultMap="OrderScoreInfoResult">
@@ -288,11 +289,12 @@
         confirm_status as confirm_status,
         create_time as create_time,
         update_time as update_time,
-        appeal_reason as appeal_reason
+        appeal_reason as appeal_reason,
+        null as order_entry_type
         FROM gxt_repair_order t
         <where>
             <if test="keyword != null and keyword != ''">
-                and (work_order_project_no like concat('%', #{keyword}, '%') or pcs_device_name like concat('%', #{keyword}, '%'))
+                and (work_order_project_no like concat('%', #{keyword}, '%') or pcs_device_name like concat('%', #{keyword}, '%') or mis_order_no like concat('%', #{keyword}, '%'))
             </if>
             <if test="repairOrder.workOrderProjectNo != null and repairOrder.workOrderProjectNo != ''"> and work_order_project_no = #{repairOrder.workOrderProjectNo}</if>
             <if test="repairOrder.workOrderStatus != null and repairOrder.workOrderStatus != ''"> and work_order_status in
@@ -384,11 +386,12 @@
         confirm_status as confirm_status,
         create_time as create_time,
         update_time as update_time,
-        null as appeal_reason
+        null as appeal_reason,
+        order_entry_type
         FROM gxt_work_order t
         <where>
             <if test="keyword != null and keyword != ''">
-                and (work_order_project_no like concat('%', #{keyword}, '%') or pcs_device_name like concat('%', #{keyword}, '%'))
+                and (work_order_project_no like concat('%', #{keyword}, '%') or pcs_device_name like concat('%', #{keyword}, '%') or mis_no like concat('%', #{keyword}, '%'))
             </if>
             <if test="workOrder.workOrderProjectNo != null and workOrder.workOrderProjectNo != ''"> and work_order_project_no = #{workOrder.workOrderProjectNo}</if>
             <if test="workOrder.workOrderStatus != null and workOrder.workOrderStatus != ''"> and work_order_status in