From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java | 67 +++++++++++----------------------
1 files changed, 22 insertions(+), 45 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java b/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java
index 2179f9a..c289ec8 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java
@@ -3,18 +3,18 @@
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.DicArea;
-import com.ld.igds.models.DicFoodOrigin;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Component
-public class HDicAreaService extends HibernateDao{
+public class HDicAreaService extends HibernateDao {
- public List<DicArea> listDicArea(String type){
+ public List<DicArea> listDicArea(String type) {
String hql = " from " + DicArea.class.getName();
Map<String, Object> args = new HashMap<String, Object>();
@@ -30,7 +30,6 @@
public String saveDicArea(DicArea data) {
Session session = this.getSessionFactory().openSession();
try {
-
session.saveOrUpdate(data);
} finally {
session.flush();
@@ -50,7 +49,7 @@
return null;
}
- public DicArea listDicAreaByName(String name){
+ public DicArea listDicAreaByName(String name) {
String hql = " from " + DicArea.class.getName() + " where 1=1";
Map<String, Object> args = new HashMap<String, Object>();
@@ -61,14 +60,14 @@
hql += " order by code";
List<DicArea> list = this.query(hql, args);
- if(null ==list || list.isEmpty()){
+ if (null == list || list.isEmpty()) {
return null;
}
return list.get(0);
}
- public DicArea listDicAreaByCode(String code){
- if(StringUtils.isEmpty(code)){
+ public DicArea listDicAreaByCode(String code) {
+ if (StringUtils.isEmpty(code)) {
return null;
}
String hql = " from " + DicArea.class.getName() + " where code =:code";
@@ -78,52 +77,30 @@
hql += " order by code";
List<DicArea> list = this.query(hql, args);
- if(null ==list || list.isEmpty()){
+ if (null == list || list.isEmpty()) {
return null;
}
return list.get(0);
}
- public void getDicArea(Page<DicFoodOrigin> page, Map<String,Object> param) throws Exception {
- String hql = " from " + DicArea.class.getName() + " where 1=1";
+ public void pageList(Page<DicArea> page, String key) throws Exception {
+ String hql = " from " + DicArea.class.getName();
+ Map<String, Object> args = new HashMap<>();
+ String countHql;
+ if (StringUtils.isNotEmpty(key)) {
+ hql += " where (name like :key1 or simple like:key2)";
+ args.put("key1", "%" + key + "%");
+ args.put("key2", "%" + key.toUpperCase() + "%");
- Map<String, Object> args = new HashMap<String, Object>();
+ countHql = "select count(1) " + hql;
+ hql += " order by code";
- if (null != param) {
- String str = (String) param.get("code");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and code like :code";
- args.put("code", "%" + str + "%");
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and name like :name";
- args.put("name", "%" + str + "%");
- }
+ this.pagingQuery(page, hql, countHql, args);
- str = (String) param.get("disabledTag");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and disabledTag = :disabledTag";
- args.put("disabledTag", str);
- }
-
- str = (String) param.get("key");
- if (StringUtils.isNoneEmpty(str)) {
- hql += " and (name like :name or code like:code or simple like:simple) ";
- args.put("name", "%" + str + "%");
- args.put("code", "%" + str + "%");
- args.put("simple", "%" + str.toUpperCase() + "%");
- }
- }
-
- String coutHql = "select count(*) " + hql;
-
- hql += " order by code";
-
- if (args.isEmpty()) {
- this.pagingQuery(page, hql, coutHql);
} else {
- this.pagingQuery(page, hql, coutHql, args);
+ countHql = "select count(1) " + hql;
+ hql += " order by code";
+ this.pagingQuery(page, hql, countHql);
}
}
}
--
Gitblit v1.9.3