Merge branch 'dev_engineer_filter' into 'develop'

修改

See merge request !160

project-order/src/main/java/com/dituhui/pea/order/controller/EngineerController.java

@@ -20,11 +20,16 @@ public class EngineerController {
 	private EngineerService engineerService;
 
 	@GetMapping("/engineer/info/list")
-	public Result<?> getEngineerInfoList(@RequestParam long page, @RequestParam long size) {
+	public Result<?> getEngineerInfoList(@RequestParam String levelType,
+										 @RequestParam String levelValue,
+										 @RequestParam long page,
+										 @RequestParam long size,
+										 @RequestParam(required = false) String kind,
+										 @RequestParam(required = false) String key) {
 		// 获取工程师基础信息列表
 		Result<?> res = null;
 		try {
-			res = engineerService.getEngineerInfoList(page, size);
+			res = engineerService.getEngineerInfoList(levelType, levelValue, page, size, kind, key);
 		} catch (BusinessException e) {
 			return Result.failed(e.getMessage());
 		}
@@ -44,11 +49,16 @@ public class EngineerController {
 	}
 
 	@GetMapping("/engineer/skill/list")
-	public Result<?> getEngineerSkillList(@RequestParam long page, @RequestParam long size) {
+	public Result<?> getEngineerSkillList(@RequestParam String levelType,
+										  @RequestParam String levelValue,
+										  @RequestParam long page,
+										  @RequestParam long size,
+										  @RequestParam(required = false) String kind,
+										  @RequestParam(required = false) String key) {
 		// 获取工程师技能信息列表
 		Result<?> res = null;
 		try {
-			res = engineerService.getEngineerSkillList(page, size);
+			res = engineerService.getEngineerSkillList(levelType, levelValue, page, size, kind, key);
 		} catch (BusinessException e) {
 			return Result.failed(e.getMessage());
 		}
@@ -79,11 +89,16 @@ public class EngineerController {
 	}
 
 	@GetMapping("/engineer/business/list")
-	public Result<?> getEngineerBusinessList(@RequestParam long page, @RequestParam long size) {
+	public Result<?> getEngineerBusinessList(@RequestParam String levelType,
+											 @RequestParam String levelValue,
+											 @RequestParam long page,
+											 @RequestParam long size,
+											 @RequestParam(required = false) String kind,
+											 @RequestParam(required = false) String key) {
 		// 技术员业务属性配置列表
 		Result<?> res = null;
 		try {
-			res = engineerService.getEngineerBusinessList(page, size);
+			res = engineerService.getEngineerBusinessList(levelType, levelValue, page, size, kind, key);
 		} catch (BusinessException e) {
 			return Result.failed(e.getMessage());
 		}

project-order/src/main/java/com/dituhui/pea/order/service/EngineerService.java

@@ -8,16 +8,16 @@ import java.util.List;
 public interface EngineerService {
 
 	// 获取公司列表
-	Result<?> getEngineerInfoList(long page, long size);
+	Result<?> getEngineerInfoList(String levelType, String levelValue, long page, long size, String kind, String key);
 	Result<?> getEngineerInfoDetail(String engineerCode);
 
 	// 获取工程师技能列表
-	Result<?> getEngineerSkillList(long page, long size);
+	Result<?> getEngineerSkillList(String levelType, String levelValue, long page, long size, String kind, String key);
 	Result<?> getEngineerSkillDetail(String engineerCode);
 	Result<?> engineerSkillUpdate(String engineerCode, List<String> categoryIds);
 
 	// 工程师业务属性配置列表
-	Result<?> getEngineerBusinessList(long page, long size);
+	Result<?> getEngineerBusinessList(String levelType, String levelValue, long page, long size, String kind, String key);
 	Result<?> getEngineerBusinessDetail(String engineerCode);
 
 	// 技术员业务属性配置修改