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

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

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

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

@@ -17,11 +17,11 @@ public class EngineerInfoListResp {
 		private String engineerCode;
 		private String number;
 		private String name;
-		private String group;
+		private String groupName;
 		private String sex;
 		private String age;
 		private String phone;
 		private String address;
-		private String workType;
+		private String kind;
 	}
 }

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

@@ -18,6 +18,7 @@ public class EngineerSkillListResp {
 		private String engineerCode;
 		private String engineerName;
 		private String groupName;
+		private String updateTime;
 		private List<String> categoryIds;
 	}
 }

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

@@ -15,7 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -88,6 +90,7 @@ public class EngineerServiceImpl implements EngineerService {
 			skill.setEngineerCode(e.getEngineerCode());
 			skill.setEngineerName(e.getName());
 			skill.setGroupName(groupNames.getOrDefault(e.getGroupId(), ""));
+			skill.setUpdateTime(this.Timestamp2Datetime(e.getUpdateTime(), "yyyy-MM-dd hh:mm:ss"));
 
 			// 获取一个工程师的技能列表
 			skill.setCategoryIds(engineerSkills.getOrDefault(e.getEngineerCode(), emptySkills));
@@ -166,7 +169,7 @@ public class EngineerServiceImpl implements EngineerService {
 
 			item.setEngineerCode(e.getEngineerCode());
 			item.setEngineerName(e.getName());
-			item.setWorkType((e.getKind() == 1) ? "fullJob": "partJob");
+			item.setKind((e.getKind() == 1) ? "fullJob": "partJob");
 
 			b = buss.getOrDefault(e.getEngineerCode(), null);
 			if (b == null) {
@@ -318,13 +321,13 @@ public class EngineerServiceImpl implements EngineerService {
 			item.setAddress(e.getAddress());
 
 			groupName = groups.getOrDefault(e.getGroupId(), "");
-			item.setGroup(groupName);
+			item.setGroupName(groupName);
 
 			age = this.getEngineerAge(e.getBirth());
 			item.setAge(age);
 
 			workType = (e.getKind() == 1) ? "fullJob": "partJob";
-			item.setWorkType(workType);
+			item.setKind(workType);
 
 			items.add(item);
 		}
@@ -360,4 +363,9 @@ public class EngineerServiceImpl implements EngineerService {
 		}
 		return (age <= 0) ? "" : Integer.toString(age);
 	}
+
+	private String Timestamp2Datetime(Timestamp t, String pattern) {
+		DateTimeFormatter df = DateTimeFormatter.ofPattern(pattern);
+		return df.format(t.toLocalDateTime());
+	}
 }