From a28e3bdb7de59b35c8d58bbcff89a41dd7d7888a Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 14 Apr 2023 13:57:16 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E5=85=AC=E5=8F=B8=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=AF=BC=E5=85=A5=E8=A1=A5=E5=85=A8entId=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommodityController.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java index f898a28b..eb40e5f1 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java @@ -5,16 +5,6 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeModifyLog; -import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogDTO; -import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogResultDTO; -import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService; -import com.dxhy.order.constant.*; -import com.dxhy.order.model.CommodityCodeCheckQuery; -import com.dxhy.order.model.CommodityTaxClassCodeReq; -import com.dxhy.order.model.PageUtils; -import com.dxhy.order.model.R; -import com.dxhy.order.utils.*; import com.dxhy.base.file.common.ExcelReadContext; import com.dxhy.base.file.exception.ExcelReadException; import com.dxhy.base.file.handle.ExcelReadHandle; @@ -23,12 +13,21 @@ import com.dxhy.order.baseservice.module.base.service.BaseService; import com.dxhy.order.baseservice.module.commodity.constant.CommodityEnum; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; import com.dxhy.order.baseservice.module.commodity.model.CommodityExcel; +import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogDTO; +import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogResultDTO; +import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService; import com.dxhy.order.baseservice.module.commodity.service.CommodityService; import com.dxhy.order.baseservice.module.commodity.service.VerifyCommodityCodeService; import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; import com.dxhy.order.baseservice.module.thirdservice.user.model.UserEntity; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.baseservice.openapi.protocol.qd.PageSpxxReq; +import com.dxhy.order.constant.*; +import com.dxhy.order.model.CommodityCodeCheckQuery; +import com.dxhy.order.model.CommodityTaxClassCodeReq; +import com.dxhy.order.model.PageUtils; +import com.dxhy.order.model.R; +import com.dxhy.order.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -162,7 +161,6 @@ public class CommodityController { if (StringUtils.isBlank(commodityCodeEntity.getYcbz())) { commodityCodeEntity.setYcbz(ConfigureConstant.STRING_0); } - /** * 添加校验 */ @@ -447,7 +445,7 @@ public class CommodityController { /** * excel 导入数据转换为表格数据 */ - List commodityCodeEntities = transCommodityCodeEntityList(commodityExcelList, String.valueOf(userEntity.getUserId())); + List commodityCodeEntities = transCommodityCodeEntityList(commodityExcelList, String.valueOf(userEntity.getUserId()),userEntity.getDept().getDeptId()); return commodityService.uploadCommodityCode(commodityCodeEntities); @@ -459,7 +457,7 @@ public class CommodityController { * @param commodityExcelList * @return */ - public List transCommodityCodeEntityList(List commodityExcelList, String userId) { + public List transCommodityCodeEntityList(List commodityExcelList, String userId, String deptId) { List commodityCodeEntityList = new ArrayList<>(); if (ObjectUtil.isNotEmpty(commodityExcelList)) { for (CommodityExcel commodityExcel : commodityExcelList) { @@ -503,7 +501,7 @@ public class CommodityController { commodityCodeEntity.setCpy(""); commodityCodeEntity.setJdc(""); commodityCodeEntity.setBmbBbh(""); - + commodityCodeEntity.setEntId(deptId); commodityCodeEntity.setUserId(userId); if (StringUtils.isNotEmpty(commodityCodeEntity.getHsbz())) {