From 443b575f774d8eb50c16d4eefccce5218fb8de2a Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期二, 14 十一月 2023 13:40:48 +0800
Subject: [PATCH] 项目信息和出库信息高级搜索
---
product-server-project-management/src/main/java/com/product/project/management/service/ProjectOutService.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectOutService.java b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectOutService.java
index 35cdb70..0bbf969 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectOutService.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectOutService.java
@@ -5,6 +5,7 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.permission.PermissionService;
import com.product.core.service.support.AbstractBaseService;
+import com.product.core.service.support.QueryFilterService;
import com.product.project.management.config.Cmnconst;
import com.product.util.BaseUtil;
@@ -23,16 +24,26 @@
@Autowired
PermissionService permissionService;
+ @Autowired
+ QueryFilterService queryFilterService;
- public DataTableEntity listOutBound(Integer cpage, Integer pageSize, String filter) {
+
+ public DataTableEntity listOutBound(FieldSetEntity fse) {
- String queryFilter = permissionService.getDataFilter(Cmnconst.PRODUCT_PROJECT_QXLW, "project_leader,materialman");
- if (!BaseUtil.strIsNull(queryFilter)) {
- filter += " AND " + queryFilter;
+ String filter = fse.getString("filter");
+ String searchFilter = queryFilterService.getQueryFilter(fse);
+ if (!BaseUtil.strIsNull(searchFilter)) {
+ filter += " AND " + searchFilter;
+ }
+ String limitFilter = permissionService.getDataFilter(Cmnconst.PRODUCT_PROJECT_QXLW, "project_leader,materialman");
+ if (!BaseUtil.strIsNull(limitFilter)) {
+ filter += " AND " + limitFilter;
}
String sql = "SELECT * FROM product_project_outbound A LEFT JOIN product_project_qxlw B ON A.project_uuid = B.uuid WHERE " + filter;
- DataTableEntity dt = baseDao.listTable(sql, new Object[] {}, pageSize, cpage);
+ DataTableEntity dt = baseDao.listTable(sql, new Object[] {}, fse.getInteger(Cmnconst.PAGESIZE), fse.getInteger(Cmnconst.CPAGE));
+ dt.getMeta().addAliasTable("product_project_outbound", "A");
+ dt.getMeta().addAliasTable("product_project_qxlw", "B");
baseDao.loadPromptData(dt);
return dt;
}
--
Gitblit v1.9.2