From cf6897eeac0f169b949b9390b1af5ecb9f51ef5c Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 27 Feb 2026 15:34:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/controller/CustomerController.java | 12 +++++-- .../sales/service/ICustomerService.java | 10 ++---- .../service/impl/CustomerServiceImpl.java | 33 +++++++------------ .../controller/SupplierController.java | 10 ++++-- .../supplier/service/ISupplierService.java | 4 +++ .../service/impl/SupplierServiceImpl.java | 12 ++++++- 6 files changed, 47 insertions(+), 34 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java index 9cd0859..a9ae84a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java @@ -163,7 +163,7 @@ public class CustomerController { @ApiOperation(value = "删除") @SaCheckPermission("customer:delete") public R delete(@Valid @RequestBody List ids){ - //return R.ok(customerService.delete(ids)); + return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class,ids, new DataOperationListener() { @Override public UpdateLngCustomerDto before(DataOperationContent content) { @@ -182,7 +182,10 @@ public class CustomerController { @ApiOperation(value = "启用LngCustomer") @SaCheckPermission("customer:enable") public R enable(@Valid @RequestBody List ids){ - + Long count = customerService.countDisableByIds(ids); + if(count != null && count > 0) { + throw new BusinessException(BusinessCode.of(10500, "只能对已审批的客户才能进行启用操作")); + } return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids, new DataOperationListener() { @Override public UpdateLngCustomerDto before(DataOperationContent content) { @@ -201,7 +204,10 @@ public class CustomerController { @ApiOperation(value = "禁用LngCustomer") @SaCheckPermission("customer:disable") public R disable(@Valid @RequestBody List ids){ - //return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids)); + Long count = customerService.countDisableByIds(ids); + if(count != null && count > 0) { + throw new BusinessException(BusinessCode.of(10500, "只能对已审批的客户才能进行作废操作")); + } return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids, new DataOperationListener() { @Override public UpdateLngCustomerDto before(DataOperationContent content) { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/ICustomerService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/ICustomerService.java index 87c0803..ee86e68 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/ICustomerService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/ICustomerService.java @@ -17,16 +17,12 @@ import com.xjrsoft.module.sales.vo.LngCustomerVo; public interface ICustomerService extends MPJBaseService, MPJDeepService, MPJRelationService { - /** - * 删除 - * - * @param ids - * @return - */ - Boolean delete(List ids); + LngCustomerVo getCustomerById(Long id); LngCustomer getByCode(String code); + Long countDisableByIds(List ids); + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java index 3d6393f..e027215 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.enums.ApproveCodeEnum; import com.pictc.enums.BusinessCode; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.mdm.client.ILngBankClient; @@ -46,34 +47,16 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class CustomerServiceImpl extends MPJBaseServiceImpl implements ICustomerService { - private final LngCustomerMapper lngCustomerMapper; + + private final LngCustomerMapper lngCustomerMapper; - private final LngCustomerAttrPowerMapper lngCustomerAttrPowerMapper; - private final LngCustomerBankMapper lngCustomerBankMapper; - private final LngCustomerDocMapper lngCustomerDocMapper; - private final LngCustomerContactMapper lngCustomerContactMapper; private final IFileClient fileClient; private final ILngBankClient bankClient; - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean delete(List ids) { - List customerList = lngCustomerMapper.selectList(Wrappers.lambdaQuery(LngCustomer.class).in(LngCustomer::getId, ids)); - List cuCodeList = customerList.stream().map(LngCustomer::getCuCode).filter(Objects::nonNull).collect(Collectors.toList()); - lngCustomerMapper.deleteBatchIds(ids); - if(CollectionUtil.isNotEmpty(cuCodeList)) { - lngCustomerAttrPowerMapper.delete(Wrappers.lambdaQuery(LngCustomerAttrPower.class).in(LngCustomerAttrPower::getCuCode, cuCodeList)); - lngCustomerBankMapper.delete(Wrappers.lambdaQuery(LngCustomerBank.class).in(LngCustomerBank::getCuCode, cuCodeList)); - lngCustomerDocMapper.delete(Wrappers.lambdaQuery(LngCustomerDoc.class).in(LngCustomerDoc::getCuCode, cuCodeList)); - lngCustomerContactMapper.delete(Wrappers.lambdaQuery(LngCustomerContact.class).in(LngCustomerContact::getCuCode, cuCodeList)); - } - return true; - } - + @Override public LngCustomerVo getCustomerById(Long id) { @@ -115,4 +98,12 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl ids) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.in(LngCustomer::getId,ids); + queryWrapper.ne(LngCustomer::getApproCode, ApproveCodeEnum.YSP.getCode()); + return baseMapper.selectCount(queryWrapper); + } } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java index 82cbb4e..ab3e59c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java @@ -178,7 +178,10 @@ public class SupplierController { @ApiOperation(value = "启用LngSupplier") @SaCheckPermission("supplier:enable") public R enable(@Valid @RequestBody List ids){ - //return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids)); + Long count = supplierService.countDisableByIds(ids); + if(count != null && count > 0) { + throw new BusinessException(BusinessCode.of(10500, "只能对已审批的供应商才能进行启用操作")); + } return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids, new DataOperationListener() { @Override public UpdateLngSupplierDto before(DataOperationContent content) { @@ -197,7 +200,10 @@ public class SupplierController { @ApiOperation(value = "禁用LngSupplier") @SaCheckPermission("supplier:disable") public R disable(@Valid @RequestBody List ids){ - //return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids)); + Long count = supplierService.countDisableByIds(ids); + if(count != null && count > 0) { + throw new BusinessException(BusinessCode.of(10500, "只能对已审批的供应商才能进行作废操作")); + } return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids, new DataOperationListener() { @Override public UpdateLngSupplierDto before(DataOperationContent content) { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java index 3f5cf10..b3a1fcd 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java @@ -11,6 +11,8 @@ import com.xjrsoft.module.supplier.vo.LngSupplierVo; import lombok.Data; import java.util.List; +import javax.validation.Valid; + /** * @title: service * @Author 管理员 @@ -33,4 +35,6 @@ public interface ISupplierService extends MPJBaseService, MPJDeepSe LngSupplier getByCode(String code); + Long countDisableByIds(@Valid List ids); + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java index 101f3a2..13a85c1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java @@ -4,15 +4,17 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import javax.validation.Valid; + import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.enums.ApproveCodeEnum; import com.xjrsoft.module.mdm.client.ILngBankClient; import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; -import com.xjrsoft.module.sales.vo.LngCustomerBankVo; import com.xjrsoft.module.supplier.entity.LngSupplier; import com.xjrsoft.module.supplier.entity.LngSupplierBank; import com.xjrsoft.module.supplier.entity.LngSupplierContact; @@ -101,6 +103,14 @@ public class SupplierServiceImpl extends MPJBaseServiceImpl ids) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.in(LngSupplier::getId,ids); + queryWrapper.ne(LngSupplier::getApproCode, ApproveCodeEnum.YSP.getCode()); + return baseMapper.selectCount(queryWrapper); + }