From ce1d9926ff986e195fd4a58cb5159fc8f45b32a5 Mon Sep 17 00:00:00 2001 From: 石广澎 <shiguangpeng@163.com> Date: 星期五, 01 十二月 2023 16:06:59 +0800 Subject: [PATCH] feat: 部门物品 1、报废单列表 2、报废明细 3、退回单列表 4、退回明细 --- consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 176 +++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 123 insertions(+), 53 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 e5bad62..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,49 +1,75 @@ package com.consum.base.controller; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.consum.base.BaseController; -import com.consum.base.pojo.LWhFormScrappedExtend; +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.service.LWhFormScrappedGoodsService; +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; +import com.consum.base.pojo.response.LWhFormScrappedVO; import com.consum.base.service.LWhFormScrappedServiceImpl; import com.consum.model.po.FinSysTenantUser; import com.consum.model.po.LWhFormScrapped; -import com.consum.model.po.LWhFormScrappedGoods; -import com.walker.db.page.GenericPager; import com.walker.infrastructure.utils.CollectionUtils; +import com.walker.infrastructure.utils.DateUtils; import com.walker.web.ResponseValue; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import io.swagger.annotations.Api; +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.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 鎶ュ簾鍗� * @Author 鍗㈠簡闃� * @Date 2023/11/1 */ +@Api(value = "鎶ュ簾鍗�", tags = "鎶ュ簾鍗�") @RestController @RequestMapping("/pc/l/wh/form/scrapped") public class LWhFormScrappedController extends BaseController { @Autowired private LWhFormScrappedServiceImpl lWhFormScrappedService; - @Autowired - private LWhFormScrappedGoodsService scrappedGoodsService; + /** * @Description 鏂板鎶ュ簾鍗� * @Author 鍗㈠簡闃� * @Date 2023/11/1 */ + @ApiOperation(value = "鏂板鎶ュ簾鍗�", notes = "鏂板鎶ュ簾鍗�") + @ApiImplicitParams({ + @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) { @@ -55,40 +81,47 @@ /** * @Description 鍒楄〃鏌ヨ * @Author 鍗㈠簡闃� - * @Date 2023/11/02 + * @Date 2023/11/02 1.鏌ヨ鎶ュ簾鍗� 2.鏌ヨ鎶ュ簾鍗曠墿鍝� */ - //1.鏌ヨ鎶ュ簾鍗� - //2.鏌ヨ鎶ュ簾鍗曠墿鍝� + @ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ") + @ApiImplicitParams({ + @ApiImplicitParam(name = "param", value = "鏌ヨ鏉′欢", dataType = "LWhFormScrappedQry", paramType = "query") + }) @GetMapping("/list") - public ResponseValue queryList(LWhFormScrappedParam 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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); } - - GenericPager genericPager = lWhFormScrappedService.queryList(param, sysInfo); - List<LWhFormScrapped> datas = genericPager.getDatas(); - ArrayList<LWhFormScrappedExtend> newDatas = new ArrayList<>(); - if (!CollectionUtils.isEmpty(datas)) { - datas.forEach(item -> { - // 鏌ヨ鎶ュ簾鍗曠墿鍝� - LWhFormScrappedGoods scrappedGoods = new LWhFormScrappedGoods(); - scrappedGoods.setFormScrappedId(item.getId()); - List<LWhFormScrappedGoods> scrappedGoodsList = scrappedGoodsService.select(scrappedGoods); - LWhFormScrappedExtend formScrappedExtend = new LWhFormScrappedExtend(); - BeanUtils.copyProperties(item, formScrappedExtend); - formScrappedExtend.setScrappedGoodsList(scrappedGoodsList); - newDatas.add(formScrappedExtend); + PageUtil genericPager = lWhFormScrappedService.queryList(param, sysInfo); + List<LWhFormScrapped> data = genericPager.getDatas(); + List<LWhFormScrappedVO> result = Lists.newArrayList(); + if (!CollectionUtils.isEmpty(data)) { + data.forEach(item -> { + LWhFormScrappedVO lWhFormScrappedVO = new LWhFormScrappedVO(); + BeanUtils.copyProperties(item, lWhFormScrappedVO); + 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"; + Map<String, Object> paramMap = new HashMap<>(); + paramMap.put("id", item.getId()); + List<Map<String, Object>> procureModelList = lWhFormScrappedService.select(sql, paramMap, new MapperUtil()); + for (Map<String, Object> map : procureModelList) { + FromTransferTemplateInfoVO fromTransferTemplateInfoVO = MapUtils.convertMapToObj(map, FromTransferTemplateInfoVO.class); + list.add(fromTransferTemplateInfoVO); + } + lWhFormScrappedVO.setGoodTemplateInfo(list); + result.add(lWhFormScrappedVO); }); } - try { - Field fieldDatas = GenericPager.class.getDeclaredField("datas"); - fieldDatas.setAccessible(true); - fieldDatas.set(genericPager, newDatas); - } catch (Exception e) { - e.printStackTrace(); - } -// genericPager.setDatas(newDatas); + genericPager.setDatas(result); return ResponseValue.success(genericPager); } @@ -97,43 +130,80 @@ * @Author 鍗㈠簡闃� * @Date 2023/11/2 */ + @ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query") + }) @GetMapping("/detail") public ResponseValue getById(Long id) { if (id == null) { return ResponseValue.error("鎶ュ簾鍗昳d涓虹┖"); } - LWhFormScrappedExtend scrappedExtend = this.lWhFormScrappedService.getById(id); + LWhFormScrappedExtendVO scrappedExtend = this.lWhFormScrappedService.getById(id); return ResponseValue.success(scrappedExtend); } /** * 鎶ュ簾鏄庣粏 * - * @param param + * @param * @return */ + @ApiOperation(value = "鎶ュ簾鏄庣粏", notes = "鎶ュ簾鏄庣粏") + @ApiImplicitParams({ + @ApiImplicitParam(name = "param", value = "鏌ヨ鏉′欢", dataType = "LWhFormScrappedQry", paramType = "query") + }) @GetMapping("/list/detailList") - public ResponseValue queryDetailList(LWhFormScrappedParam 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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); } - GenericPager<Map<String, Object>> genericPager = lWhFormScrappedService.queryDetailList(param, sysInfo); - return ResponseValue.success(genericPager); + PageUtil pageUtil = lWhFormScrappedService.queryDetailList(param, sysInfo); + return ResponseValue.success(pageUtil); } - /** - * @Description 瀵煎嚭鎶ュ簾鐧昏鍗� - * @Author 鍗㈠簡闃� - * @Date 2023/11/2 - */ - @GetMapping("/export") - public ResponseValue export(Long id) { + @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涓虹┖"); } - LWhFormScrappedExtend scrappedExtend = this.lWhFormScrappedService.export(id, this.getSysInfo()); - return ResponseValue.success(scrappedExtend); + + 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); + } -- Gitblit v1.9.1