diff --git a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java index 4cb9db2..360fc68 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java @@ -74,13 +74,13 @@ public interface OsmoticPressRMapper extends BaseMapper { t.q as value from public.osmotic_flow_r t - where to_char(t.tm, 'HH24:MI:SS') = '08:00:00' and t.station_code in + where t.station_code in #{code} - + and t.tm =]]> #{obj.dateTimeRangeSo.start} - + and t.tm #{obj.dateTimeRangeSo.end} diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java index 4fa5b5b..f38b6d8 100644 --- a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java @@ -49,6 +49,9 @@ public class OsmoticPressRService extends ServiceImpl queryValue(OsmoticQuerySo osmoticQuerySo,Integer year) { + if(osmoticQuerySo.getType() == null) { + osmoticQuerySo.setType(1); + } List resList = new ArrayList<>(); if(CollectionUtils.isEmpty(osmoticQuerySo.getStationCodes())){ return resList;