Merge branch 'feat-dingwf-mvp616' into develop

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

@@ -13,6 +13,7 @@ public class PubParameterRespDTO {
     public static class Enum {
     public static class Enum {
         private List<?> items;
         private List<?> items;
         private String name;
         private String name;
+        private String description;
     }
     }
 
 
     @lombok.Data
     @lombok.Data

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

@@ -25,9 +25,9 @@ public class PublicServiceImpl implements PublicService {
         List<PubParameterRespDTO.Enum> enums = new ArrayList<>();
         List<PubParameterRespDTO.Enum> enums = new ArrayList<>();
         HashMap<String, String> mapping = getMapping();
         HashMap<String, String> mapping = getMapping();
         for (String k : mapping.keySet()) {
         for (String k : mapping.keySet()) {
-            List<?> items = pubParamsDao.findByBiztype(mapping.get(k));
+            List<?> items = pubParamsDao.findByBiztype(k);
             if (!items.isEmpty()) {
             if (!items.isEmpty()) {
-                PubParameterRespDTO.Enum anEnum = new PubParameterRespDTO.Enum().setName(k);
+                PubParameterRespDTO.Enum anEnum = new PubParameterRespDTO.Enum().setName(k).setDescription(mapping.get(k));
                 List<PubParameterRespDTO.Item> items2 = new ArrayList<>();
                 List<PubParameterRespDTO.Item> items2 = new ArrayList<>();
                 for (Object e : items) {
                 for (Object e : items) {
                     PubParamsEntity param = (PubParamsEntity) e;
                     PubParamsEntity param = (PubParamsEntity) e;
@@ -45,14 +45,19 @@ public class PublicServiceImpl implements PublicService {
 
 
     private HashMap<String, String> getMapping() {
     private HashMap<String, String> getMapping() {
         String[] pairs = {
         String[] pairs = {
-                "engineerStatus, EngineerStatus",
-                "workType, Worktype",
-                "transportation, Transportation",
-                "dispatchWeight,Dispatchweight",
-                "engineerBase,EngineerBase",
-                "serviceOrderStatus,ServiceOrderStatus",
-                "assignOrderStatus,AssignOrderStatus",
-                "serviceType,ServiceType"
+                "EngineerStatus,技术员状态",
+                "WorkType,工作性质",
+                "Transportation,交通工具",
+                "DispatchWeight,派单优先级",
+                "ServiceOrderStatus,工单状态",
+                "AssignOrderStatus,指派状态",
+                "ServiceType,服务类型",
+                "Gender,性别",
+                "RecommendAssignment,指派推荐",
+                "AssignStatus,指派状态",
+                "AssignType,指派类型",
+                "AppointmentChannel,预约渠道",
+                "PriorityWeight,工单优先级"
         };
         };
 
 
         HashMap<String, String> hashMap = new HashMap<>();
         HashMap<String, String> hashMap = new HashMap<>();