Merge remote-tracking branch 'origin/develop' into develop

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

@@ -16,6 +16,7 @@ public class EngineerBusinessListResp {
 	public static class EngineerBusiness{
 	public static class EngineerBusiness{
 		private String engineerCode;
 		private String engineerCode;
 		private String engineerName;
 		private String engineerName;
+		private String groupName;
 		private String kind;
 		private String kind;
 		private Integer maxNum;
 		private Integer maxNum;
 		private Integer maxMinute;
 		private Integer maxMinute;

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

@@ -380,6 +380,9 @@ public class EngineerServiceImpl implements EngineerService {
 		// 获取技术员code列表
 		// 获取技术员code列表
 		List<String> engineerCodes = engineers.stream().map(EngineerInfo::getEngineerCode).collect(Collectors.toList());
 		List<String> engineerCodes = engineers.stream().map(EngineerInfo::getEngineerCode).collect(Collectors.toList());
 
 
+		List<String> groupIds = engineers.stream().map(EngineerInfo::getGroupId).collect(Collectors.toList());
+		HashMap<String, String> groupNames = this.queryGroupNames(groupIds);
+
 		HashMap<String, EngineerBusiness> buss = this.queryEngineerBusiness(engineerCodes);
 		HashMap<String, EngineerBusiness> buss = this.queryEngineerBusiness(engineerCodes);
 
 
 		List<EngineerBusinessListResp.EngineerBusiness> items = new ArrayList<>();
 		List<EngineerBusinessListResp.EngineerBusiness> items = new ArrayList<>();
@@ -387,6 +390,7 @@ public class EngineerServiceImpl implements EngineerService {
 			EngineerBusinessListResp.EngineerBusiness item = new EngineerBusinessListResp.EngineerBusiness();
 			EngineerBusinessListResp.EngineerBusiness item = new EngineerBusinessListResp.EngineerBusiness();
 
 
 			item.setEngineerCode(e.getEngineerCode());
 			item.setEngineerCode(e.getEngineerCode());
+			item.setGroupName(groupNames.getOrDefault(e.getGroupId(), ""));
 			item.setEngineerName(e.getName());
 			item.setEngineerName(e.getName());
 			item.setKind((e.getKind() == 1) ? "fullJob" : "partJob");
 			item.setKind((e.getKind() == 1) ? "fullJob" : "partJob");