From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2

---
 igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java b/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
index 3684625..1914fb9 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
@@ -19,7 +19,7 @@
 import com.ld.igds.util.DateUtil;
 
 /**
- * 
+ *
  * @author: andy.jia
  * @description:
  * @version:
@@ -34,7 +34,7 @@
 		if (null == parameter) {
 			parameter = new HashMap<String, Object>();
 		}
-		
+
 		Map<String, Object> args = new HashMap<String, Object>();
 
 		// 榛樿鑾峰彇6涓湀鐨勬暟鎹俊鎭�
@@ -65,12 +65,33 @@
 		}
 
 		String countHql = "select count(*) " + hql;
-		hql += " order by batchId desc";
+		hql += " order by receiveDate desc";
 
 		this.pagingQuery(page, hql, countHql, args);
 	}
 
 
+	public void getData(Page<PestData> page, Map<String, Object> parameter) throws Exception {
+		if (null == parameter) {
+			parameter = new HashMap<String, Object>();
+		}
+
+		Map<String, Object> args = new HashMap<String, Object>();
+
+		String hql = " from " + Pest.class.getName() + " where 1=1 ";
+
+		String arg = (String) parameter.get("depotId");
+		if (StringUtils.isNotEmpty(arg)) {
+			hql += " and depotId = :depotId";
+			args.put("depotId", arg);
+		}
+
+
+		String countHql = "select count(*) " + hql;
+		hql += " order by receiveDate desc";
+
+		this.pagingQuery(page, hql, countHql, args);
+	}
 
 	public void pageData(Page<Pest> page, Map<String, Object> param)
 			throws Exception {

--
Gitblit v1.9.3