From cd146ec4e1f80c6666d7696f75c060c052145d30 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 20:59:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 72 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 34 deletions(-)
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..f78775b 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;
@@ -21,9 +22,9 @@
import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhFormTransferCoreService;
-import com.consum.base.service.LWhFormTransferServiceImpl;
+import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
import com.consum.base.service.LWhProcureModelUserServiceImpl;
@@ -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;
@@ -73,7 +71,7 @@
public class LWhFormTransferController extends BaseController {
@Autowired
- private LWhFormTransferServiceImpl lWhFormTransferService;
+ private LWhFormTransferService lWhFormTransferService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Autowired
@@ -83,7 +81,7 @@
@Autowired
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
/**
* @Description 鏂板
@@ -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);
+
}
@@ -410,6 +426,7 @@
}
}
+ // TODO 浣跨敤浜轰慨鏀硅皟鐢�
return ResponseValue.success();
}
@@ -481,19 +498,6 @@
return ResponseValue.success(result);
}
-
- @ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
- })
- @GetMapping("/query/detail")
- public ResponseValue queryDepartmentTransferOrder(Long agencyId) {
-
- TransferInfoVO transferInfoVO = new TransferInfoVO();
-
- lWhFormTransferService.queryDepartmentTransferOrder();
- return ResponseValue.success(transferInfoVO);
- }
@ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
@ApiImplicitParams({
--
Gitblit v1.9.1