admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
pengjie 2024-08-24 18:14:32 +08:00
parent 14192a0c7d
commit e961c70260
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/WeatherController.java
View File

@ -76,6 +76,7 @@ public class WeatherController {
QueryWrapper<Weather> queryWrapper = QueryGenerator.initQueryWrapper(weather); QueryWrapper<Weather> queryWrapper = QueryGenerator.initQueryWrapper(weather);
queryWrapper.lambda().ge(Weather::getDate, new Date()); queryWrapper.lambda().ge(Weather::getDate, new Date());
queryWrapper.lambda().le(Weather::getDate, DateUtil.offsetDay(new Date(), 7)); queryWrapper.lambda().le(Weather::getDate, DateUtil.offsetDay(new Date(), 7));
queryWrapper.lambda().orderByAsc(Weather::getDate);
return Result.success(weatherService.list(queryWrapper)); return Result.success(weatherService.list(queryWrapper));
} }

2
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -2500,7 +2500,7 @@
count(distinct wa.person_sn,if(pass_type=2,1,null)) exitTodayNum count(distinct wa.person_sn,if(pass_type=2,1,null)) exitTodayNum
from worker_info wi from worker_info wi
join worker_attendance wa on wa.person_sn=wi.person_sn 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
</select> </select>
<update id="updateScore"> <update id="updateScore">

2
src/main/resources/application-gsx-other-env-show.properties
View File

@ -1,6 +1,6 @@
#http.port=30250 #http.port=30250
http.port=23912 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.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==) spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)