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/ProjectInfoService.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
index 21dd0f8..bb26ffd 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
@@ -11,7 +11,9 @@
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
+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.project.management.config.SystemCode;
import com.product.util.BaseUtil;
@@ -23,7 +25,34 @@
@Autowired
BaseDao baseDao;
-
+
+ @Autowired
+ PermissionService permissionService;
+
+ @Autowired
+ QueryFilterService queryFilterService;
+
+ /**
+ * 椤圭洰淇℃伅鍒楄〃
+ * @param cpage
+ * @param pageSize
+ * @return
+ */
+ public DataTableEntity listProjectByCreated(FieldSetEntity fse) {
+ String queryFilter = " 1 = 1 ";
+ String searchFilter = queryFilterService.getQueryFilter(fse);
+ if (!BaseUtil.strIsNull(searchFilter)) {
+ queryFilter += " AND " + searchFilter;
+ }
+ String limitFilter = permissionService.getDataFilter(Cmnconst.PRODUCT_PROJECT_QXLW, "project_leader,materialman");
+ if (!BaseUtil.strIsNull(limitFilter)) {
+ queryFilter += " AND " + limitFilter;
+ }
+ DataTableEntity dt = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_QXLW, queryFilter, new Object [] {}, null, Cmnconst.CREATED_UTC_DATETIME_DESC, fse.getInteger(Cmnconst.PAGESIZE), fse.getInteger(Cmnconst.CPAGE));
+ baseDao.loadPromptData(dt);
+ return dt;
+ }
+
/**
* 閫氳繃椤圭洰绫诲瀷鑾峰彇椤圭洰鍒嗛」锛堣幏鍙栨ā鏉垮垎椤癸級
*
@@ -60,7 +89,7 @@
* @return
*/
public DataTableEntity getProjectAllItem(String uuid) {
- DataTableEntity dtProjectItemize = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_ITEM, "project_uuid=?", new Object[]{uuid}, new Object[]{CoreConst.UUID, Cmnconst.ITEMIZE, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE});
+ DataTableEntity dtProjectItemize = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_ITEM, "project_uuid=?", new Object[]{uuid}, new Object[]{CoreConst.UUID, Cmnconst.ITEMIZE, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE, Cmnconst.ITEMIZE_FULL_NAME});
if (!BaseUtil.dataTableIsEmpty(dtProjectItemize)) {
DataTableEntity newDtProjectItem = BaseUtil.dataTableToTreeTable(dtProjectItemize, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE, null);
return newDtProjectItem;
--
Gitblit v1.9.2