From d6a442fa7c8b9be884870c030968786b8f04b2d6 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 29 十一月 2023 15:02:16 +0800
Subject: [PATCH] feat: 部门台账
---
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
index f9e8b0b..eef390c 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
@@ -1,21 +1,25 @@
package com.consum.base.controller;
+import cn.hutool.core.util.ReflectUtil;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.response.WarehouseFlowVO;
import com.consum.base.service.LWarehouseFlowService;
+import com.consum.model.po.FinSysTenantUser;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Map;
-import javax.annotation.Resource;
import org.apache.commons.compress.utils.Lists;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Map;
/**
* @ClassName lWarehouseFlowController
@@ -31,7 +35,12 @@
private LWarehouseFlowService lWarehouseFlowService;
@GetMapping("/list")
- public ResponseValue queryFormProcureList(LWarehouseFlowParam param) {
+ public ResponseValue queryFormProcureList() {
+ LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
+ LWarehouseFlowParam param2 = new LWarehouseFlowParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -44,8 +53,9 @@
});
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
- fieldDatas.setAccessible(true);
- fieldDatas.set(genericPager, result);
+// fieldDatas.setAccessible(true);
+// fieldDatas.set(genericPager, result);
+ ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
@@ -55,7 +65,11 @@
@GetMapping("/detail/list")
- public ResponseValue queryFormProcureList1(LWarehouseFlowParam param) {
+ public ResponseValue queryFormProcureList1() {
+ LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
+ LWarehouseFlowParam param2 = new LWarehouseFlowParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -64,4 +78,51 @@
return ResponseValue.success(genericPager);
}
+ @GetMapping("/getTaiZhangList")
+ public ResponseValue getTaiZhangList() {
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
+ LWarehouseFlowParam param2 = new LWarehouseFlowParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ Long paramAgencyId = param.getAgencyId();
+ if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryTaiZhangList(param);
+ return ResponseValue.success(genericPager);
+ }
+
+ /**
+ * 閮ㄩ棬鍙拌处
+ *
+ * @return
+ */
+ @GetMapping("/getDeptTaiZhangList")
+ public ResponseValue getDeptTaiZhangList() {
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
+ LWarehouseFlowParam param2 = new LWarehouseFlowParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ Long paramAgencyId = param.getAgencyId();
+ if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryDeptTaiZhangList(param);
+ return ResponseValue.success(genericPager);
+ }
+
}
--
Gitblit v1.9.1