维修工单复运调整

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

@@ -924,12 +924,16 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
         /*if (gxtRepairOrder.getScore() != null) {
             gxtRepairOrder.setWorkOrderStatus("to_archive");
         }*/
-        // 检查是否终评
-        if ("to_archive".equals(oldOrder.getScoringStatus()))
-        {
-            // 已终评：工单状态改变为已归档
+        if(StringUtils.isNotEmpty(gxtRepairOrder.getRepairMethod()) && "2".equals(gxtRepairOrder.getRepairMethod())){
             gxtRepairOrder.setWorkOrderStatus("archived");
-            gxtRepairOrder.setScoringStatus("archived");
+        }else{
+            // 检查是否终评
+            if ("to_archive".equals(oldOrder.getScoringStatus()))
+            {
+                // 已终评：工单状态改变为已归档
+                gxtRepairOrder.setWorkOrderStatus("archived");
+                gxtRepairOrder.setScoringStatus("archived");
+            }
         }
         gxtRepairOrder.setUpdateBy(SecurityUtils.getUsername());
         gxtRepairOrder.setUpdateTime(DateUtils.getNowDate());
@@ -949,18 +953,21 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
             flow.setActionRemark("设备恢复运行");
             gxtRepairOrderFlowService.insertGxtRepairOrderFlow(flow);
             //if (gxtRepairOrder.getScore() != null) {
+
+            //}
+            if("archived".equals(gxtRepairOrder.getWorkOrderStatus())){
                 GxtRepairOrderFlow flowArchive = new GxtRepairOrderFlow();
                 flowArchive.setOrderId(gxtRepairOrder.getId());
                 flowArchive.setOrderCode(gxtRepairOrder.getWorkOrderProjectNo());
-                flowArchive.setActionType("to_archive");
+                flowArchive.setActionType("archive");
                 flowArchive.setFromStatus(oldOrder.getWorkOrderStatus());
                 flowArchive.setToStatus(gxtRepairOrder.getWorkOrderStatus());
                 flowArchive.setOperatorId(SecurityUtils.getUserId());
                 flowArchive.setOperatorName(nickName);
                 flowArchive.setActionTime(DateUtils.getNowDate());
-                flowArchive.setActionRemark("工单待归档");
+                flowArchive.setActionRemark("工单归档");
                 gxtRepairOrderFlowService.insertGxtRepairOrderFlow(flowArchive);
-            //}
+            }
         }
         return result;
     }