From 44b1fe9c919f833151445a30ba978beb041f8692 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 11:43:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java |   51 ++++++++++++++++++---------------------------------
 1 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 0784857..ce0020d 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -1,24 +1,8 @@
 package com.consum.base.controller;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.compress.utils.Lists;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.ReflectUtil;
 import com.consum.base.BaseController;
 import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.core.utils.PageUtil;
@@ -27,11 +11,7 @@
 import com.consum.base.pojo.dto.GoodModelInfoDTO;
 import com.consum.base.pojo.excel.ProcureExcelTemplate;
 import com.consum.base.pojo.query.FormProcureQry;
-import com.consum.base.pojo.response.FormProcureVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.GoodsTemplateCountVO;
-import com.consum.base.pojo.response.GoodsTemplateInfoVO;
-import com.consum.base.pojo.response.LWhFormProcureExtendVO;
+import com.consum.base.pojo.response.*;
 import com.consum.base.service.LWhFormProcureGoodsService;
 import com.consum.base.service.LWhFormProcureService;
 import com.consum.base.service.LWhProcureModelService;
@@ -44,14 +24,19 @@
 import com.walker.infrastructure.utils.CollectionUtils;
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.web.ResponseValue;
-
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
-import cn.hutool.core.util.ReflectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Field;
+import java.util.*;
 
 /**
  * @ClassName LWhFormProcureController
@@ -276,11 +261,11 @@
         CommonUtil.copyProperties(formProcureQry, param2);
         formProcureQry = param2;
 
-        S_user_core currentUser = this.getCurrentUser();
-        if (currentUser == null) {
+        FinSysTenantUser sysInfo = this.getSysInfo();
+        if (sysInfo == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
-
+        formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
         GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
         return ResponseValue.success(genericPager);
     }
@@ -289,7 +274,7 @@
     @ApiImplicitParams({
         @ApiImplicitParam(name = "id", value = "閲囪喘鍗昳d", required = true, dataType = "Long", paramType = "query")})
     @GetMapping("/list/export")
-    public void export(Long id, HttpServletResponse response) throws Exception {
+    public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
         TemplateExportParams params = new TemplateExportParams("import/閲囪喘鍏ュ簱鍗�.xls");
         params.setHeadingStartRow(2);
         FinSysTenantUser sysInfo = this.getSysInfo();
@@ -320,7 +305,7 @@
         map.put("totalAmount", totalAmount);
 
         Workbook workbook = ExcelExportUtil.exportExcel(params, ProcureExcelTemplate.class, exportList, map);
-        downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+        return ResponseValue.success(downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook));
 
     }
 }

--
Gitblit v1.9.1