APP恢复

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

@@ -9,6 +9,7 @@ import com.ygtx.gxt.domain.*;
 import com.ygtx.gxt.service.IGxtOrderScoreService;
 import com.ygtx.gxt.service.IGxtRepairOrderService;
 import com.ygtx.gxt.service.IGxtWorkOrderService;
+import com.ygtx.gxt.service.impl.GxtOrderScoreServiceImpl;
 import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -145,9 +146,6 @@ public class GxtMobileOrderController extends BaseController
         } else {
             GxtWorkOrder gxtWorkOrder = new GxtWorkOrder();
             gxtWorkOrder.setId(gxtRepairOrder.getId());
-            gxtWorkOrder.setWorkOrderProjectNo(gxtRepairOrder.getWorkOrderProjectNo());
-            gxtWorkOrder.setTeamLeaderId(gxtRepairOrder.getTeamLeaderId());
-            gxtWorkOrder.setTeamLeaderName(gxtRepairOrder.getTeamLeaderName());
             gxtWorkOrder.setWorkOrderStatus(gxtRepairOrder.getWorkOrderStatus());
             result = gxtWorkOrderService.resumeWorkOrder(gxtWorkOrder);
         }

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

@@ -152,6 +152,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
 
         gxtWorkOrder.setOrderType(2L);
         gxtWorkOrder.setCreateTime(DateUtils.getNowDate());
+        gxtWorkOrder.setCreateBy(SecurityUtils.getUsername());
         int result = gxtWorkOrderMapper.insertGxtWorkOrder(gxtWorkOrder);
         String actionType = null;
         if ("to_issue".equals(gxtWorkOrder.getWorkOrderStatus())) {
@@ -204,6 +205,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         }
 
         gxtWorkOrder.setUpdateTime(DateUtils.getNowDate());
+        gxtWorkOrder.setUpdateBy(SecurityUtils.getUsername());
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(gxtWorkOrder);
         String actionType = null;
         actionType = "assign";
@@ -278,6 +280,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         order.setAssignUserName(SecurityUtils.getUsername());
         order.setWorkOrderStatus("assigned");
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -327,6 +330,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         order.setAcceptUserName(SecurityUtils.getUsername());
         order.setWorkOrderStatus("accepted");
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -377,6 +381,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         order.setWorkGroupMemberName(workGroupMemberName);
         order.setWorkOrderStatus("assigned");
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -426,6 +431,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         order.setAcceptUserName(SecurityUtils.getUsername());
         order.setWorkOrderStatus("processing");
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -518,6 +524,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         order.setSuspendTime(DateUtils.getNowDate());
         order.setWorkOrderStatus("to_approve");
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -577,6 +584,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
 
         order.setWorkOrderStatus(newStatus);
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -623,6 +631,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         order.setRestartTime(DateUtils.getNowDate());
         order.setWorkOrderStatus("processing");
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -668,6 +677,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
             order.setWorkOrderStatus("to_finish");
             order.setRealEndTime(DateUtils.getNowDate());
             order.setUpdateTime(DateUtils.getNowDate());
+            order.setUpdateBy(SecurityUtils.getUsername());
 
             int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -693,6 +703,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
             order.setCompleteTime(DateUtils.getNowDate());
             order.setRealContent(gxtWorkOrder.getRealContent());
             order.setUpdateTime(DateUtils.getNowDate());
+            order.setUpdateBy(SecurityUtils.getUsername());
             order.setInspectionType(gxtWorkOrder.getInspectionType());
             order.setAttachmentUrls(gxtWorkOrder.getAttachmentUrls());
             order.setWorkGroupMemberName(gxtWorkOrder.getWorkGroupMemberName());
@@ -775,6 +786,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
 
             String oldStatus = order.getWorkOrderStatus();
             order.setUpdateTime(DateUtils.getNowDate());
+            order.setUpdateBy(SecurityUtils.getUsername());
             order.setScore(gxtWorkOrder.getScore());
             order.setReviewContent(gxtWorkOrder.getReviewContent());
 
@@ -806,6 +818,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
             String oldStatus = order.getWorkOrderStatus();
             order.setRestartTime(gxtWorkOrder.getRestartTime());
             order.setUpdateTime(DateUtils.getNowDate());
+            order.setUpdateBy(SecurityUtils.getUsername());
             // 检查是否终评
             if ("to_archive".equals(order.getScoringStatus()))
             {
@@ -870,6 +883,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         order.setAcceptUserName(nickName);
         order.setWorkOrderStatus(gxtWorkOrder.getWorkOrderStatus());
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
         order.setTeamLeaderId(gxtWorkOrder.getTeamLeaderId());
         order.setTeamLeaderName(gxtWorkOrder.getTeamLeaderName());
 
@@ -956,6 +970,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         // 更新工单信息
         order.setWorkOrderStatus("processing");
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -999,6 +1014,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         order.setPauseReason(gxtWorkOrder.getPauseReason());
         order.setWorkOrderStatus("paused");
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -1037,6 +1053,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         // 更新工单信息
         order.setWorkOrderStatus(gxtWorkOrder.getWorkOrderStatus());
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setUpdateBy(SecurityUtils.getUsername());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);