From c1ac6d13630b04b4e11d6f383858e4f8fa64f924 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 17:24:34 +0800
Subject: [PATCH] 盘点查询返回结果修改
---
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 100 ++++++++++++++++++++++++++++++++------------------
1 files changed, 64 insertions(+), 36 deletions(-)
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 866e7be..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
@@ -1,13 +1,14 @@
package com.consum.base.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
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.LWhFormScrappedParam;
-import com.consum.base.pojo.excel.ScrappedInfoExport;
+import com.consum.base.pojo.excel.ScrappedInfoExcelTemplate;
import com.consum.base.pojo.query.LWhFormScrappedQry;
import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
import com.consum.base.pojo.response.LWhFormScrappedExtendVO;
@@ -16,28 +17,29 @@
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormScrapped;
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.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
/**
* @Description 鎶ュ簾鍗�
@@ -63,7 +65,11 @@
@ApiImplicitParam(name = "param")
})
@PostMapping("/add")
- public ResponseValue add(@RequestBody LWhFormScrappedParam param) {
+ public ResponseValue add() {
+ LWhFormScrappedParam param = CommonUtil.getObjFromReqBody(LWhFormScrappedParam.class);
+ LWhFormScrappedParam query = new LWhFormScrappedParam();
+ CommonUtil.copyProperties(param, query);
+ param = query;
FinSysTenantUser sysInfo = this.getSysInfo();
int result = this.lWhFormScrappedService.add(param, this.getCurrentUser(), sysInfo);
if (result > 0) {
@@ -82,7 +88,12 @@
@ApiImplicitParam(name = "param", value = "鏌ヨ鏉′欢", dataType = "LWhFormScrappedQry", paramType = "query")
})
@GetMapping("/list")
- public ResponseValue queryList(LWhFormScrappedQry param) {
+ public ResponseValue queryList() {
+ LWhFormScrappedQry param = CommonUtil.getObjFromReq(LWhFormScrappedQry.class);
+ LWhFormScrappedQry query = new LWhFormScrappedQry();
+ CommonUtil.copyProperties(param, query);
+ param = query;
+
FinSysTenantUser sysInfo = getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -135,7 +146,7 @@
/**
* 鎶ュ簾鏄庣粏
*
- * @param param
+ * @param
* @return
*/
@ApiOperation(value = "鎶ュ簾鏄庣粏", notes = "鎶ュ簾鏄庣粏")
@@ -143,7 +154,12 @@
@ApiImplicitParam(name = "param", value = "鏌ヨ鏉′欢", dataType = "LWhFormScrappedQry", paramType = "query")
})
@GetMapping("/list/detailList")
- public ResponseValue queryDetailList(LWhFormScrappedQry param) {
+ public ResponseValue queryDetailList() {
+ LWhFormScrappedQry param = CommonUtil.getObjFromReq(LWhFormScrappedQry.class);
+ LWhFormScrappedQry query = new LWhFormScrappedQry();
+ CommonUtil.copyProperties(param, query);
+ param = query;
+
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -152,30 +168,42 @@
return ResponseValue.success(pageUtil);
}
- /**
- * @Description 瀵煎嚭鎶ュ簾鐧昏鍗�
- * @Author 鍗㈠簡闃�
- * @Date 2023/11/2
- */
- @GetMapping("/export")
- public ResponseValue export(Long id, HttpServletRequest request, HttpServletResponse response) {
+ @ApiOperation(value = "瀵煎嚭鎶ュ簾鍗�", notes = "瀵煎嚭鎶ュ簾鍗�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")
+ })
+ @GetMapping("/list/export")
+ public void export(Long id, HttpServletResponse response) throws Exception {
if (id == null) {
- return ResponseValue.error("鎶ュ簾鍗昳d涓虹┖");
+ throw new RuntimeException("鎶ュ簾鍗昳d涓虹┖");
}
- try {
- OutputStream outputStream = response.getOutputStream();
- List<Map<String, Object>> export = lWhFormScrappedService.export(id);
- ExportParams exportParams = new ExportParams("鎶ュ簾鍗曠櫥璁�", "鎶ュ簾鍗曠櫥璁�");
- Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExport.class, export);
- // 璁剧疆鍝嶅簲澶�
- 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("鏁版嵁涓虹┖");
}
- return ResponseValue.success();
+ 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);
+
}
--
Gitblit v1.9.1