From 79a57e0844bdd3b5f06ebaac807a0896624be70f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 01 十二月 2023 10:24:06 +0800
Subject: [PATCH] 导出结构调整
---
consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java | 41 ++++
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 23 --
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 38 ---
deploy-jar-single/src/main/resources/import/调拨入库单.xls | 0
deploy-jar-single/src/main/resources/import/采购入库单.xls | 0
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 51 +++--
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 34 ---
deploy-jar-single/src/main/resources/import/采购退货单.xls | 0
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 66 +++----
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 34 ---
deploy-jar-single/src/main/resources/import/调拨出库单.xls | 0
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 50 +++-
/dev/null | 0
consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java | 39 ++++
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 46 +++-
consum-base/src/main/java/com/consum/base/BaseController.java | 19 ++
consum-base/src/main/java/com/consum/base/pojo/excel/TransferExcelTemplate.java | 42 ++++
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 3
18 files changed, 288 insertions(+), 198 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/BaseController.java b/consum-base/src/main/java/com/consum/base/BaseController.java
index b379508..0ed10f4 100644
--- a/consum-base/src/main/java/com/consum/base/BaseController.java
+++ b/consum-base/src/main/java/com/consum/base/BaseController.java
@@ -5,6 +5,12 @@
import com.iplatform.base.util.UserUtils;
import com.iplatform.core.BeanContextAware;
import com.iplatform.model.po.S_user_core;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.poi.ss.usermodel.Workbook;
public abstract class BaseController extends PlatformAdapterController {
@@ -38,4 +44,17 @@
// 浠庣紦瀛樹腑鍙栧嚭鐢ㄦ埛锛屽鏋滄病鏈夊垯鏂板
return this.getFinSysTenantUserCache().get(String.valueOf(userInfo.getId()));
}
+
+ protected void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws IOException {
+ OutputStream out = response.getOutputStream();
+ response.setCharacterEncoding("UTF-8");
+ response.setHeader("content-Type", "application/vnd.ms-excel");
+ response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName + ".xls", "UTF-8"));
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ workbook.write(byteArrayOutputStream);
+ response.setHeader("Content-Length", String.valueOf(byteArrayOutputStream.size()));
+ out.write(byteArrayOutputStream.toByteArray());
+ workbook.close();
+ out.close();
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
index 710f2f3..e72ee86 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -26,10 +26,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -317,8 +313,11 @@
}
@ApiOperation(value = "鐩樼偣鍗曞鍑�", notes = "鐩樼偣鍗曞鍑�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")
+ })
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws IOException {
+ public void export(Long id, HttpServletResponse response) throws Exception {
List<InventoryExcelTemplate> exportList = lWhFormInventoryService.getExportList(id);
if (CollectionUtils.isEmpty(exportList)) {
@@ -343,20 +342,6 @@
exportList, map);
downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
- }
-
- private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) {
- try (OutputStream out = response.getOutputStream()) {
- response.setCharacterEncoding("UTF-8");
- response.setHeader("content-Type", "application/vnd.ms-excel");
- response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName + ".xls", "UTF-8"));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- workbook.write(baos);
- response.setHeader("Content-Length", String.valueOf(baos.size()));
- out.write(baos.toByteArray());
- } catch (Exception e) {
- logger.error("瀵煎嚭鏂囦欢澶辫触", e);
- }
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 0640508..c025739 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -9,6 +9,7 @@
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.pojo.excel.OutputExcelTemplate;
import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.base.pojo.response.FormOutputGoodsVO;
import com.consum.base.pojo.response.FormOutputTemplateInfoVO;
@@ -23,20 +24,18 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.infrastructure.utils.DateUtils;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.lang.reflect.Field;
-import java.net.URLEncoder;
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;
@@ -209,41 +208,45 @@
@ApiOperation(value = "鍑哄簱鍗曞鍑�", notes = "鍑哄簱鍗曞鍑�")
+ @ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws IOException {
+ public void export(Long id, HttpServletResponse response) throws Exception {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
ClassPathResource classPathResource = new ClassPathResource("import/閲囪喘閫�璐у崟.xls");
// 鑾峰彇鏂囦欢杈撳叆娴�
InputStream inputStream = classPathResource.getInputStream();
Workbook wb = new HSSFWorkbook(inputStream);
TemplateExportParams params = new TemplateExportParams();
params.setTemplateWb(wb);
+ params.setHeadingStartRow(2);
- FinSysTenantUser sysInfo = this.getSysInfo();
- String userName = sysInfo.getUserName();
-
- Map<String, Object> map = lWhFormOutputService.getExportList(id, userName);
- if (CollectionUtils.isEmpty(map)) {
+ List<OutputExcelTemplate> exportList = lWhFormOutputService.getExportList(id);
+ if (CollectionUtils.isEmpty(exportList)) {
throw new RuntimeException("鏁版嵁涓虹┖");
}
+ int countNum = exportList.stream().filter(item -> item.getNum() != null).mapToInt(OutputExcelTemplate::getNum).sum();
+ int totalAmount = exportList.stream().filter(item -> item.getTotalAmount() != null).mapToInt(OutputExcelTemplate::getTotalAmount).sum();
+ Optional<OutputExcelTemplate> first = exportList.stream().findFirst();
+ OutputExcelTemplate templateExcelExport = first.get();
+ String businessFormCode = templateExcelExport.getBusinessFormCode();
+ Long createTime = templateExcelExport.getCreateTime();
+ String operatorName = templateExcelExport.getOperatorName();
- Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", businessFormCode);
+ map.put("date", DateUtils.toShowDate(createTime));
+ map.put("name", operatorName);
+ map.put("countNum", countNum);
+ map.put("totalAmount", totalAmount);
+
+ Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
downLoadExcel("閲囪喘閫�璐у崟", response, workbook);
}
- private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) {
- try (OutputStream out = response.getOutputStream()) {
- response.setCharacterEncoding("UTF-8");
- response.setHeader("content-Type", "application/vnd.ms-excel");
- response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName + ".xls", "UTF-8"));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- workbook.write(baos);
- response.setHeader("Content-Length", String.valueOf(baos.size()));
- out.write(baos.toByteArray());
- } catch (Exception e) {
- logger.error("瀵煎嚭鏂囦欢澶辫触", e);
- }
- }
}
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 f621b84..15235d3 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
@@ -14,6 +14,7 @@
import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
import com.consum.base.pojo.LWhFormProcureParam;
import com.consum.base.pojo.LWhProcureModelParam;
+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.FromProcureTemplateInfoVO;
@@ -38,21 +39,20 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
-import java.io.OutputStream;
import java.lang.reflect.Field;
-import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -421,25 +421,41 @@
}
@ApiOperation(value = "閲囪喘鍗曞鍑�", notes = "閲囪喘鍗曞鍑�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "閲囪喘鍗昳d", required = true, dataType = "Long", paramType = "query")
+ })
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws IOException {
+ public void export(Long id, HttpServletResponse response) throws Exception {
TemplateExportParams params = new TemplateExportParams(
"import/閲囪喘鍏ュ簱鍗�.xls");
-
+ params.setHeadingStartRow(2);
FinSysTenantUser sysInfo = this.getSysInfo();
- String userName = sysInfo.getUserName();
+ if (sysInfo == null) {
+ throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
- Map<String, Object> map = lWhFormProcureService.getExportList(id, userName);
- if (CollectionUtils.isEmpty(map)) {
+ List<ProcureExcelTemplate> exportList = lWhFormProcureService.getExportList(id);
+ if (CollectionUtils.isEmpty(exportList)) {
throw new RuntimeException("鏁版嵁涓虹┖");
}
- Workbook workbook = ExcelExportUtil.exportExcel(params, map);
- try (OutputStream outputStream = response.getOutputStream()) {
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
- response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("閲囪喘鍏ュ簱鍗�.xls", "utf-8"));
- workbook.write(outputStream);
- workbook.close();
- }
+ int countNum = exportList.stream().filter(item -> item.getNum() != null).mapToInt(ProcureExcelTemplate::getNum).sum();
+ int totalAmount = exportList.stream().filter(export -> export.getTotalAmount() != null).mapToInt(ProcureExcelTemplate::getTotalAmount).sum();
+ Optional<ProcureExcelTemplate> first = exportList.stream().findFirst();
+ ProcureExcelTemplate templateExcelExport = first.get();
+ String businessFormCode = templateExcelExport.getBusinessFormCode();
+ Long createTime = templateExcelExport.getCreateTime();
+ String operatorName = templateExcelExport.getOperatorName();
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", businessFormCode);
+ map.put("date", DateUtils.toShowDate(createTime));
+ map.put("name", operatorName);
+ map.put("countNum", countNum);
+ map.put("totalAmount", totalAmount);
+
+ Workbook workbook = ExcelExportUtil.exportExcel(params, ProcureExcelTemplate.class, exportList, map);
+ downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+
}
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
index 0141f0d..d37dd49 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
@@ -168,51 +168,41 @@
return ResponseValue.success(pageUtil);
}
- /**
- * @Description 瀵煎嚭鎶ュ簾鐧昏鍗�
- * @Author 鍗㈠簡闃�
- * @Date 2023/11/2
- */
+ @ApiOperation(value = "瀵煎嚭鎶ュ簾鍗�", notes = "瀵煎嚭鎶ュ簾鍗�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")
+ })
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) {
+ public void export(Long id, HttpServletResponse response) throws Exception {
if (id == null) {
throw new RuntimeException("鎶ュ簾鍗昳d涓虹┖");
}
- try {
- OutputStream outputStream = response.getOutputStream();
- List<ScrappedInfoExcelTemplate> export = lWhFormScrappedService.export(id);
- if (CollectionUtils.isEmpty(export)) {
- throw new RuntimeException("鏁版嵁涓虹┖");
- }
- TemplateExportParams exportParams = new TemplateExportParams("import/鎶ュ簾鐧昏鍗�.xlsx");
- exportParams.setHeadingStartRow(2);
- Optional<ScrappedInfoExcelTemplate> first = export.stream().findFirst();
- ScrappedInfoExcelTemplate scrappedInfoExcelTemplate = first.get();
- Long dealTime = scrappedInfoExcelTemplate.getDealTime();
- String operatorName = scrappedInfoExcelTemplate.getOperatorName();
- String businessFormCode = scrappedInfoExcelTemplate.getBusinessFormCode();
-
- int countNum = export.stream().filter(item -> item.getNum() != null).mapToInt(ScrappedInfoExcelTemplate::getNum).sum();
- int totalAmount = export.stream().filter(item -> item.getTotalAmount() != null).mapToInt(ScrappedInfoExcelTemplate::getTotalAmount).sum();
-
- Map<String, Object> map = new HashMap<>();
- map.put("code", businessFormCode);
- map.put("date", DateUtils.toShowDate(dealTime));
- map.put("name", operatorName);
- map.put("countNum", countNum);
- map.put("totalAmount", totalAmount);
-
- Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
- // 璁剧疆鍝嶅簲澶�
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
- response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("鎶ュ簾鍗曠櫥璁�.xlsx", "utf-8"));
- sheets.write(outputStream);
- sheets.close();
- } catch (IOException e) {
- throw new RuntimeException(e);
+ List<ScrappedInfoExcelTemplate> export = lWhFormScrappedService.export(id);
+ if (CollectionUtils.isEmpty(export)) {
+ throw new RuntimeException("鏁版嵁涓虹┖");
}
+ TemplateExportParams exportParams = new TemplateExportParams("import/鎶ュ簾鐧昏鍗�.xlsx");
+ exportParams.setHeadingStartRow(2);
+ Optional<ScrappedInfoExcelTemplate> first = export.stream().findFirst();
+ ScrappedInfoExcelTemplate scrappedInfoExcelTemplate = first.get();
+ Long dealTime = scrappedInfoExcelTemplate.getDealTime();
+ String operatorName = scrappedInfoExcelTemplate.getOperatorName();
+ String businessFormCode = scrappedInfoExcelTemplate.getBusinessFormCode();
+
+ int countNum = export.stream().filter(item -> item.getNum() != null).mapToInt(ScrappedInfoExcelTemplate::getNum).sum();
+ int totalAmount = export.stream().filter(item -> item.getTotalAmount() != null).mapToInt(ScrappedInfoExcelTemplate::getTotalAmount).sum();
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", businessFormCode);
+ map.put("date", DateUtils.toShowDate(dealTime));
+ map.put("name", operatorName);
+ map.put("countNum", countNum);
+ map.put("totalAmount", totalAmount);
+
+ Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
+ downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets);
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index af3e13f..7769dae 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -13,6 +13,7 @@
import com.consum.base.pojo.RecordUserInfoVO;
import com.consum.base.pojo.UseRecordSkuVO;
import com.consum.base.pojo.dto.UseRecordDTO;
+import com.consum.base.pojo.excel.TransferExcelTemplate;
import com.consum.base.pojo.query.TransferQry;
import com.consum.base.pojo.request.LWhFormTransferParam;
import com.consum.base.pojo.request.ProcureModelInfoParam;
@@ -41,10 +42,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
-import java.io.OutputStream;
import java.lang.reflect.Field;
-import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
@@ -301,29 +299,47 @@
return ResponseValue.success();
}
- /**
- * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/31
- */
+
+ @ApiOperation(value = "璋冩嫧鍗曞鍑�", notes = "璋冩嫧鍗曞鍑�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
+ @ApiImplicitParam(name = "type", value = "瀵煎嚭绫诲瀷 1 鍏ュ簱 2 鍑哄簱", required = true, dataType = "Integer"),
+ })
@GetMapping("/list/export")
- public void export(Long id, Integer type, HttpServletResponse response) throws IOException {
+ public void export(Long id, Integer type, HttpServletResponse response) throws Exception {
TemplateExportParams params;
+ String fileName;
if (type == 1) {
params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�.xls");
+ fileName = "璋冩嫧鍏ュ簱鍗�";
} else {
params = new TemplateExportParams("import/璋冩嫧鍑哄簱鍗�.xls");
+ fileName = "璋冩嫧鍑哄簱鍗�";
}
- Map<String, Object> map = this.lWhFormTransferService.export(id, type);
+ params.setHeadingStartRow(2);
+ List<TransferExcelTemplate> export = this.lWhFormTransferService.export(id, type);
- Workbook workbook = ExcelExportUtil.exportExcel(params, map);
- try (OutputStream outputStream = response.getOutputStream()) {
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
- response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("璋冩嫧鍏ュ簱鍗�.xls", "utf-8"));
- workbook.write(outputStream);
- workbook.close();
- }
+ int countNum = export.stream().filter(item -> item.getNum() != null).mapToInt(TransferExcelTemplate::getNum).sum();
+ int totalAmount = export.stream().filter(item -> item.getTotalAmount() != null).mapToInt(TransferExcelTemplate::getTotalAmount).sum();
+ Optional<TransferExcelTemplate> first = export.stream().findFirst();
+ TransferExcelTemplate entity = first.get();
+ String businessFormCode = entity.getBusinessFormCode();
+ Long createTime = entity.getCreateTime();
+ String operatorName = entity.getOperatorName();
+ String tenantName = entity.getTenantName();
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", businessFormCode);
+ map.put("date", DateUtils.toShowDate(createTime));
+ map.put("tenantName", tenantName);
+ map.put("name", operatorName);
+ map.put("countNum", countNum);
+ map.put("totalAmount", totalAmount);
+
+ Workbook workbook = ExcelExportUtil.exportExcel(params, TransferExcelTemplate.class, export, map);
+ downLoadExcel(fileName, response, workbook);
+
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java
new file mode 100644
index 0000000..8ba8109
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java
@@ -0,0 +1,39 @@
+package com.consum.base.pojo.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelIgnore;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: 鍑哄簱鍗曞鍑烘ā鏉�
+ * @date 2023/12/1 9:13
+ */
+@Data
+public class OutputExcelTemplate implements Serializable {
+
+ @Excel(name = "鍗曚綅")
+ private String tenantName;
+ @Excel(name = "鐗╁搧鍚嶇О")
+ private String templateName;
+ @Excel(name = "鐗╁搧鍨嬪彿/瑙勬牸")
+ private String baseModelName;
+ @Excel(name = "鏁伴噺")
+ private Integer num;
+ @Excel(name = "鍗曚环")
+ private Integer price;
+ @Excel(name = "閲戦")
+ private Integer totalAmount;
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+
+ @ExcelIgnore
+ private String businessFormCode;
+ @ExcelIgnore
+ private Long createTime;
+ @ExcelIgnore
+ private String operatorName;
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java
new file mode 100644
index 0000000..007f831
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java
@@ -0,0 +1,41 @@
+package com.consum.base.pojo.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelIgnore;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: 閲囪喘鍗曞鍑烘ā鏉�
+ * @date 2023/12/1 9:35
+ */
+@Data
+public class ProcureExcelTemplate implements Serializable {
+
+ @Excel(name = "鍗曚綅")
+ private String tenantName;
+ @Excel(name = "鐗╁搧鍚嶇О")
+ private String templateName;
+ @Excel(name = "鐗╁搧鍨嬪彿/瑙勬牸")
+ private String baseModelName;
+ @Excel(name = "鏁伴噺")
+ private Integer num;
+ @Excel(name = "鍗曚环")
+ private Integer price;
+ @Excel(name = "閲戦")
+ private Integer totalAmount;
+ @Excel(name = "瀛樻斁鍦扮偣")
+ private String warehouseName;
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+
+ @ExcelIgnore
+ private String businessFormCode;
+ @ExcelIgnore
+ private Long createTime;
+ @ExcelIgnore
+ private String operatorName;
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/TransferExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/TransferExcelTemplate.java
new file mode 100644
index 0000000..59ee5bd
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/TransferExcelTemplate.java
@@ -0,0 +1,42 @@
+package com.consum.base.pojo.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelIgnore;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: 璋冩嫧瀵煎嚭excel妯℃澘
+ * @date 2023/12/1 10:02
+ */
+@Data
+public class TransferExcelTemplate implements Serializable {
+
+ @Excel(name = "鍗曚綅")
+ private String tenantName;
+ @Excel(name = "鐗╁搧鍚嶇О")
+ private String templateName;
+ @Excel(name = "鐗╁搧鍨嬪彿/瑙勬牸")
+ private String baseModelName;
+ @Excel(name = "鏁伴噺")
+ private Integer num;
+ @Excel(name = "閲戦")
+ private Integer totalAmount;
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+
+ @ExcelIgnore
+ private String businessFormCode;
+ @ExcelIgnore
+ private Long createTime;
+ @ExcelIgnore
+ private String operatorName;
+ @ExcelIgnore
+ private String inAgencyName;
+ @ExcelIgnore
+ private String outAgencyName;
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index f0eb6f9..13f4f61 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -381,6 +381,9 @@
List<InventoryExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
InventoryExcelTemplate inventoryExcelTemplate = MapUtils.convertMapToObj(item, InventoryExcelTemplate.class);
+ inventoryExcelTemplate.setInventoryDeception(inventoryExcelTemplate.getInventoryResult() == 1 ? "鏄�" : "鍚�");
+ inventoryExcelTemplate.setDeception(
+ inventoryExcelTemplate.getInventoryResult() == 1 ? "姝ｅ父" : (inventoryExcelTemplate.getInventoryResult() == 2 ? "鐩樼泩" : "鐩樹簭"));
list.add(inventoryExcelTemplate);
});
return list;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index b022376..8beeee4 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -10,7 +10,7 @@
import com.consum.base.pojo.LWFormsOutputGoodsInfoParam;
import com.consum.base.pojo.LWFormsOutputGoodsModelParam;
import com.consum.base.pojo.LWhFormOutputParam;
-import com.consum.base.pojo.excel.TemplateExcelExport;
+import com.consum.base.pojo.excel.OutputExcelTemplate;
import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseWarehouse;
@@ -20,14 +20,12 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
-import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.factory.annotation.Autowired;
@@ -231,12 +229,12 @@
}
- public Map<String, Object> getExportList(Long id, String userName) {
+ public List<OutputExcelTemplate> getExportList(Long id) {
String sql = "SELECT\n"
+ "\tfo.BUSINESS_FORM_CODE,\n"
+ "\tfo.AGENCY_NAME tenantName,\n"
- + "\tGOODS_NAME goodsName,\n"
- + "\tpm.BASE_GOODS_MODELS_NAME goodsModeName,\n"
+ + "\tGOODS_NAME templateName,\n"
+ + "\tpm.BASE_GOODS_MODELS_NAME baseModelName,\n"
+ "\tcounts num,\n"
+ "\ttotal_amount totalAmount,\n"
+ "\tfo.DEAL_TIME createTime,\n"
@@ -256,31 +254,13 @@
if (CollectionUtils.isEmpty(select)) {
return null;
}
- List<TemplateExcelExport> list = Lists.newArrayList();
+ List<OutputExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
- TemplateExcelExport templateExcelExport = MapUtils.convertMapToObj(item, TemplateExcelExport.class);
- templateExcelExport.setTenantName(StringUtils.isNotEmpty(templateExcelExport.getTenantName()) ? templateExcelExport.getTenantName() : "");
- templateExcelExport.setRemark(StringUtils.isNotEmpty(templateExcelExport.getRemark()) ? templateExcelExport.getRemark() : "");
- templateExcelExport.setTotalAmount(templateExcelExport.getTotalAmount() == null ? 0 : templateExcelExport.getTotalAmount());
- templateExcelExport.setNum(templateExcelExport.getNum() == null ? 0 : templateExcelExport.getNum());
+ OutputExcelTemplate templateExcelExport = MapUtils.convertMapToObj(item, OutputExcelTemplate.class);
list.add(templateExcelExport);
});
- int sum = list.stream().filter(item -> item.getNum() != null).mapToInt(TemplateExcelExport::getNum).sum();
- int totalAmount = list.stream().filter(export -> export.getTotalAmount() != null).mapToInt(TemplateExcelExport::getTotalAmount).sum();
- Optional<TemplateExcelExport> first = list.stream().findFirst();
- TemplateExcelExport templateExcelExport = first.get();
- String businessFormCode = templateExcelExport.getBusinessFormCode();
- Long createTime = templateExcelExport.getCreateTime();
- String operatorName = templateExcelExport.getOperatorName();
+ return list;
- Map<String, Object> map = new HashMap<>();
- map.put("code", businessFormCode);
- map.put("date", DateUtils.toShowDate(createTime));
- map.put("name", operatorName);
- map.put("sum", sum);
- map.put("totalAmount", totalAmount);
- map.put("data", list);
- return map;
}
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
index de10f94..f2b8590 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
@@ -3,18 +3,16 @@
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.core.utils.PageUtil;
-import com.consum.base.pojo.excel.TemplateExcelExport;
+import com.consum.base.pojo.excel.ProcureExcelTemplate;
import com.consum.base.pojo.query.FormProcureQry;
import com.consum.model.po.LWhFormProcure;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
-import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;
@@ -120,14 +118,14 @@
}
- public Map<String, Object> getExportList(Long id, String userName) {
+ public List<ProcureExcelTemplate> getExportList(Long id) {
String sql = "SELECT\n"
+ "\tfp.BUSINESS_FORM_CODE,\n"
+ "\tfp.AGENCY_NAME tenantName,\n"
+ "\tfp.INCOME_TIME createTime,\n"
+ "\tfp.INCOME_NAME operatorName,\n"
- + "\tGOODS_NAME goodsName,\n"
- + "\tpm.BASE_GOODS_MODELS_NAME goodsModeName,\n"
+ + "\tGOODS_NAME templateName,\n"
+ + "\tpm.BASE_GOODS_MODELS_NAME baseModelName,\n"
+ "\tcounts num,\n"
+ "\tprice,\n"
+ "\ttotal_amount totalAmount,\n"
@@ -147,31 +145,13 @@
return null;
}
- List<TemplateExcelExport> list = Lists.newArrayList();
+ List<ProcureExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
- TemplateExcelExport templateExcelExport = MapUtils.convertMapToObj(item, TemplateExcelExport.class);
- templateExcelExport.setTotalAmount(templateExcelExport.getTotalAmount() == null ? 0 : templateExcelExport.getTotalAmount());
- templateExcelExport.setNum(templateExcelExport.getNum() == null ? 0 : templateExcelExport.getNum());
- templateExcelExport.setTenantName(StringUtils.isNotEmpty(templateExcelExport.getTenantName()) ? templateExcelExport.getTenantName() : "");
- templateExcelExport.setRemark(StringUtils.isNotEmpty(templateExcelExport.getRemark()) ? templateExcelExport.getRemark() : "");
+ ProcureExcelTemplate templateExcelExport = MapUtils.convertMapToObj(item, ProcureExcelTemplate.class);
list.add(templateExcelExport);
});
- int sum = list.stream().filter(item -> item.getNum() != null).mapToInt(TemplateExcelExport::getNum).sum();
- int totalAmount = list.stream().filter(export -> export.getTotalAmount() != null).mapToInt(TemplateExcelExport::getTotalAmount).sum();
- Optional<TemplateExcelExport> first = list.stream().findFirst();
- TemplateExcelExport templateExcelExport = first.get();
- String businessFormCode = templateExcelExport.getBusinessFormCode();
- Long createTime = templateExcelExport.getCreateTime();
- String operatorName = templateExcelExport.getOperatorName();
+ return list;
- Map<String, Object> map = new HashMap<>();
- map.put("code", businessFormCode);
- map.put("date", DateUtils.toShowDate(createTime));
- map.put("name", operatorName);
- map.put("sum", sum);
- map.put("totalAmount", totalAmount);
- map.put("data", list);
- return map;
}
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
index 50e486f..199896f 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
@@ -8,7 +8,7 @@
import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;
import com.consum.base.pojo.LWhProcureModelUserParam;
import com.consum.base.pojo.LWhTransferModelParam;
-import com.consum.base.pojo.excel.TemplateExcelTransfer;
+import com.consum.base.pojo.excel.TransferExcelTemplate;
import com.consum.base.pojo.query.TransferQry;
import com.consum.base.pojo.request.LWhFormTransferParam;
import com.consum.base.pojo.response.DepartGoodsUseInfo;
@@ -17,7 +17,6 @@
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.model.po.*;
import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import org.apache.commons.compress.utils.Lists;
@@ -398,17 +397,16 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
- public Map<String, Object> export(Long id, Integer type) {
+ public List<TransferExcelTemplate> export(Long id, Integer type) {
String sql = "SELECT\n"
+ "\tft.BUSINESS_FORM_CODE,\n"
+ "\tft.OPERATOR_NAME,\n"
+ "\tft.CREATE_TIME,\n"
+ "\tft.IN_AGENCY_NAME,\n"
+ "\tft.OUT_AGENCY_NAME,\n"
- + "\tGOODS_NAME,\n"
- + "\tpm.BASE_GOODS_MODELS_NAME,\n"
+ + "\tGOODS_NAME templateName,\n"
+ + "\tpm.BASE_GOODS_MODELS_NAME baseModelName,\n"
+ "\tpm.COUNTS num,\n"
- + "\tpm.PRICE,\n"
+ "\tpm.total_amount,\n"
+ "\tft.BEIZ1 remark\n"
+ "FROM\n"
@@ -421,9 +419,9 @@
Map<String, Object> paramts = new HashMap<>();
paramts.put("id", id);
List<Map<String, Object>> select = this.select(sql, paramts, new MapperUtil());
- List<TemplateExcelTransfer> list = Lists.newArrayList();
+ List<TransferExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
- TemplateExcelTransfer templateExcelTransfer = MapUtils.convertMapToObj(item, TemplateExcelTransfer.class);
+ TransferExcelTemplate templateExcelTransfer = MapUtils.convertMapToObj(item, TransferExcelTemplate.class);
if (type == 1) {
templateExcelTransfer.setTenantName(templateExcelTransfer.getOutAgencyName());
} else {
@@ -432,29 +430,7 @@
list.add(templateExcelTransfer);
});
- int countNum = list.stream().filter(item -> item.getNum() != null).mapToInt(TemplateExcelTransfer::getNum).sum();
- int totalAmount = list.stream().filter(export -> export.getTotalAmount() != null).mapToInt(TemplateExcelTransfer::getTotalAmount).sum();
- Optional<TemplateExcelTransfer> first = list.stream().findFirst();
- TemplateExcelTransfer entity = first.get();
- String businessFormCode = entity.getBusinessFormCode();
- Long createTime = entity.getCreateTime();
- String operatorName = entity.getOperatorName();
- String tenantName;
- if (type == 1) {
- tenantName = entity.getInAgencyName();
- } else {
- tenantName = entity.getOutAgencyName();
- }
- Map<String, Object> map = new HashMap<>();
- map.put("code", businessFormCode);
- map.put("date", DateUtils.toShowDate(createTime));
- map.put("tenantName", tenantName);
- map.put("name", operatorName);
- map.put("countNum", countNum);
- map.put("totalAmount", totalAmount);
- map.put("data", list);
-
- return map;
+ return list;
}
/**
diff --git "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls" "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls"
index 6a0175c..03a5809 100644
--- "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls"
+++ "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls"
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\207\272\345\272\223\345\215\225.xls" "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\207\272\345\272\223\345\215\225.xls"
index ac62447..3c68ed9 100644
--- "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\207\272\345\272\223\345\215\225.xls"
+++ "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\207\272\345\272\223\345\215\225.xls"
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.xls" "b/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.xls"
index e2bbeba..c7cb79c 100644
--- "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.xls"
+++ "b/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.xls"
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.xlsx" "b/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.xlsx"
deleted file mode 100644
index 70c8101..0000000
--- "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\351\200\200\350\264\247\345\215\225.xls" "b/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\351\200\200\350\264\247\345\215\225.xls"
index 8567af0..a1d7662 100644
--- "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\351\200\200\350\264\247\345\215\225.xls"
+++ "b/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\351\200\200\350\264\247\345\215\225.xls"
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\351\200\200\350\264\247\345\215\225.xlsx" "b/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\351\200\200\350\264\247\345\215\225.xlsx"
deleted file mode 100644
index 8e6b845..0000000
--- "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\351\200\200\350\264\247\345\215\225.xlsx"
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1