Merge branch 'feature_mvp616_wangl' into 'develop'

Feature mvp616 wangl

See merge request !51

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/EngineerController.java

@@ -2,12 +2,12 @@ package com.alibaba.cloud.integration.order.controller;
 
 
 import com.alibaba.cloud.integration.common.BusinessException;
 import com.alibaba.cloud.integration.common.BusinessException;
 import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.common.Result;
+import com.alibaba.cloud.integration.order.dto.EngineerBusinessUpdateReqDTO;
+import com.alibaba.cloud.integration.order.dto.EngineerSkillUpdateReqDTO;
 import com.alibaba.cloud.integration.order.service.EngineerService;
 import com.alibaba.cloud.integration.order.service.EngineerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
-import java.util.List;
-
 @RestController
 @RestController
 @RequestMapping("/pea-order")
 @RequestMapping("/pea-order")
 public class EngineerController {
 public class EngineerController {
@@ -16,7 +16,7 @@ public class EngineerController {
 	private EngineerService engineerService;
 	private EngineerService engineerService;
 
 
 	@GetMapping("/engineer/info/list")
 	@GetMapping("/engineer/info/list")
-	public Result<?> getEngineerInfoList(@RequestParam long page, @RequestParam long size){
+	public Result<?> getEngineerInfoList(@RequestParam long page, @RequestParam long size) {
 		// 获取工程师基础信息列表
 		// 获取工程师基础信息列表
 		Result<?> res = null;
 		Result<?> res = null;
 		try {
 		try {
@@ -24,7 +24,7 @@ public class EngineerController {
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
 			Result.failed(e.getMessage());
 			Result.failed(e.getMessage());
 		}
 		}
- 		return res;
+		return res;
 	}
 	}
 
 
 	@GetMapping("/engineer/skill/list")
 	@GetMapping("/engineer/skill/list")
@@ -40,10 +40,10 @@ public class EngineerController {
 	}
 	}
 
 
 	@PostMapping("/engineer/skill/update")
 	@PostMapping("/engineer/skill/update")
-	public Result<?> engineerSkillUpdate(@RequestBody String engineerCode, @RequestBody List<String> categoryIds) {
+	public Result<?> engineerSkillUpdate(@RequestBody EngineerSkillUpdateReqDTO req) {
 		// 获取工程师技能信息修改
 		// 获取工程师技能信息修改
 		try {
 		try {
-			engineerService.engineerSkillUpdate(engineerCode, categoryIds);
+			engineerService.engineerSkillUpdate(req.getEngineerCode(), req.getCategoryIds());
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
 			Result.failed(e.getMessage());
 			Result.failed(e.getMessage());
 		}
 		}
@@ -63,12 +63,13 @@ public class EngineerController {
 	}
 	}
 
 
 	@PostMapping("/engineer/business/update")
 	@PostMapping("/engineer/business/update")
-	public Result<?> engineerBusinessUpdate(@RequestBody String engineerCode, @RequestBody Integer maxNum,
-											@RequestBody Integer maxMinute, @RequestBody String departure, @RequestBody String priority) {
+	public Result<?> engineerBusinessUpdate(@RequestBody EngineerBusinessUpdateReqDTO req) {
 		// 技术员业务属性配置更新
 		// 技术员业务属性配置更新
 		Result<?> res = null;
 		Result<?> res = null;
 		try {
 		try {
-			res = engineerService.engineerBusinessUpdate(engineerCode, maxNum, maxMinute, departure, priority);
+			res = engineerService.engineerBusinessUpdate(
+					req.getEngineerCode(), req.getMaxNum(), req.getMaxMinute(),
+					req.getDeparture(), req.getPriority());
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
 			Result.failed(e.getMessage());
 			Result.failed(e.getMessage());
 		}
 		}

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/EngineerBusinessUpdateReqDTO.java

+package com.alibaba.cloud.integration.order.dto;
+
+import lombok.Data;
+
+@Data
+public class EngineerBusinessUpdateReqDTO {
+	private String engineerCode;
+	private Integer maxNum;
+	private Integer maxMinute;
+	private String departure;
+	private String priority;
+}
\ No newline at end of file

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/EngineerSkillUpdateReqDTO.java

+package com.alibaba.cloud.integration.order.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EngineerSkillUpdateReqDTO {
+	private String engineerCode;
+	private List<String> categoryIds;
+}