Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/OperationManagerMain.java

@@ -13,6 +13,5 @@ public class OperationManagerMain {
     public static void main(String[] args) {
         ApplicationContext context = SpringApplication.run(OperationManagerMain.class, args);
 
-
     }
 }

operation_manager/src/main/java/com/huaxu/client/UserCenterClient.java

@@ -4,7 +4,6 @@ import com.huaxu.config.FeignConfig;
 
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.task.entity.UserEntity;
-import lombok.NoArgsConstructor;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +27,4 @@ public interface UserCenterClient {
 
     @GetMapping("/user/findUserIdsForOrg")
     List<Long> findUserIdsForOrg();
-
-
 }

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -379,6 +379,7 @@ public class WorkOrderManageController {
             @ApiParam(value = "工单类型编号", required = true) @RequestParam(required = false) Integer orderTypeId,
             @ApiParam(value = "工单类型名称", required = true) @RequestParam(required = true) String orderType,
             @ApiParam(value = "紧急程度", required = true) @RequestParam(required = true) String urgency,
+            @ApiParam(value = "时限", required = true) @RequestParam(required = true) String dateLimit,
             @ApiParam(value = "接单人编号", required = true) @RequestParam(required = true) String orderUserId){
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManage workOrderManage = workOrderManageService.selectByPrimaryKey(id);
@@ -414,6 +415,7 @@ public class WorkOrderManageController {
         workOrderManage.setOrderTypeId(orderTypeId);//工单类型ID
         workOrderManage.setUrgency(urgency);//紧急程度
         workOrderManage.setOrderUserId(orderUserId);//接单人ID
+        workOrderManage.setDateLimit(dateLimit);
         if(loginUser.getId() != null) {
             workOrderManage.setUpdateBy(String.valueOf(loginUser.getId()));
             workOrderManage.setSendBy(String.valueOf(loginUser.getId()));//派单人