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/service/DepFormScrappedServiceImpl.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
index e05d42e..e1bfc3c 100644
--- a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
@@ -3,32 +3,38 @@
import cn.hutool.core.convert.Convert;
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.DepFormScrappedGoodsParam;
import com.consum.base.pojo.DepFormScrappedModelParam;
import com.consum.base.pojo.LDeptFormScrappedParam;
import com.consum.base.pojo.query.LDeptFormScrappedQry;
import com.consum.base.pojo.response.DepFormScrappedExtendVo;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseCategory;
+import com.consum.model.po.DepFormScrapped;
+import com.consum.model.po.DepFormScrappedGoods;
+import com.consum.model.po.DepFormScrappedModel;
+import com.consum.model.po.FinSysTenantDepartment;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.SDictData;
import com.fasterxml.jackson.databind.ObjectMapper;
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.infrastructure.utils.NumberGenerator;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import com.walker.web.ResponseValue;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* @ClassName DepFormScrappedServiceImpl
@@ -43,11 +49,11 @@
@Resource
private CodeGeneratorService codeGeneratorService;
@Resource
- private FinSysTenantDepartmentServiceImpl departmentService;
+ private FinSysTenantDepartmentService departmentService;
@Resource
- private LWhFormTransferServiceImpl lWhFormTransferService;
+ private LWhFormTransferService lWhFormTransferService;
@Resource
- private BaseCategoryServiceImpl baseCategoryService;
+ private BaseCategoryService baseCategoryService;
@Resource
private SDictDataServiceImpl sDictDataService;
@Resource
@@ -60,7 +66,7 @@
//1.鏂板鎶ュ簾鍗曡褰�
DepFormScrapped lDeptFormScrapped = new DepFormScrapped();
//鎶ュ簾鍗昳d
- long lWhFormScrappedId = NumberGenerator.getLongSequenceNumber();
+ long lWhFormScrappedId = IdUtil.generateId();
lDeptFormScrapped.setId(lWhFormScrappedId);
lDeptFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
lDeptFormScrapped.setProcureDoc(param.getProcureDoc());
@@ -86,7 +92,6 @@
lDeptFormScrapped.setDepartmentName(department.getName());
}
-
lDeptFormScrapped.setCreateTime(dealTime);
lDeptFormScrapped.setStates(1);
@@ -100,7 +105,7 @@
for (DepFormScrappedGoodsParam depFormScrappedGoodsParam : scrappedGoodsInfo) {
DepFormScrappedGoods depFormScrappedGoods = new DepFormScrappedGoods();
- depFormScrappedGoods.setId(NumberGenerator.getLongSequenceNumber());
+ depFormScrappedGoods.setId(IdUtil.generateId());
depFormScrappedGoods.setDepFormScrappedId(lWhFormScrappedId);
depFormScrappedGoods.setBaseGoodsTemplateId(depFormScrappedGoodsParam.getBaseGoodsTemplateId());
depFormScrappedGoods.setBaseGoodsTemplateName(depFormScrappedGoodsParam.getGoodsTemplateName());
@@ -138,7 +143,7 @@
for (DepFormScrappedModelParam depFormScrappedModelParam : modelList) {
DepFormScrappedModel depFormScrappedModel = new DepFormScrappedModel();
- depFormScrappedModel.setId(NumberGenerator.getLongSequenceNumber());
+ depFormScrappedModel.setId(IdUtil.generateId());
depFormScrappedModel.setDepFormScrappedId(lWhFormScrappedId);
depFormScrappedModel.setDepFormScrappedGoodsId(depFormScrappedGoods.getId());
//鎶ュ簾鍘熷洜
@@ -244,6 +249,7 @@
//2.鏌ヨ鎶ュ簾鍗曠墿鍝�
DepFormScrappedGoods goodsQuery = new DepFormScrappedGoods();
+ goodsQuery.setDepFormScrappedId(id);
List<DepFormScrappedGoods> formScrappedGoodsList = select(goodsQuery);
List<Map> goodsList = new ArrayList<>();
for (DepFormScrappedGoods scrappedGoods : formScrappedGoodsList) {
@@ -254,10 +260,10 @@
depFormScrappedModel.setDepFormScrappedGoodsId(scrappedGoodsId);
List<DepFormScrappedModel> scrappedModelList = select(depFormScrappedModel);
List<List<DepFormScrappedModel>> modelList = scrappedModelList.stream()
- .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId))
- .values().stream()
- .map(list -> list.stream().collect(Collectors.toList()))
- .collect(Collectors.toList());
+ .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId))
+ .values().stream()
+ .map(list -> list.stream().collect(Collectors.toList()))
+ .collect(Collectors.toList());
scrappedGoodsMap.put("models", modelList);
goodsList.add(scrappedGoodsMap);
@@ -284,6 +290,7 @@
}
return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
}
+
public List<Map<String, Object>> listByModel(LDeptFormScrappedQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(EXPORT_SQL);
@@ -298,7 +305,7 @@
paramts.put("businessFormCode", param.getBusinessFormCode());
}
//鐗╁搧鍚嶇О
- if (StringUtils.isNotEmpty(param.getGoodsTemplateName())){
+ if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
sql.append(" and model.BASE_GOODS_TEMPLATE_NAME LIKE :goodsTemplateName ");
paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
--
Gitblit v1.9.1