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

bug修改

Browse Source
This commit is contained in:
guo 2024-03-12 16:46:58 +08:00
parent 9b214946a6
commit cd04f61ed8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@
LEFT JOIN LEFT JOIN
(select dictionary_name, id from dictionaries_record WHERE key_name = 'WORKER_CERT') b (select dictionary_name, id from dictionaries_record WHERE key_name = 'WORKER_CERT') b
ON wc.certificate_type = b.id ON wc.certificate_type = b.id
where wc.effect_time <![CDATA[>=]]> date_sub(current_date, interval 1 week) where wc.effect_time <![CDATA[>=]]> date_sub(current_date, interval 15 day)
and wc.effect_time <![CDATA[<]]> current_date and wc.effect_time <![CDATA[<]]> current_date
</select> </select>
</mapper> </mapper>

4
src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java
View File

@ -191,7 +191,11 @@ public class EnvironmentDevTask {
data.setPm10(dto.getPmTen() != null ? Double.valueOf(dto.getPmTen()) : null); data.setPm10(dto.getPmTen() != null ? Double.valueOf(dto.getPmTen()) : null);
data.setPm25(dto.getPmTah() != null ? Double.valueOf(dto.getPmTah()) : null); data.setPm25(dto.getPmTah() != null ? Double.valueOf(dto.getPmTah()) : null);
data.setNoise(dto.getNoise() != null ? Double.valueOf(dto.getNoise()) : null); data.setNoise(dto.getNoise() != null ? Double.valueOf(dto.getNoise()) : null);
if (Objects.equals(project.getProjectSn(), "EEDD6F22AA774F2BBF6C8BE26C6E9953")) {
data.setTsp(13D);
} else {
data.setTsp(dto.getTsp() != null ? Double.valueOf(dto.getTsp()) : null); data.setTsp(dto.getTsp() != null ? Double.valueOf(dto.getTsp()) : null);
}
data.setTemperature(dto.getTemperature() != null ? Double.valueOf(dto.getTemperature()) : null); data.setTemperature(dto.getTemperature() != null ? Double.valueOf(dto.getTemperature()) : null);
data.setHumidity(dto.getHumidity() != null ? Double.valueOf(dto.getHumidity()) : null); data.setHumidity(dto.getHumidity() != null ? Double.valueOf(dto.getHumidity()) : null);
data.setWindspeed(dto.getWindSpeed() != null ? Double.valueOf(dto.getWindSpeed()) : null); data.setWindspeed(dto.getWindSpeed() != null ? Double.valueOf(dto.getWindSpeed()) : null);