From 3be9cfcb6b59366b936821966d20a998a6895f9f Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 30 四月 2024 14:38:13 +0800
Subject: [PATCH] bug41、42修改
---
consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java b/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java
index 2dd853c..0c353bf 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java
@@ -10,6 +10,7 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.core.io.ClassPathResource;
@@ -21,6 +22,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -32,6 +34,7 @@
* @Description 浠撳簱鍙拌处
* @Version 1.0
**/
+@Api(value = "浠撳簱鍙拌处", tags = "浠撳簱鍙拌处")
@RestController
@RequestMapping("/pc/fin/warehouse/ledger")
public class FinWarehouseLedgerController extends BaseController {
@@ -46,6 +49,9 @@
@RequestMapping("/getList")
public ResponseValue getLedgerList() {
LWhLedgerQry param = CommonUtil.getObjFromReq(LWhLedgerQry.class);
+ LWhLedgerQry query = new LWhLedgerQry();
+ CommonUtil.copyProperties(param, query);
+ param = query;
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -58,6 +64,7 @@
param.setAgencyId(Long.valueOf(tenantId));
}
param.setStates((short) 1);
+ param.setWarehouseType((short) 0);
GenericPager pager = finWarehouseLedgerService.ledgerList(param);
return ResponseValue.success(pager);
}
@@ -65,6 +72,9 @@
@RequestMapping("/getListExport")
public void getListExport(HttpServletResponse response) throws Exception {
LWhLedgerQry param = CommonUtil.getObjFromReq(LWhLedgerQry.class);
+ LWhLedgerQry query = new LWhLedgerQry();
+ CommonUtil.copyProperties(param, query);
+ param = query;
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return;
@@ -77,6 +87,7 @@
param.setAgencyId(Long.valueOf(tenantId));
}
param.setStates((short) 1);
+ param.setWarehouseType((short) 0);
param.setPageNum(1);
param.setPageSize(Integer.MAX_VALUE);
GenericPager<Map<String, Object>> pager = finWarehouseLedgerService.ledgerList(param);
@@ -101,4 +112,83 @@
}
}
+
+ /**
+ * @Description 鍒嗛〉鍒楄〃鏌ヨ
+ * @Author wh
+ * @Date 2023/7/11 13:59
+ */
+ @RequestMapping("/getDeptLedgerList")
+ public ResponseValue getDeptLedgerList() {
+ LWhLedgerQry param = CommonUtil.getObjFromReq(LWhLedgerQry.class);
+ LWhLedgerQry query = new LWhLedgerQry();
+ CommonUtil.copyProperties(param, query);
+ param = query;
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ Long paramAgencyId = param.getAgencyId();
+ if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+ ArrayList<Short> statesList = new ArrayList<>();
+ statesList.add((short)1);
+ statesList.add((short)2);
+ param.setStatesList(statesList);
+ param.setWarehouseType((short) 1);
+ GenericPager pager = finWarehouseLedgerService.depLedgerList(param);
+ return ResponseValue.success(pager);
+ }
+
+ @RequestMapping("/getDeptListExport")
+ public void getDeptListExport(HttpServletResponse response) throws Exception {
+ LWhLedgerQry param = CommonUtil.getObjFromReq(LWhLedgerQry.class);
+ LWhLedgerQry query = new LWhLedgerQry();
+ CommonUtil.copyProperties(param, query);
+ param = query;
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return;
+ }
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ Long paramAgencyId = param.getAgencyId();
+ if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+ ArrayList<Short> statesList = new ArrayList<>();
+ statesList.add((short)1);
+ statesList.add((short)2);
+ param.setStatesList(statesList);
+ param.setWarehouseType((short) 1);
+ param.setPageNum(1);
+ param.setPageSize(Integer.MAX_VALUE);
+ GenericPager<Map<String, Object>> pager = finWarehouseLedgerService.depLedgerList(param);
+ List<Map<String, Object>> datas = pager.getDatas();
+ org.springframework.core.io.Resource resource = new ClassPathResource("import/depTaiZhangExpTemp.xlsx");
+ // 鑾峰彇鏂囦欢杈撳叆娴�
+ InputStream inputStream = resource.getInputStream();
+ Workbook wb = new XSSFWorkbook(inputStream);
+ TemplateExportParams params = new TemplateExportParams();
+ params.setTemplateWb(wb);
+
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("dataList", datas);
+
+ Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+ // 璁剧疆鍝嶅簲澶�
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("搴撳瓨鏌ヨ.xlsx", "utf-8"));
+ try (OutputStream outputStream = response.getOutputStream()) {
+ workbook.write(outputStream);
+ workbook.close();
+ }
+
+ }
+
}
--
Gitblit v1.9.1