yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
wany 2024-09-03 15:52:42 +08:00
parent 8eddb3cf71 9222f51bd4
commit 7b647d7d10
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gunshi/project/xyt/timetask/DataTask.java
View File

@ -314,7 +314,7 @@ public class DataTask {
UpdateWrapper<StPptnRH> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<StPptnRH> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("stcd", LastData.getStcd()).eq("tm", LastData.getTm()); updateWrapper.eq("stcd", LastData.getStcd()).eq("tm", LastData.getTm());
LastData.setDrp(LastData.getDrp()); LastData.setDrp(LastData.getDrp());
LastData.setChtm(LastData.getChtm()); LastData.setChtm(maxData.getChtm());
stPptnRHService.saveOrUpdate(LastData, updateWrapper); stPptnRHService.saveOrUpdate(LastData, updateWrapper);
} }
if(list.size() > 0){ if(list.size() > 0){

2
src/main/resources/mapper/StPptnRHMapper.xml
View File

@ -38,7 +38,7 @@
</select> </select>
<select id="getMaxData" resultType="com.gunshi.project.xyt.model.StPptnRH"> <select id="getMaxData" resultType="com.gunshi.project.xyt.model.StPptnRH">
SELECT #{stcd} stcd, COALESCE(max(tm), '2021-01-01 00:00:00') tm FROM st_pptn_r_h SELECT #{stcd} stcd, COALESCE(max(tm), '2021-01-01 00:00:00') tm, MAX ( chtm ) chtm FROM st_pptn_r_h
</select> </select>
<select id="queryDayRz" resultType="com.gunshi.project.xyt.model.StPptnRD"> <select id="queryDayRz" resultType="com.gunshi.project.xyt.model.StPptnRD">