Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542

project-dispatch/src/main/resources/application-dev.yaml

@@ -3,7 +3,7 @@ server:
 
 
 dispatch:
 dispatch:
   cron:
   cron:
-    expr: 0 26 8-19 * * ?
+    expr: 0 19 8-20 * * ?
     next-day-limit: 2
     next-day-limit: 2
 #    expr: 0 */10 8-18 * * ?
 #    expr: 0 */10 8-18 * * ?
 
 

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java

@@ -129,7 +129,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
             record.setX(o.getX());
             record.setX(o.getX());
             record.setY(o.getY());
             record.setY(o.getY());
             record.setSource(o.getSource());
             record.setSource(o.getSource());
-            record.setDescription(o.getDescription());
+            record.setDescription(o.getApplyNote());
             record.setPriority(o.getPriority());
             record.setPriority(o.getPriority());
             record.setOrgBranchName(branchNames.getOrDefault(o.getOrgBranchId(), ""));
             record.setOrgBranchName(branchNames.getOrDefault(o.getOrgBranchId(), ""));
 
 
@@ -196,7 +196,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
         record.setX(o.getX());
         record.setX(o.getX());
         record.setY(o.getY());
         record.setY(o.getY());
         record.setSource(o.getSource());
         record.setSource(o.getSource());
-        record.setDescription(o.getDescription());
+        record.setDescription(o.getApplyNote());
         record.setPriority(o.getPriority());
         record.setPriority(o.getPriority());
         record.setOrgBranchName(branchNames.getOrDefault(o.getOrgBranchId(), ""));
         record.setOrgBranchName(branchNames.getOrDefault(o.getOrgBranchId(), ""));
 
 
@@ -262,7 +262,13 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
     private List<String> getOrderEngineerNames(String engineerCode, String engineerCodeSub, Map<String, String> engineerNames) {
     private List<String> getOrderEngineerNames(String engineerCode, String engineerCodeSub, Map<String, String> engineerNames) {
         // 获取订单技术员姓名信息
         // 获取订单技术员姓名信息
         List<String> names = new ArrayList<>();
         List<String> names = new ArrayList<>();
-        for (String code : List.of(engineerCode, engineerCodeSub)) {
+        List<String> codes = new ArrayList<>() {
+            {
+                add(engineerCode);
+                add(engineerCodeSub);
+            }
+        };
+        for (String code : codes) {
             String name = engineerNames.getOrDefault(code, "");
             String name = engineerNames.getOrDefault(code, "");
             if (StringUtils.isNotEmpty(name)) {
             if (StringUtils.isNotEmpty(name)) {
                 names.add(name);
                 names.add(name);