Merge branch 'feature_mvp616_wangl' into 'develop'

Feature mvp616 wangl

See merge request !65

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

@@ -27,6 +27,18 @@ public class EngineerController {
 		return res;
 		return res;
 	}
 	}
 
 
+	@GetMapping("/engineer/info/detail")
+	public Result<?> getEngineerInfoDetail(@RequestParam String engineerCode) {
+		// 获取工程师基础信息列表
+		Result<?> res = null;
+		try {
+			res = engineerService.getEngineerInfoDetail(engineerCode);
+		} catch (BusinessException e) {
+			Result.failed(e.getMessage());
+		}
+		return res;
+	}
+
 	@GetMapping("/engineer/skill/list")
 	@GetMapping("/engineer/skill/list")
 	public Result<?> getEngineerSkillList(@RequestParam long page, @RequestParam long size) {
 	public Result<?> getEngineerSkillList(@RequestParam long page, @RequestParam long size) {
 		// 获取工程师技能信息列表
 		// 获取工程师技能信息列表
@@ -39,6 +51,18 @@ public class EngineerController {
 		return res;
 		return res;
 	}
 	}
 
 
+	@GetMapping("/engineer/skill/detail")
+	public Result<?> getEngineerSkillDetail(@RequestParam String engineerCode) {
+		// 获取工程师技能信息列表
+		Result<?> res = null;
+		try {
+			res = engineerService.getEngineerSkillDetail(engineerCode);
+		} catch (BusinessException e) {
+			Result.failed(e.getMessage());
+		}
+		return res;
+	}
+
 	@PostMapping("/engineer/skill/update")
 	@PostMapping("/engineer/skill/update")
 	public Result<?> engineerSkillUpdate(@RequestBody EngineerSkillUpdateReqDTO req) {
 	public Result<?> engineerSkillUpdate(@RequestBody EngineerSkillUpdateReqDTO req) {
 		// 获取工程师技能信息修改
 		// 获取工程师技能信息修改
@@ -62,6 +86,18 @@ public class EngineerController {
 		return res;
 		return res;
 	}
 	}
 
 
+	@GetMapping("/engineer/business/detail")
+	public Result<?> getEngineerBusinessDetail(@RequestParam String engineerCode) {
+		// 技术员业务属性配置列表
+		Result<?> res = null;
+		try {
+			res = engineerService.getEngineerBusinessDetail(engineerCode);
+		} catch (BusinessException e) {
+			Result.failed(e.getMessage());
+		}
+		return res;
+	}
+
 	@PostMapping("/engineer/business/update")
 	@PostMapping("/engineer/business/update")
 	public Result<?> engineerBusinessUpdate(@RequestBody EngineerBusinessUpdateReqDTO req) {
 	public Result<?> engineerBusinessUpdate(@RequestBody EngineerBusinessUpdateReqDTO req) {
 		// 技术员业务属性配置更新
 		// 技术员业务属性配置更新

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

@@ -23,5 +23,8 @@ public class EngineerInfoListResp {
 		private String phone;
 		private String phone;
 		private String address;
 		private String address;
 		private String kind;
 		private String kind;
+		private List<String> tags;
+		private List<String> credentials;
+		private String grade;
 	}
 	}
 }
 }

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

@@ -12,8 +12,9 @@ public class OrderAppointmentListResp {
 	@Data
 	@Data
 	public static class OrderAppointment{
 	public static class OrderAppointment{
 		private String title;
 		private String title;
+		private String engineerCode;
 		private String expectTime;
 		private String expectTime;
-		private List<List<KV>> engineers;
+		private List<KV> items;
 		private List<KV> timelines;
 		private List<KV> timelines;
 	}
 	}
 }
 }

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/EngineerInfo.java

 package com.alibaba.cloud.integration.order.entity;
 package com.alibaba.cloud.integration.order.entity;
 
 
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
@@ -21,6 +22,7 @@ public class EngineerInfo {
 	private String vehicle;
 	private String vehicle;
 	private String vehicleNo;
 	private String vehicleNo;
 	private String beanStatus;
 	private String beanStatus;
+	private JsonNode tags;
 	private String memo;
 	private String memo;
 	private Timestamp createTime;
 	private Timestamp createTime;
 	private Timestamp updateTime;
 	private Timestamp updateTime;

project-order/src/main/java/com/alibaba/cloud/integration/order/service/EngineerService.java

@@ -8,13 +8,16 @@ public interface EngineerService {
 
 
 	// 获取公司列表
 	// 获取公司列表
 	Result<?> getEngineerInfoList(long page, long size);
 	Result<?> getEngineerInfoList(long page, long size);
+	Result<?> getEngineerInfoDetail(String engineerCode);
 
 
 	// 获取工程师技能列表
 	// 获取工程师技能列表
 	Result<?> getEngineerSkillList(long page, long size);
 	Result<?> getEngineerSkillList(long page, long size);
+	Result<?> getEngineerSkillDetail(String engineerCode);
 	Result<?> engineerSkillUpdate(String engineerCode, List<String> categoryIds);
 	Result<?> engineerSkillUpdate(String engineerCode, List<String> categoryIds);
 
 
 	// 工程师业务属性配置列表
 	// 工程师业务属性配置列表
 	Result<?> getEngineerBusinessList(long page, long size);
 	Result<?> getEngineerBusinessList(long page, long size);
+	Result<?> getEngineerBusinessDetail(String engineerCode);
 
 
 	// 技术员业务属性配置修改
 	// 技术员业务属性配置修改
 	Result<?> engineerBusinessUpdate(String engineerCode, Integer maxNum, Integer maxMutine, String departure, String priority);
 	Result<?> engineerBusinessUpdate(String engineerCode, Integer maxNum, Integer maxMutine, String departure, String priority);

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/EngineerServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.JsonNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,15 +41,13 @@ public class EngineerServiceImpl implements EngineerService {
 	@Override
 	@Override
 	public Result<?> getEngineerInfoList(long page, long size) {
 	public Result<?> getEngineerInfoList(long page, long size) {
 		// 查询工程师信息
 		// 查询工程师信息
-		IPage<EngineerInfo> pg = this.queryEngineerInfo(page, size);
+		IPage<EngineerInfo> pg = this.queryEngineerInfoIPage(page, size);
 
 
 		List<EngineerInfo> records = pg.getRecords();
 		List<EngineerInfo> records = pg.getRecords();
 
 
 		// 获取groupIds
 		// 获取groupIds
-		List<String> groupIds = new ArrayList<>();
-		for(EngineerInfo e: records){
-			groupIds.add(e.getGroupId());
-		}
+		List<String> groupIds = records.stream().map(EngineerInfo::getGroupId).collect(Collectors.toList());
+
 		// 获取Map<groupId, groupName>
 		// 获取Map<groupId, groupName>
 		HashMap<String, String> groupNames = this.queryGroupNames(groupIds);
 		HashMap<String, String> groupNames = this.queryGroupNames(groupIds);
 
 
@@ -63,12 +62,34 @@ public class EngineerServiceImpl implements EngineerService {
 		return Result.success(res);
 		return Result.success(res);
 	}
 	}
 
 
+	@Override
+	public Result<?> getEngineerInfoDetail(String engineerCode) {
+		// 获取技术员基础信息详情
+
+		EngineerInfoListResp.EngineerInfo empty = new EngineerInfoListResp.EngineerInfo();
+
+		// 获取技术员列表
+		List<EngineerInfo> records = this.queryEngineerInfos(engineerCode);
+		if (records.isEmpty()){
+			return Result.success(empty);
+		}
+
+		List<String> groupIds = records.stream().map(EngineerInfo::getGroupId).collect(Collectors.toList());
+		HashMap<String, String> groupNames = this.queryGroupNames(groupIds);
+
+		List<EngineerInfoListResp.EngineerInfo> items = this.packEngineerInfo(records, groupNames);
+		if (items.isEmpty()) {
+			return Result.success(empty);
+		}
+		return Result.success(items.get(0));
+	}
+
 	@Transactional
 	@Transactional
 	@Override
 	@Override
 	public Result<?> getEngineerSkillList(long page, long size) {
 	public Result<?> getEngineerSkillList(long page, long size) {
 		// 获取技术员技能列表
 		// 获取技术员技能列表
 
 
-		IPage<EngineerInfo> pg = this.queryEngineerInfo(page, size);
+		IPage<EngineerInfo> pg = this.queryEngineerInfoIPage(page, size);
 
 
 		List<EngineerInfo> engineers = pg.getRecords();
 		List<EngineerInfo> engineers = pg.getRecords();
 
 
@@ -106,6 +127,12 @@ public class EngineerServiceImpl implements EngineerService {
 		return Result.success(res);
 		return Result.success(res);
 	}
 	}
 
 
+	@Override
+	public Result<?> getEngineerSkillDetail(String engineerCode) {
+		// 获取工程师技能详情
+		return null;
+	}
+
 	@Transactional
 	@Transactional
 	@Override
 	@Override
 	public Result<?> engineerSkillUpdate(String engineerCode, List<String> categoryIds) {
 	public Result<?> engineerSkillUpdate(String engineerCode, List<String> categoryIds) {
@@ -153,7 +180,7 @@ public class EngineerServiceImpl implements EngineerService {
 		// 技术员业务属性配置列表
 		// 技术员业务属性配置列表
 
 
 		// 查询技术员列表
 		// 查询技术员列表
-		IPage<EngineerInfo> pg = this.queryEngineerInfo(page, size);
+		IPage<EngineerInfo> pg = this.queryEngineerInfoIPage(page, size);
 
 
 		List<EngineerInfo> records = pg.getRecords();
 		List<EngineerInfo> records = pg.getRecords();
 
 
@@ -209,6 +236,12 @@ public class EngineerServiceImpl implements EngineerService {
 		return Result.success(res);
 		return Result.success(res);
 	}
 	}
 
 
+	@Override
+	public Result<?> getEngineerBusinessDetail(String engineerCode) {
+		// 获取技术员业务熟悉详情
+		return null;
+	}
+
 	@Transactional
 	@Transactional
 	@Override
 	@Override
 	public Result<?> engineerBusinessUpdate(String engineerCode, Integer maxNum, Integer maxMinute, String departure, String priority) {
 	public Result<?> engineerBusinessUpdate(String engineerCode, Integer maxNum, Integer maxMinute, String departure, String priority) {
@@ -238,7 +271,7 @@ public class EngineerServiceImpl implements EngineerService {
 		return Result.success(null);
 		return Result.success(null);
 	}
 	}
 
 
-	private IPage<EngineerInfo> queryEngineerInfo(long page, long size) {
+	private IPage<EngineerInfo> queryEngineerInfoIPage(long page, long size) {
 		// 分页查询工程师基础信息
 		// 分页查询工程师基础信息
 		LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
 		lqw.orderByAsc(EngineerInfo::getGroupId);
 		lqw.orderByAsc(EngineerInfo::getGroupId);
@@ -249,6 +282,13 @@ public class EngineerServiceImpl implements EngineerService {
 		return pg;
 		return pg;
 	}
 	}
 
 
+	private List<EngineerInfo> queryEngineerInfos(String engineerCode) {
+		// 分页查询工程师基础信息
+		LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
+		lqw.eq(EngineerInfo::getEngineerCode, engineerCode);
+		return engineerInfoMPDao.selectList(lqw);
+	}
+
 	private HashMap<String, String> queryGroupNames(List<String> groupIds) {
 	private HashMap<String, String> queryGroupNames(List<String> groupIds) {
 		//查询小组名称映射关系
 		//查询小组名称映射关系
 		HashMap<String, String> map = new HashMap<>();
 		HashMap<String, String> map = new HashMap<>();
@@ -308,7 +348,7 @@ public class EngineerServiceImpl implements EngineerService {
 
 
 	private List<EngineerInfoListResp.EngineerInfo> packEngineerInfo(List<EngineerInfo> engineers, HashMap<String, String> groups) {
 	private List<EngineerInfoListResp.EngineerInfo> packEngineerInfo(List<EngineerInfo> engineers, HashMap<String, String> groups) {
 
 
-		String groupName, age, workType;
+		String groupName, age, kind;
 
 
 		List<EngineerInfoListResp.EngineerInfo> items = new ArrayList<>();
 		List<EngineerInfoListResp.EngineerInfo> items = new ArrayList<>();
 		for(EngineerInfo e: engineers) {
 		for(EngineerInfo e: engineers) {
@@ -319,15 +359,39 @@ public class EngineerServiceImpl implements EngineerService {
 			item.setSex(e.getGender());
 			item.setSex(e.getGender());
 			item.setPhone(e.getPhone());
 			item.setPhone(e.getPhone());
 			item.setAddress(e.getAddress());
 			item.setAddress(e.getAddress());
+			item.setGrade(e.getGrade());
 
 
+			// group name
 			groupName = groups.getOrDefault(e.getGroupId(), "");
 			groupName = groups.getOrDefault(e.getGroupId(), "");
 			item.setGroupName(groupName);
 			item.setGroupName(groupName);
 
 
+			// 年龄
 			age = this.getEngineerAge(e.getBirth());
 			age = this.getEngineerAge(e.getBirth());
 			item.setAge(age);
 			item.setAge(age);
 
 
-			workType = (e.getKind() == 1) ? "fullJob": "partJob";
-			item.setKind(workType);
+			// 工作类型:全职/兼职
+			kind = (e.getKind() == 1) ? "fullJob": "partJob";
+			item.setKind(kind);
+
+			if(e.getCredentials() != null){
+				item.setCredentials(Arrays.asList(e.getCredentials().split("、")));
+			} else{
+				item.setCredentials(new ArrayList<String>());
+			}
+
+			// 标签
+			List<String> tags = new ArrayList<>();
+			if (e.getTags() != null) {
+				Iterator<Map.Entry<String, JsonNode>> it = e.getTags().fields();
+				while(it.hasNext()){
+					Map.Entry<String, JsonNode> field = it.next();
+					String name = field.getKey();
+					JsonNode value = field.getValue();
+					tags.add(String.format("%s+%d",field.getKey(), field.getValue().intValue()));
+				}
+			} else {
+				item.setTags(tags);
+			}
 
 
 			items.add(item);
 			items.add(item);
 		}
 		}