From 0ec6c7ee0b8236cbc6f49a8cc0e466099a09e08d Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期一, 27 十一月 2023 10:25:32 +0800
Subject: [PATCH] 物品报废

---
 consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 6 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 1200252..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,27 @@
 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.model.po.FinSysTenantUser;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.web.ResponseValue;
+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
- * @Author cy
  * @Date 2023/10/27
  * @Description
  * @Version 1.0
@@ -23,14 +29,10 @@
 @RestController
 @RequestMapping("/pc/warehouse/flow")
 public class LWarehouseFlowController extends BaseController {
+
     @Resource
     private LWarehouseFlowService lWarehouseFlowService;
 
-    /**
-     * 鍑哄叆搴撴槑缁�
-     * @param param
-     * @return
-     */
     @GetMapping("/list")
     public ResponseValue queryFormProcureList(LWarehouseFlowParam param) {
         S_user_core currentUser = this.getCurrentUser();
@@ -38,6 +40,49 @@
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
         GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryBusinessFlow(param);
+        ArrayList<WarehouseFlowVO> result = Lists.newArrayList();
+        genericPager.getDatas().forEach(map -> {
+            WarehouseFlowVO warehouseFlowVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), WarehouseFlowVO.class);
+            result.add(warehouseFlowVO);
+        });
+        try {
+            Field fieldDatas = GenericPager.class.getDeclaredField("datas");
+            fieldDatas.setAccessible(true);
+            fieldDatas.set(genericPager, result);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+
         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