From 6e3009105355378ba42cf400734fef1fd395e88b Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 21 十一月 2023 11:53:16 +0800
Subject: [PATCH] --分页工具
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 157 insertions(+), 11 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 630e05c..ca0024f 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,18 +1,40 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.pojo.BaseGoodsTemplateParam;
+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.pojo.LWhFormOutputParam;
-import com.consum.base.service.BaseCategoryServiceImpl;
+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.model.po.BaseGoodsTemplate;
+import com.consum.base.service.LWhGoodsService;
+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.infrastructure.utils.StringUtils;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
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.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+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;
@@ -21,34 +43,158 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
+@Api(value = "鍑哄簱鍗�", tags = "鍑哄簱鍗�")
@RestController
@RequestMapping("/pc/l/wh/form/output")
public class LWhFormOutputController extends BaseController {
@Autowired
private LWhFormOutputServiceImpl lWhFormOutputService;
+ @Autowired
+ private LWhProcureModelService lWhProcureModelService;
+ @Autowired
+ private LWhGoodsService lWhGoodsService;
+ @Resource
+ private LWarehouseFlowService lWarehouseFlowService;
/**
* @Description 鏂板鍑哄簱鍗�
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
+ @ApiOperation(value = "鏂板鍑哄簱鍗�", notes = "鏂板鍑哄簱鍗�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputInsertParam", paramType = "body")
+ })
@PostMapping("/add")
- public ResponseValue add(@RequestBody LWhFormOutputParam param) {
+ public ResponseValue add() {
+ LWhFormOutputParam param = CommonUtil.getObjFromReqBody(LWhFormOutputParam.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- int result = this.lWhFormOutputService.add(param, currentUser,this.getSysInfo());
- if (result > 0) return ResponseValue.success(1);
+ int result = this.lWhFormOutputService.add(param, currentUser, this.getSysInfo());
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
+ }
+
+ /**
+ * @Description 鍒楄〃鏌ヨ
+ */
+ @ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ")
+ @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam", paramType = "query")
+ @GetMapping("/list")
+ public ResponseValue queryFormOutputList() {
+ LWhFormOutputQry param = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ if (param.getAgencyId() == null) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+ GenericPager genericPager = lWhFormOutputService.queryFormOutputList(param);
+ List<LWhFormOutput> data = genericPager.getDatas();
+
+ 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);
+
+ resultList.add(formOutputVO);
+ });
+ }
+ try {
+ Field fieldDatas = GenericPager.class.getDeclaredField("datas");
+ fieldDatas.setAccessible(true);
+ fieldDatas.set(genericPager, resultList);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return ResponseValue.success(genericPager);
+ }
+
+ /**
+ * 鏍规嵁id鏌ヨ璇︽儏
+ */
+ @ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏")
+ @ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
+ @GetMapping("/detail")
+ public ResponseValue getById(Long id) throws IllegalAccessException {
+ if (id == null) {
+ return ResponseValue.error("鍑哄簱鍗昳d涓虹┖");
+ }
+ LWhFormOutput lWhFormOutput = lWhFormOutputService.get(new LWhFormOutput(id));
+ LWhFormOutputExtendVO lWhFormOutputExtendVO = new LWhFormOutputExtendVO();
+ BeanUtils.copyProperties(lWhFormOutput, lWhFormOutputExtendVO);
+
+ String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME "
+ + "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 GROUP BY bgt.id ";
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("id", lWhFormOutputExtendVO.getId());
+ List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap, new MapperUtil());
+ List<FormOutputGoodsVO> fromOutputGoods = Lists.newArrayList();
+ for (Map<String, Object> map : procureModelList) {
+ FormOutputGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputGoodsVO.class);
+
+ // 鏌ヨ鍨嬪彿鏁伴噺
+ 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";
+ List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil());
+ modelList.forEach(item -> {
+ GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
+ goodsModelVOList.add(goodsModelVO);
+ });
+ procureTemplateInfoVO.setModels(goodsModelVOList);
+ fromOutputGoods.add(procureTemplateInfoVO);
+ }
+ lWhFormOutputExtendVO.setFromOutputGoods(fromOutputGoods);
+
+ return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormOutputExtendVO);
}
-
-
-
+ @ApiOperation(value = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�", notes = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�")
+ @ApiImplicitParam(name = "formOutputQry", value = "鍑哄簱鍗曡鎯呮煡璇㈡潯浠�", required = true, dataType = "LWhFormOutputQry", paramType = "query")
+ @GetMapping("/detail/list")
+ public ResponseValue queryFormOutputDetailList() {
+ LWhFormOutputQry formOutputQry = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ GenericPager<Map<String, Object>> mapGenericPager = lWarehouseFlowService.queryBusinessFlowDetail(formOutputQry);
+ return ResponseValue.success(mapGenericPager);
+ }
}
--
Gitblit v1.9.1