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 |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 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 ee309e2..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
@@ -1,19 +1,56 @@
 package com.product.project.management.service;
 
 import com.product.core.dao.BaseDao;
+import com.product.core.entity.DataTableEntity;
 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;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
  * 瀹炵幇鍔熻兘锛�
- *
+ *椤圭洰鍑哄簱
  * @author 浣滆�匸zm]
  * @version 1.0.00  2023-08-01 16:44
  */
 @Component
 public class ProjectOutService  extends AbstractBaseService {
+	
+	@Autowired
+    PermissionService permissionService;
+	
+	@Autowired
+	QueryFilterService queryFilterService;
+	
+	
+	public DataTableEntity listOutBound(FieldSetEntity fse) {
+		
+		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[] {}, 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;
+	}
+	
+    /**
+     * 鍑哄簱鎾ら攢
+     */
     @Autowired
     BaseDao baseDao;
     public void cancelOutbound(FieldSetEntity fse) {

--
Gitblit v1.9.2