From e487f1bfa92d9e90dd8f876479bbfced09b4d58c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 29 十二月 2023 14:04:18 +0800
Subject: [PATCH] 添加角色查询接口
---
consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java | 66 +++++++++++++--------------------
1 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
index e7345dc..644b65b 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
@@ -1,22 +1,8 @@
package com.consum.base.service.impl;
-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.apache.commons.compress.utils.Lists;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.DepUsingFormBackCoreServiceImpl;
+import com.consum.base.service.core.DepUsingFormBackCoreService;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
@@ -26,32 +12,27 @@
import com.consum.base.pojo.request.UsingFormBackGoodsInfo;
import com.consum.base.pojo.request.UsingFormBackParam;
import com.consum.base.pojo.request.baseGoodModel;
-import com.consum.base.pojo.response.GoodsTemplateCountVO;
-import com.consum.base.pojo.response.UseInfo;
-import com.consum.base.pojo.response.UsingFormBackDetailListVO;
-import com.consum.base.pojo.response.UsingFormBackDetailVO;
-import com.consum.base.pojo.response.UsingFormBackGoodsTemplateInfo;
-import com.consum.base.pojo.response.UsingFormBackModelInfo;
-import com.consum.base.pojo.response.UsingFormBackVO;
-import com.consum.base.service.BaseCategoryService;
-import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.LWhFormTransferService;
-import com.consum.base.service.UsingFormBackGoodsService;
-import com.consum.base.service.UsingFormBackModelService;
-import com.consum.base.service.UsingFormBackService;
-import com.consum.model.po.BaseCategory;
-import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.UsingFormBack;
-import com.consum.model.po.UsingFormBackGoods;
-import com.consum.model.po.UsingFormBackModel;
+import com.consum.base.pojo.response.*;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
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.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
/**
* @author asus
@@ -75,7 +56,7 @@
@Autowired
private LWhFormTransferService lWhFormTransferService;
@Resource
- private DepUsingFormBackCoreServiceImpl depUsingFormBackCoreService;
+ private DepUsingFormBackCoreService depUsingFormBackCoreService;
@Resource
private UsingFormBackModelService UsingFormBackModelService;
@@ -133,6 +114,9 @@
BaseCategory baseCategory = baseCategoryService.getById(goodsInfo.getBaseCategoryId());
goods.setCategoryName(baseCategory.getCategoryName());
goods.setClassification(baseCategory.getClassification());
+
+ goods.setTransBusinessId(goodsInfo.getTransBusinessId());
+ goods.setBusinessFormCode(goodsInfo.getBusinessFormCode());
LWhFormTransfer lWhFormTransfer = lWhFormTransferService.selectById(goodsInfo.getTransBusinessId());
goods.setTransOutWarehouseType(lWhFormTransfer.getOutWarehouseType());
@@ -273,11 +257,13 @@
List<UsingFormBackModelInfo> modelInfoList = Lists.newArrayList();
templateInfo.stream().collect(Collectors.groupingBy(UsingFormBackDetailDTO::getBaseGoodsModelsId))
.forEach((modelId, modelInfo) -> {
- UsingFormBackDetailDTO modelInfoDTO = modelInfo.get(0);
+ UsingFormBackDetailDTO modelInfoDTO = modelInfo.stream().findFirst().orElse(null);
UsingFormBackModelInfo usingFormBackModelInfo = new UsingFormBackModelInfo();
- usingFormBackModelInfo.setBaseGoodsModelsName(modelInfoDTO.getBaseGoodsModelsName());
- usingFormBackModelInfo.setUnit(modelInfoDTO.getUnit());
- usingFormBackModelInfo.setId(modelId);
+ if (modelInfoDTO != null) {
+ usingFormBackModelInfo.setBaseGoodsModelsName(modelInfoDTO.getBaseGoodsModelsName());
+ usingFormBackModelInfo.setUnit(modelInfoDTO.getUnit());
+ usingFormBackModelInfo.setId(modelId);
+ }
modelInfoList.add(usingFormBackModelInfo);
usingFormBackGoodsTemplateInfo.setModelInfoList(modelInfoList);
List<UseInfo> useInfoList = Lists.newArrayList();
--
Gitblit v1.9.1