From 3836720e3b0fc9ab884d178e0ac27e942b175da2 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 15:23:01 +0800
Subject: [PATCH] 报废单添加金额字段
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 121 ++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 65 deletions(-)
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 c025739..1de90ad 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
@@ -1,43 +1,15 @@
package com.consum.base.controller;
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
-import cn.hutool.core.util.ReflectUtil;
-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.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;
-import com.consum.base.pojo.response.FormOutputVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.LWhFormOutputExtendVO;
-import com.consum.base.service.LWarehouseFlowService;
-import com.consum.base.service.LWhFormOutputServiceImpl;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormOutput;
-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.InputStream;
import java.lang.reflect.Field;
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;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
@@ -48,6 +20,38 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+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.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.FormOutputVO;
+import com.consum.base.pojo.response.GoodsModelVO;
+import com.consum.base.pojo.response.GoodsTemplateCountVO;
+import com.consum.base.pojo.response.LWhFormOutputExtendVO;
+import com.consum.base.service.LWarehouseFlowService;
+import com.consum.base.service.LWhFormOutputService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormOutput;
+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 cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.ReflectUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
/**
* @Description 鍑哄簱鍗�
@@ -60,7 +64,7 @@
public class LWhFormOutputController extends BaseController {
@Autowired
- private LWhFormOutputServiceImpl lWhFormOutputService;
+ private LWhFormOutputService lWhFormOutputService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Resource
@@ -72,9 +76,8 @@
* @Date 2023/10/27
*/
@ApiOperation(value = "鏂板鍑哄簱鍗�", notes = "鏂板鍑哄簱鍗�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", dataType = "lWhFormOutputParam", dataTypeClass = LWhFormOutputParam.class, paramType = "body")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", dataType = "lWhFormOutputParam",
+ dataTypeClass = LWhFormOutputParam.class, paramType = "body")})
@PostMapping("/add")
public ResponseValue add() {
LWhFormOutputParam param = CommonUtil.getObjFromReqBody(LWhFormOutputParam.class);
@@ -93,7 +96,8 @@
* @Description 鍒楄〃鏌ヨ
*/
@ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ")
- @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam", paramType = "query")
+ @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam",
+ paramType = "query")
@GetMapping("/list")
public ResponseValue queryFormOutputList() {
LWhFormOutputQry param = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
@@ -113,36 +117,24 @@
List<FormOutputVO> resultList = Lists.newArrayList();
if (!CollectionUtils.isEmpty(data)) {
data.forEach(item -> {
- // 鏌ヨ鍨嬪彿鏁伴噺
FormOutputVO formOutputVO = new FormOutputVO();
BeanUtils.copyProperties(item, formOutputVO);
- List<FormOutputTemplateInfoVO> procureTemplateInfoList = Lists.newArrayList();
-
- // 鏌ヨ鍨嬪彿鏁伴噺
- String sql = "SELECT bgt.id,bgm.GOODS_TEMPLATES_ID,GOODS_NAME,sum( counts ) count FROM "
- + "l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id "
- + "LEFT JOIN base_goods_template bgt ON bgm.GOODS_TEMPLATES_ID = bgt.id "
- + "WHERE pm.BUSINESS_ID =:id GROUP BY bgm.GOODS_TEMPLATES_ID";
- Map<String, Object> paramMap = new HashMap<>();
- paramMap.put("id", item.getId());
- List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
- for (Map<String, Object> map : procureModelList) {
- FormOutputTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputTemplateInfoVO.class);
- procureTemplateInfoList.add(procureTemplateInfoVO);
- }
- formOutputVO.setFormOutputTemplateInfoList(procureTemplateInfoList);
+ // 鏌ヨ鐗╁搧鍨嬪彿缁熻鏁伴噺
+ List<GoodsTemplateCountVO> goodsTemplateCount =
+ lWhProcureModelService.getGoodsTemplateCountByBusinessId(item.getId());
+ formOutputVO.setFormOutputTemplateInfoList(goodsTemplateCount);
resultList.add(formOutputVO);
});
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-// fieldDatas.setAccessible(true);
-// fieldDatas.set(genericPager, resultList);
+ // fieldDatas.setAccessible(true);
+ // fieldDatas.set(genericPager, resultList);
ReflectUtil.setFieldValue(genericPager, fieldDatas, resultList);
} catch (Exception e) {
- e.printStackTrace();
+ logger.error("鏌ヨ鍑哄簱鍗曞垪琛ㄥけ璐�", e);
}
return ResponseValue.success(genericPager);
}
@@ -177,8 +169,7 @@
List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
+ "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
- + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
- + "WHERE pm.BUSINESS_ID =:id";
+ + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "WHERE pm.BUSINESS_ID =:id";
List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil());
modelList.forEach(item -> {
GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
@@ -192,9 +183,9 @@
return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormOutputExtendVO);
}
-
@ApiOperation(value = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�", notes = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�")
- @ApiImplicitParam(name = "formOutputQry", value = "鍑哄簱鍗曡鎯呮煡璇㈡潯浠�", required = true, dataType = "LWhFormOutputQry", paramType = "query")
+ @ApiImplicitParam(name = "formOutputQry", value = "鍑哄簱鍗曡鎯呮煡璇㈡潯浠�", required = true, dataType = "LWhFormOutputQry",
+ paramType = "query")
@GetMapping("/detail/list")
public ResponseValue queryFormOutputDetailList() {
LWhFormOutputQry formOutputQry = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
@@ -206,7 +197,6 @@
return ResponseValue.success(genericPager);
}
-
@ApiOperation(value = "鍑哄簱鍗曞鍑�", notes = "鍑哄簱鍗曞鍑�")
@ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/list/export")
@@ -215,7 +205,7 @@
if (sysInfo == null) {
throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- ClassPathResource classPathResource = new ClassPathResource("import/閲囪喘閫�璐у崟.xls");
+ ClassPathResource classPathResource = new ClassPathResource("import/鍑哄簱鍗�.xls");
// 鑾峰彇鏂囦欢杈撳叆娴�
InputStream inputStream = classPathResource.getInputStream();
Workbook wb = new HSSFWorkbook(inputStream);
@@ -224,11 +214,14 @@
params.setHeadingStartRow(2);
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();
+ int countNum =
+ exportList.stream().filter(item -> item.getNum() != null).mapToInt(OutputExcelTemplate::getNum).sum();
+ double totalAmount = exportList.stream().filter(item -> item.getTotalAmount() != null)
+ .mapToDouble(OutputExcelTemplate::getAmount).sum();
Optional<OutputExcelTemplate> first = exportList.stream().findFirst();
OutputExcelTemplate templateExcelExport = first.get();
String businessFormCode = templateExcelExport.getBusinessFormCode();
@@ -243,10 +236,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
- downLoadExcel("閲囪喘閫�璐у崟", response, workbook);
+ downLoadExcel("鍑哄簱鍗�", response, workbook);
}
-
}
-
--
Gitblit v1.9.1