From a44e41f30ec70520528a5a089d38eb90d78b6842 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期一, 30 十月 2023 14:26:06 +0800
Subject: [PATCH] 项目台账和出库台账策略权限
---
product-server-project-management/src/main/java/com/product/project/management/service/ProjectOutService.java | 23 +++++++++++++++++++++++
product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java | 9 +--------
product-server-project-management/src/main/java/com/product/project/management/controller/ProjectOutController.java | 22 ++++++++++++++++++++++
3 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectOutController.java b/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectOutController.java
index d9691de..6a23e4f 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectOutController.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectOutController.java
@@ -4,6 +4,7 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.module.sys.version.ApiVersion;
+import com.product.project.management.config.Cmnconst;
import com.product.project.management.config.SystemCode;
import com.product.project.management.service.ProjectOutService;
import com.product.util.BaseUtil;
@@ -24,6 +25,27 @@
public class ProjectOutController extends AbstractBaseController {
@Autowired
ProjectOutService projectOutService;
+
+ @RequestMapping(value = "/list/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String listOutBound(HttpServletRequest request) {
+ try {
+ // 鑾峰彇鍙傛暟
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ if (BaseUtil.strIsNull(fse.getString(Cmnconst.CPAGE)) || BaseUtil.strIsNull(fse.getString(Cmnconst.PAGESIZE))) {
+ return this.error(SystemCode.SYSTEM_CPAGES_NOT_NULL.getValue(), SystemCode.SYSTEM_CPAGES_NOT_NULL.getText());
+ }
+ return OK_List(projectOutService.listOutBound(fse.getInteger(Cmnconst.CPAGE), fse.getInteger(Cmnconst.PAGESIZE), fse.getString("filter")));
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return this.error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return this.error(SystemCode.PROJeCT_OUT_CANCELOUTBOUND_ERROR.getValue(),
+ SystemCode.PROJeCT_OUT_CANCELOUTBOUND_ERROR.getText() + e.getMessage());
+ }
+ }
+
/**
* 鎾ら攢鍑哄簱
*
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 d129de1..b1babe8 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
@@ -13,7 +13,6 @@
import com.product.core.exception.BaseException;
import com.product.core.permission.PermissionService;
import com.product.core.service.support.AbstractBaseService;
-import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.project.management.config.Cmnconst;
import com.product.project.management.config.SystemCode;
import com.product.util.BaseUtil;
@@ -38,13 +37,7 @@
public DataTableEntity listProjectByCreated(Integer cpage, Integer pageSize) {
String queryFilter = permissionService.getDataFilter(Cmnconst.PRODUCT_PROJECT_QXLW, "project_leader,materialman");
-
-
- FieldSetEntity fseCurrentUser = SpringMVCContextHolder.getCurrentUser().getCurrentStaff();
- String leaderCode = fseCurrentUser.getString("leader_tricode")+"%";
-
- String filter =" project_leader in (select user_id from product_sys_staffs where leader_tricode like ?) OR materialman in (select user_id from product_sys_staffs where leader_tricode like ?)";
- DataTableEntity dt = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_QXLW, filter, new Object [] {leaderCode, leaderCode}, null, Cmnconst.CREATED_UTC_DATETIME_DESC, pageSize, cpage);
+ DataTableEntity dt = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_QXLW, queryFilter, new Object [] {}, null, Cmnconst.CREATED_UTC_DATETIME_DESC, pageSize, cpage);
baseDao.loadPromptData(dt);
return dt;
}
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 978b649..35cdb70 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,8 +1,13 @@
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.project.management.config.Cmnconst;
+import com.product.util.BaseUtil;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -14,6 +19,24 @@
*/
@Component
public class ProjectOutService extends AbstractBaseService {
+
+ @Autowired
+ PermissionService permissionService;
+
+
+ public DataTableEntity listOutBound(Integer cpage, Integer pageSize, String filter) {
+
+ String queryFilter = permissionService.getDataFilter(Cmnconst.PRODUCT_PROJECT_QXLW, "project_leader,materialman");
+ if (!BaseUtil.strIsNull(queryFilter)) {
+ filter += " AND " + queryFilter;
+ }
+
+ 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);
+ baseDao.loadPromptData(dt);
+ return dt;
+ }
+
/**
* 鍑哄簱鎾ら攢
*/
--
Gitblit v1.9.2