From 0c31534172f689160c95a4ff61df11712b6890fe Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 30 十一月 2023 13:42:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 96 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 74 insertions(+), 22 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 32e8b9f..6d2c4d5 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,10 +1,14 @@
package com.consum.base.controller;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
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.query.LWhFormScrappedQry;
import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
import com.consum.base.pojo.response.LWhFormScrappedExtendVO;
@@ -18,17 +22,20 @@
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.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+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 org.apache.commons.compress.utils.Lists;
-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;
/**
* @Description 鎶ュ簾鍗�
@@ -51,12 +58,35 @@
*/
@ApiOperation(value = "鏂板鎶ュ簾鍗�", notes = "鏂板鎶ュ簾鍗�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鎶ュ簾鍗曚俊鎭�", dataType = "LWhFormScrappedParam", paramType = "body")
+ @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);
+ int result = this.lWhFormScrappedService.add(param,0, this.getCurrentUser(), sysInfo);
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
+ return ResponseValue.error("鏂板澶辫触锛�");
+ }
+
+ @ApiOperation(value = "鏂板鎶ュ簾鍗�", notes = "鏂板鎶ュ簾鍗�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "param")
+ })
+ @PostMapping("/deprAdd")
+ public ResponseValue deprAdd() {
+ 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,1, this.getCurrentUser(), sysInfo);
if (result > 0) {
return ResponseValue.success(1);
}
@@ -70,10 +100,15 @@
*/
@ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鏌ヨ鏉′欢", dataType = "LWhFormScrappedQry", paramType = "query")
+ @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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -88,8 +123,8 @@
List<FromTransferTemplateInfoVO> list = Lists.newArrayList();
// 鏌ヨ鍨嬪彿鏁伴噺
String sql =
- "SELECT fsg.id,fsg.BASE_GOODS_TEMPLATE_ID goodsTemplatesId,fsg.GOODS_TEMPLATE_NAME goodsName,sum(counts) count FROM l_wh_form_scrapped fs left join l_wh_form_scrapped_goods fsg on fs.id = fsg.FORM_SCRAPPED_ID "
- + "where fsg.FORM_SCRAPPED_ID =:id group by fsg.BASE_GOODS_TEMPLATE_ID";
+ "SELECT fsg.id,fsg.BASE_GOODS_TEMPLATE_ID goodsTemplatesId,fsg.GOODS_TEMPLATE_NAME goodsName,sum(counts) count FROM l_wh_form_scrapped fs left join l_wh_form_scrapped_goods fsg on fs.id = fsg.FORM_SCRAPPED_ID "
+ + "where fsg.FORM_SCRAPPED_ID =:id group by fsg.BASE_GOODS_TEMPLATE_ID";
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("id", item.getId());
List<Map<String, Object>> procureModelList = lWhFormScrappedService.select(sql, paramMap, new MapperUtil());
@@ -112,7 +147,7 @@
*/
@ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")
+ @ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")
})
@GetMapping("/detail")
public ResponseValue getById(Long id) {
@@ -126,15 +161,20 @@
/**
* 鎶ュ簾鏄庣粏
*
- * @param param
+ * @param
* @return
*/
@ApiOperation(value = "鎶ュ簾鏄庣粏", notes = "鎶ュ簾鏄庣粏")
@ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鏌ヨ鏉′欢", dataType = "LWhFormScrappedQry", paramType = "query")
+ @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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -149,12 +189,24 @@
* @Date 2023/11/2
*/
@GetMapping("/export")
- public ResponseValue export(Long id) {
+ public ResponseValue export(Long id, HttpServletRequest request, HttpServletResponse response) {
if (id == null) {
return ResponseValue.error("鎶ュ簾鍗昳d涓虹┖");
}
- //LWhFormScrappedExtendVO scrappedExtend = this.lWhFormScrappedService.export(id, this.getSysInfo());
- return ResponseValue.success(null);
+ 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);
+ }
+ return ResponseValue.success();
}
--
Gitblit v1.9.1