项目信息修改审批页面字段顺序调整

easy-api/src/main/resources/application-dev.yml

@@ -60,12 +60,17 @@ spring:
     dynamic:
       datasource:
         master:
-#          url: jdbc:mysql://${DB_HOST:218.246.6.173}:${DB_PORT:3306}/${DB_NAME:guoyan_huzhou}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMulQueries=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullDatabaseMeansCurrent=true&useInformationSchema=true
+          url: jdbc:mysql://${DB_HOST:218.246.6.173}:${DB_PORT:3306}/${DB_NAME:guoyan_huzhou}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMulQueries=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullDatabaseMeansCurrent=true&useInformationSchema=true
+          username: ${DB_USERNAME:root}
+          password: ${DB_PASSWORD:1q2w#E$R1qaz@WSX}
+#          url: jdbc:mysql://${DB_HOST:218.246.6.165}:${DB_PORT:3306}/${DB_NAME:guoyan_huzhou}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMulQueries=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullDatabaseMeansCurrent=true&useInformationSchema=true
 #          username: ${DB_USERNAME:root}
 #          password: ${DB_PASSWORD:1q2w#E$R1qaz@WSX}
-          url: jdbc:mariadb://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:easy_java}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMulQueries=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullDatabaseMeansCurrent=true&useInformationSchema=true
+
-          username: ${DB_USERNAME:root}
+#          url: jdbc:mariadb://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:easy_java}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMulQueries=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullDatabaseMeansCurrent=true&useInformationSchema=true
-          password: ${DB_PASSWORD:root}
+#          username: ${DB_USERNAME:root}
+#          password: ${DB_PASSWORD:root}
+
 #          url: jdbc:mariadb://${DB_HOST:218.246.6.173}:${DB_PORT:3306}/${DB_NAME:easy-vben}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMulQueries=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullDatabaseMeansCurrent=true&useInformationSchema=true
 #          username: ${DB_USERNAME:root}
 #          password: ${DB_PASSWORD:Yun1993.}

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java

@@ -319,7 +319,14 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
         queryWrapper.eq(HuzhouFieldchangehistory::getGroupId,fieldChangeGroupid);
         queryWrapper.orderByDesc(BaseEntity::getCreateDate);
         List<HuzhouFieldchangehistory> list = list(queryWrapper);
-        return list;
+        Map<String, HuzhouFieldchangehistory> nameMap = list.stream().collect(Collectors.toMap(HuzhouFieldchangehistory::getFieldValue, o -> o));
+        List<HuzhouFieldchangehistory> result = new ArrayList<>();
+        List<String> sortList = Arrays.asList("totalMoney","centralMoney","provincialMoney","cityMoney",
+                "countyMoney","selfMoney","payamount2023Money","payamount2024Money","payamount2025Money");
+        for(String name:sortList){
+            result.add(nameMap.get(name));
+        }
+        return result;
     }
 
     @Override