diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java index 45abbca..caaf62c 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java @@ -92,7 +92,7 @@ w * @param pageNo 非必传,虫情孢子类,杀虫灯传入 } else { if (transdataAir != null) { transdataAir.setDeployId(deployId); - voTransData.setTransData(CommonUtils.markZhibiao(CommonUtils.constructAir(transdataAir), zhibiaoList)); + voTransData.setTransData(CommonUtils.markZhibiao(deploy,CommonUtils.constructAir(transdataAir), zhibiaoList)); return voTransData; } } @@ -103,7 +103,7 @@ w * @param pageNo 非必传,虫情孢子类,杀虫灯传入 } else { if (transdataSoil != null) { transdataSoil.setDeployId(deployId); - voTransData.setTransData(CommonUtils.markZhibiao(CommonUtils.constructSoil(transdataSoil), zhibiaoList)); + voTransData.setTransData(CommonUtils.markZhibiao(deploy,CommonUtils.constructSoil(transdataSoil), zhibiaoList)); return voTransData; } } @@ -114,7 +114,7 @@ w * @param pageNo 非必传,虫情孢子类,杀虫灯传入 } else { if (transdataWater != null) { transdataWater.setDeployId(deployId); - voTransData.setTransData(CommonUtils.markZhibiao(CommonUtils.constructSoil(transdataWater), zhibiaoList)); + voTransData.setTransData(CommonUtils.markZhibiao(deploy,CommonUtils.constructSoil(transdataWater), zhibiaoList)); return voTransData; } } @@ -721,7 +721,7 @@ w * @param pageNo 非必传,虫情孢子类,杀虫灯传入 } - public static List markZhibiao(List dataList, List zhibiaoList) { + public static List markZhibiao(SurvDeviceDeploy deploy,List dataList, List zhibiaoList) { if (dataList == null || dataList.size() == 0) {//无数据直接返回 System.out.println("无数据直接返回"); return dataList; @@ -770,6 +770,7 @@ w * @param pageNo 非必传,虫情孢子类,杀虫灯传入 } else { System.out.println("无指标跳过====================" + commonDataTrans.getSurvItem()); } + commonDataTrans.setDeployRemark(deploy.getDeployDes()); } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/CommonDataTrans.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/CommonDataTrans.java index 7ab6154..9766e27 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/CommonDataTrans.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/CommonDataTrans.java @@ -17,6 +17,8 @@ import java.time.LocalDateTime; public class CommonDataTrans { @ApiModelProperty("设备编号") private String deployId; + @ApiModelProperty("设备名称") + private String deployRemark; @ApiModelProperty("监测类型") private String survType; @ApiModelProperty("监测项名称")