数据表字段变更

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

@@ -6,7 +6,8 @@ import java.sql.Timestamp;
 
 
 @Data
 @Data
 public class EngineerInfo {
 public class EngineerInfo {
-	private Integer engineerId;
+	private Integer id;
+	private String engineerCode;
 	private Integer subsectionId;
 	private Integer subsectionId;
 	private String code;
 	private String code;
 	private String name;
 	private String name;

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

@@ -7,7 +7,7 @@ import java.sql.Timestamp;
 @Data
 @Data
 public class EngineerSkill {
 public class EngineerSkill {
 	private Integer id;
 	private Integer id;
-	private Integer engineerId;
+	private String engineerCode;
 	private String categoryId;
 	private String categoryId;
 	private String brand;
 	private String brand;
 	private String kind;
 	private String kind;

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

@@ -9,7 +9,7 @@ public class OrderAppointment {
 	private String orderId;
 	private String orderId;
 	private String suborderId;
 	private String suborderId;
 	private String mainSub;
 	private String mainSub;
-	private Integer engineerId;
+	private String engineerCode;
 	private String engineerName;
 	private String engineerName;
 	private String engineerPhone;
 	private String engineerPhone;
 	private String engineerAge;
 	private String engineerAge;

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

@@ -49,16 +49,16 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 		List<OrderAppointment> appoints = this.GetOrderAppointments(orderId);
 		List<OrderAppointment> appoints = this.GetOrderAppointments(orderId);
 
 
 		// 工程师ID列表
 		// 工程师ID列表
-		List<Integer> egIds = new ArrayList<>();
+		List<String> egCodes = new ArrayList<>();
 		for(OrderAppointment o: appoints) {
 		for(OrderAppointment o: appoints) {
-			egIds.add(o.getEngineerId());
+			egCodes.add(o.getEngineerCode());
 		}
 		}
 
 
 		// 获取工程师基础信息列表
 		// 获取工程师基础信息列表
-		HashMap<Integer, EngineerInfo> egInfo = this.GetEngineerInfos(egIds);
+		HashMap<String, EngineerInfo> egInfo = this.GetEngineerInfos(egCodes);
 
 
 		// 获取工程师技能列表
 		// 获取工程师技能列表
-		HashMap<Integer, EngineerSkill> egSkill = this.GetEngineerSkills(egIds);
+		HashMap<String, EngineerSkill> egSkill = this.GetEngineerSkills(egCodes);
 
 
 		// 获取订单timeline
 		// 获取订单timeline
 		Map<String, List<OrderTimeline>> timelines = this.GetOrderTimelines(orderId);
 		Map<String, List<OrderTimeline>> timelines = this.GetOrderTimelines(orderId);
@@ -75,7 +75,6 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 			subOrderIds.add(k);
 			subOrderIds.add(k);
 		}
 		}
 		Collections.reverse(subOrderIds);
 		Collections.reverse(subOrderIds);
-		System.out.println(subOrderIds);
 
 
 		for(String subOrderId: subOrderIds){
 		for(String subOrderId: subOrderIds){
 			List<OrderAppointment> orders = appointOrders.get(subOrderId);
 			List<OrderAppointment> orders = appointOrders.get(subOrderId);
@@ -86,8 +85,8 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 			// 获取工程师列表信息
 			// 获取工程师列表信息
 			List<List<KV>> egInfos = new ArrayList<>();
 			List<List<KV>> egInfos = new ArrayList<>();
 			for (OrderAppointment o: orders) {
 			for (OrderAppointment o: orders) {
-				Integer egId = o.getEngineerId();
-				egInfos.add(this.PackEngineerInfos(egInfo.get(egId), egSkill.get(egId)));
+				String egCode = o.getEngineerCode();
+				egInfos.add(this.PackEngineerInfos(egInfo.get(egId), egSkill.get(egCode)));
 			}
 			}
 			op.setEngineers(egInfos);
 			op.setEngineers(egInfos);
 
 
@@ -122,31 +121,31 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 		return orderAppointmentDao.selectList(lqw);
 		return orderAppointmentDao.selectList(lqw);
 	}
 	}
 
 
-	private HashMap<Integer, EngineerInfo> GetEngineerInfos(List<Integer> egIds){
+	private HashMap<String, EngineerInfo> GetEngineerInfos(List<String> egCodes){
 		// 获取工程师信息列表
 		// 获取工程师信息列表
-		HashMap<Integer, EngineerInfo> map = new HashMap<>();
+		HashMap<String, EngineerInfo> map = new HashMap<>();
 
 
 		LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
-		lqw.in(EngineerInfo::getEngineerId, egIds);
+		lqw.in(EngineerInfo::getEngineerCode, egCodes);
 		List<EngineerInfo> rows = engineerInfoDao.selectList(lqw);
 		List<EngineerInfo> rows = engineerInfoDao.selectList(lqw);
 
 
 		for (EngineerInfo row: rows){
 		for (EngineerInfo row: rows){
-			map.put(row.getEngineerId(), row);
+			map.put(row.getEngineerCode(), row);
 		}
 		}
 		return map;
 		return map;
 	}
 	}
 
 
-	private HashMap<Integer, EngineerSkill> GetEngineerSkills(List<Integer> egIds) {
+	private HashMap<String, EngineerSkill> GetEngineerSkills(List<String> egCodes) {
 		// 获取工程师技能列表
 		// 获取工程师技能列表
 
 
-		HashMap<Integer, EngineerSkill> map = new HashMap<>();
+		HashMap<String, EngineerSkill> map = new HashMap<>();
 
 
 		LambdaQueryWrapper<EngineerSkill> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<EngineerSkill> lqw = new LambdaQueryWrapper<>();
-		lqw.in(EngineerSkill::getEngineerId, egIds);
+		lqw.in(EngineerSkill::getEngineerCode, egCodes);
 		List<EngineerSkill> rows = engineerSkillDao.selectList(lqw);
 		List<EngineerSkill> rows = engineerSkillDao.selectList(lqw);
 
 
 		for (EngineerSkill row: rows){
 		for (EngineerSkill row: rows){
-			map.put(row.getEngineerId(), row);
+			map.put(row.getEngineerCode(), row);
 		}
 		}
 		return map;
 		return map;
 	}
 	}