From e961c7026097298873c4c4a873f2aa797c51f10a Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Sat, 24 Aug 2024 18:14:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmgl/modules/basicdata/controller/WeatherController.java | 1 + .../zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml | 2 +- src/main/resources/application-gsx-other-env-show.properties | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/WeatherController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/WeatherController.java index 184eb001f..9817086f2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/WeatherController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/WeatherController.java @@ -76,6 +76,7 @@ public class WeatherController { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(weather); queryWrapper.lambda().ge(Weather::getDate, new Date()); queryWrapper.lambda().le(Weather::getDate, DateUtil.offsetDay(new Date(), 7)); + queryWrapper.lambda().orderByAsc(Weather::getDate); return Result.success(weatherService.list(queryWrapper)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index 9ff8c22a9..95aafcd34 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -2500,7 +2500,7 @@ count(distinct wa.person_sn,if(pass_type=2,1,null)) exitTodayNum from worker_info wi join worker_attendance wa on wa.person_sn=wi.person_sn - where wa.project_sn=#{projectSn} and wa.create_time>=current_date and t.inService_type = 1 + where wa.project_sn=#{projectSn} and wa.create_time>=current_date and wi.inService_type = 1 diff --git a/src/main/resources/application-gsx-other-env-show.properties b/src/main/resources/application-gsx-other-env-show.properties index f4c67bfae..62d3afdf3 100644 --- a/src/main/resources/application-gsx-other-env-show.properties +++ b/src/main/resources/application-gsx-other-env-show.properties @@ -1,6 +1,6 @@ #http.port=30250 http.port=23912 -spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.34.221:3306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.34.155:3306/wisdomsite_wangc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false spring.datasource.db1.driver-class-name=com.mysql.jdbc.Driver spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)