diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerCertificateMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerCertificateMapper.xml index acb54db92..68321e1c1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerCertificateMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerCertificateMapper.xml @@ -38,7 +38,7 @@ LEFT JOIN (select dictionary_name, id from dictionaries_record WHERE key_name = 'WORKER_CERT') b ON wc.certificate_type = b.id - where wc.effect_time =]]> date_sub(current_date, interval 1 week) + where wc.effect_time =]]> date_sub(current_date, interval 15 day) and wc.effect_time current_date diff --git a/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java b/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java index 1a0217bee..17928ed8c 100644 --- a/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java +++ b/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java @@ -191,7 +191,11 @@ public class EnvironmentDevTask { data.setPm10(dto.getPmTen() != null ? Double.valueOf(dto.getPmTen()) : null); data.setPm25(dto.getPmTah() != null ? Double.valueOf(dto.getPmTah()) : null); data.setNoise(dto.getNoise() != null ? Double.valueOf(dto.getNoise()) : null); - data.setTsp(dto.getTsp() != null ? Double.valueOf(dto.getTsp()) : null); + if (Objects.equals(project.getProjectSn(), "EEDD6F22AA774F2BBF6C8BE26C6E9953")) { + data.setTsp(13D); + } else { + data.setTsp(dto.getTsp() != null ? Double.valueOf(dto.getTsp()) : null); + } data.setTemperature(dto.getTemperature() != null ? Double.valueOf(dto.getTemperature()) : null); data.setHumidity(dto.getHumidity() != null ? Double.valueOf(dto.getHumidity()) : null); data.setWindspeed(dto.getWindSpeed() != null ? Double.valueOf(dto.getWindSpeed()) : null);