From 13b0bad30ef1df53492cbab1c1b99dfc02dee63f Mon Sep 17 00:00:00 2001 From: haoyahui <2032914783@qq.com> Date: 星期二, 21 十一月 2023 17:51:16 +0800 Subject: [PATCH] 台账管理,盘点任务开发 --- consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java | 43 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 38 insertions(+), 5 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 3608468..5177428 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,24 @@ package com.consum.base.controller; 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.base.util.MapUtils; +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 @@ -52,4 +55,34 @@ return ResponseValue.success(genericPager); } + + + @GetMapping("/detail/list") + public ResponseValue queryFormProcureList1(LWarehouseFlowParam param) { + S_user_core currentUser = this.getCurrentUser(); + if (currentUser == null) { + return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); + } + GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryBusinessFlow(param); + 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); + /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/ + 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); + } + } -- Gitblit v1.9.1