整合数据统计、最新数据查询接口
This commit is contained in:
parent
390231ea2f
commit
7e8f611308
|
|
@ -641,10 +641,10 @@ public class WxAppletController {
|
|||
List<String> waterList =new ArrayList<>();
|
||||
for (SurvDeviceDeploy survDeviceDeploy : survStationInfo.getDeviceList()) {
|
||||
if (PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType())) {//土壤设备
|
||||
soilList.add(survDeviceDeploy.getDeployCode());
|
||||
soilList.add(survDeviceDeploy.getId());
|
||||
} else if (PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())) {//气象设备
|
||||
airList.add(survDeviceDeploy.getDeployCode());
|
||||
} else if (PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())) {//气象设备
|
||||
airList.add(survDeviceDeploy.getId());
|
||||
} else if (PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())) {//水质设备
|
||||
waterList.add(survDeviceDeploy.getId());
|
||||
}else if (PollutionConstants.WATER_ORIENT.equals(survDeviceDeploy.getDeployType())) {//面源
|
||||
orientList.add(survDeviceDeploy.getDeployCode());
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
</select>
|
||||
|
||||
<select id="getPageResentData" resultMap="baseResultVoMap">
|
||||
select * from surv_hisdata_air where DEPLOY_CODE IN
|
||||
select * from surv_hisdata_air where DEPLOY_ID IN
|
||||
<foreach collection="airList" index="index" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
</select>
|
||||
|
||||
<select id="getPageResentData" resultMap="baseResultVoMap">
|
||||
select <include refid="baseSql"/> from surv_hisdata_soil where DEPLOY_CODE IN
|
||||
select <include refid="baseSql"/> from surv_hisdata_soil where DEPLOY_ID IN
|
||||
<foreach collection="soilList" index="index" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
|
|
|
|||
Loading…
Reference in New Issue