From ca5fc6a439b0c815b98ae47db0faaae6e2afab9c Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 14 Apr 2023 10:09:08 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E7=89=A9=E6=96=99=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E7=BC=96=E7=A0=81=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SdenergyTaxCodeMatchController.java | 55 +++++++++++++++++-- .../service/SdenergyTaxCodeMatchService.java | 2 + .../impl/SdenergyTaxCodeMatchServiceImpl.java | 5 ++ 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java index a764a1e7..2903685e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java @@ -1,11 +1,9 @@ package com.dxhy.order.consumer.modules.taxcodematch.controller; +import cn.hutool.core.util.ObjectUtil; import com.dxhy.base.file.common.ExcelReadContext; import com.dxhy.base.file.exception.ExcelReadException; import com.dxhy.base.file.handle.ExcelReadHandle; -import com.dxhy.order.baseservice.module.commodity.constant.CommodityEnum; -import com.dxhy.order.baseservice.module.commodity.model.CommodityExcel; -import com.dxhy.order.consumer.modules.commodity.domain.dto.QueryGroupCommodityDTO; import com.dxhy.order.consumer.modules.taxcodematch.emum.SdenergyTaxCodeMatchEnum; import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch; import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDTO; @@ -13,6 +11,7 @@ import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMat import com.dxhy.order.consumer.modules.taxcodematch.service.SdenergyTaxCodeMatchService; import com.dxhy.order.model.PageUtils; import com.dxhy.order.model.R; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; @@ -67,6 +66,16 @@ public class SdenergyTaxCodeMatchController { @PostMapping("/create") public R create(@RequestBody SdenergyTaxCodeMatchDTO dto) { + if(StringUtils.isEmpty(dto.getWlflbm())){ + return R.error("物料分类编码为空！"); + }else { + SdenergyTaxCodeMatch codeMatch = sdenergyTaxCodeMatchService.queryByWlflbm(dto.getWlflbm()); + if(codeMatch != null){ + return R.error("物料分类编码已存在"); + } + } + + return sdenergyTaxCodeMatchService.insert(dto) > 0 ? R.ok() : R.error("插入失败"); } @@ -74,6 +83,14 @@ public class SdenergyTaxCodeMatchController { public R edit(@RequestBody SdenergyTaxCodeMatch dto) { SdenergyTaxCodeMatch updateEntity = new SdenergyTaxCodeMatch(); try { + if(StringUtils.isEmpty(dto.getWlflbm())){ + return R.error("物料分类编码为空！"); + }else { + SdenergyTaxCodeMatch codeMatch = sdenergyTaxCodeMatchService.queryByWlflbm(dto.getWlflbm()); + if(codeMatch != null && !dto.getId().equals(dto.getId())){ + return R.error("物料分类编码已存在"); + } + } BeanUtils.copyProperties(updateEntity, dto); if (sdenergyTaxCodeMatchService.update(updateEntity) > 0) { return R.ok(); @@ -125,7 +142,37 @@ public class SdenergyTaxCodeMatchController { log.error("{},导入物料分类编码异常", LOGGER_MSG, e); return R.error("导入物料分类编码异常，请重新上传"); } - + if(ObjectUtil.isEmpty(uploadList) ){ + return R.error("数据解析为空"); + } + List errorMsgList = Lists.newArrayList(); + int resultIndex = 3; + for (SdenergyTaxCodeMatch taxCodeMatch : uploadList) { + String wlflbm = taxCodeMatch.getWlflbm(); + if(StringUtils.isNotBlank(wlflbm)){ + SdenergyTaxCodeMatch codeMatch = sdenergyTaxCodeMatchService.queryByWlflbm(taxCodeMatch.getWlflbm()); + if(codeMatch != null){ + errorMsgList.add("第" + resultIndex + "行，物料分类编码已存在"); + continue; + } + }else { + errorMsgList.add("第" + resultIndex + "行，物料分类编码不能为空"); + continue; + } + String ssflbm = taxCodeMatch.getSsflbm(); + if(StringUtils.isBlank(ssflbm)){ + errorMsgList.add("第" + resultIndex + "行，税收分类编码不能为空"); + continue; + } + String ssflmc = taxCodeMatch.getSsflmc(); + if(StringUtils.isBlank(ssflmc)){ + errorMsgList.add("第" + resultIndex + "行，税收分类名称不能为空"); + continue; + } + } + if (ObjectUtil.isNotEmpty(errorMsgList)) { + return R.error(errorMsgList); + } return sdenergyTaxCodeMatchService.upload(uploadList) > 0 ? R.ok() : R.error(); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/SdenergyTaxCodeMatchService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/SdenergyTaxCodeMatchService.java index 4ac6be1f..7975363f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/SdenergyTaxCodeMatchService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/SdenergyTaxCodeMatchService.java @@ -61,4 +61,6 @@ public interface SdenergyTaxCodeMatchService { int upload(List list); + SdenergyTaxCodeMatch queryByWlflbm(String wlflbm); + } \ No newline at end of file diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/impl/SdenergyTaxCodeMatchServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/impl/SdenergyTaxCodeMatchServiceImpl.java index a746faa8..9e973e89 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/impl/SdenergyTaxCodeMatchServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/impl/SdenergyTaxCodeMatchServiceImpl.java @@ -120,4 +120,9 @@ public class SdenergyTaxCodeMatchServiceImpl implements SdenergyTaxCodeMatchServ public int upload(List list) { return this.sdenergyTaxCodeMatchDao.batchInsert(list); } + + @Override + public SdenergyTaxCodeMatch queryByWlflbm(String wlflbm) { + return this.sdenergyTaxCodeMatchDao.queryByWlflbm(wlflbm); + } } \ No newline at end of file