From ae863d31c0644115a0fb6e4be4ee51a1f79da7a9 Mon Sep 17 00:00:00 2001 From: Jinyuanyuan <1197651512@qq.com> Date: Thu, 16 May 2024 14:58:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easy-api/src/main/resources/application-dev.yml | 13 +++++++++---- .../impl/HuzhouFieldchangehistoryServiceImpl.java | 9 ++++++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/easy-api/src/main/resources/application-dev.yml b/easy-api/src/main/resources/application-dev.yml index 397d628..498e982 100644 --- a/easy-api/src/main/resources/application-dev.yml +++ b/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} - password: ${DB_PASSWORD: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 +# 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.} diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java index 7ac74f7..a58faef 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java @@ -319,7 +319,14 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl list = list(queryWrapper); - return list; + Map nameMap = list.stream().collect(Collectors.toMap(HuzhouFieldchangehistory::getFieldValue, o -> o)); + List result = new ArrayList<>(); + List sortList = Arrays.asList("totalMoney","centralMoney","provincialMoney","cityMoney", + "countyMoney","selfMoney","payamount2023Money","payamount2024Money","payamount2025Money"); + for(String name:sortList){ + result.add(nameMap.get(name)); + } + return result; } @Override