From acae379a256c20ea8620db3a7106e99536709580 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Fri, 21 Nov 2025 09:04:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/controller/CustomerController.java | 23 +++--- .../sales/service/ICustomerService.java | 7 +- .../service/impl/CustomerServiceImpl.java | 71 +++++++++++++------ 3 files changed, 66 insertions(+), 35 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 83a1edd..582c3fb 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 @@ -4,7 +4,6 @@ import java.util.List; import javax.validation.Valid; -import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -16,19 +15,12 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.pictc.datalog.DataOperationContent; -import com.pictc.datalog.DataOperationListener; -import com.pictc.enums.BusinessCode; -import com.pictc.enums.ExceptionCommonCode; -import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.utils.VoToColumnUtil; -import com.xjrsoft.module.common.db.utils.CommonCallUtils; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; import com.xjrsoft.module.sales.dto.LngCustomerPageDto; import com.xjrsoft.module.sales.dto.UpdateLngCustomerDto; import com.xjrsoft.module.sales.entity.LngCustomer; @@ -113,7 +105,12 @@ public class CustomerController { @ApiOperation(value = "新增LngCustomer") @SaCheckPermission("customer:add") public R add(@Valid @RequestBody UpdateLngCustomerDto dto){ - + String code = codeRuleClient.genEncode(CUSTOMER_CODE); + dto.setCuCode("C"+code); + customerService.add(dto); + codeRuleClient.useEncode(CUSTOMER_CODE); + return R.ok(); + /** return R.ok(dataService.insert(dto,new DataOperationListener() { @Override @@ -133,7 +130,7 @@ public class CustomerController { return content.getObj(); } })); - + **/ } @@ -141,14 +138,16 @@ public class CustomerController { @ApiOperation(value = "修改LngCustomer") @SaCheckPermission("customer:edit") public R update(@Valid @RequestBody UpdateLngCustomerDto dto){ - return R.ok(dataService.updateById(dto)); + // return R.ok(dataService.updateById(dto)); + customerService.update(dto); + return R.ok(); } @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("customer:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class, ids)); + return R.ok(customerService.delete(ids)); } 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 be3aaa8..21b690f 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.github.yulichang.base.MPJBaseService; import com.github.yulichang.extension.mapping.base.MPJDeepService; import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.sales.dto.UpdateLngCustomerDto; import com.xjrsoft.module.sales.entity.LngCustomer; import lombok.Data; import java.util.List; @@ -22,7 +23,8 @@ public interface ICustomerService extends MPJBaseService, MPJDeepSe * @param lngCustomer * @return */ - Boolean add(LngCustomer lngCustomer); + + Boolean add(UpdateLngCustomerDto updateLngCustomerDto); /** * 更新 @@ -30,7 +32,7 @@ public interface ICustomerService extends MPJBaseService, MPJDeepSe * @param lngCustomer * @return */ - Boolean update(LngCustomer lngCustomer); + Boolean update(UpdateLngCustomerDto updateLngCustomerDto); /** * 删除 @@ -39,4 +41,5 @@ public interface ICustomerService extends MPJBaseService, MPJDeepSe * @return */ Boolean delete(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 272d9f4..bd63a71 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 @@ -10,9 +10,16 @@ import com.xjrsoft.module.sales.entity.LngCustomerDoc; import com.xjrsoft.module.sales.mapper.LngCustomerDocMapper; import com.xjrsoft.module.sales.entity.LngCustomerContact; import com.xjrsoft.module.sales.mapper.LngCustomerContactMapper; +import com.xjrsoft.module.sales.dto.UpdateLngCustomerAttrPowerDto; +import com.xjrsoft.module.sales.dto.UpdateLngCustomerBankDto; +import com.xjrsoft.module.sales.dto.UpdateLngCustomerContactDto; +import com.xjrsoft.module.sales.dto.UpdateLngCustomerDocDto; +import com.xjrsoft.module.sales.dto.UpdateLngCustomerDto; import com.xjrsoft.module.sales.entity.LngCustomer; import com.xjrsoft.module.sales.mapper.LngCustomerMapper; import com.xjrsoft.module.sales.service.ICustomerService; + +import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,22 +47,33 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl lngCustomerAttrPowerList = customerLngCustomerAttrPowerMapper.selectList(Wrappers.lambdaQuery(LngCustomerAttrPower.class).eq(LngCustomerAttrPower::getCuCode, lngCustomer.getCuCode()).select(LngCustomerAttrPower::getId)); List lngCustomerAttrPowerIds = lngCustomerAttrPowerList.stream().map(LngCustomerAttrPower::getId).collect(Collectors.toList()); //原有子表单 没有被删除的主键 - List lngCustomerAttrPowerOldIds = lngCustomer.getLngCustomerAttrPowerList().stream().map(LngCustomerAttrPower::getId).filter(Objects::nonNull).collect(Collectors.toList()); + List lngCustomerAttrPowerOldIds = updateLngCustomerDto.getLngCustomerAttrPowerList().stream().map(UpdateLngCustomerAttrPowerDto::getId).filter(Objects::nonNull).collect(Collectors.toList()); //找到需要删除的id List lngCustomerAttrPowerRemoveIds = lngCustomerAttrPowerIds.stream().filter(item -> !lngCustomerAttrPowerOldIds.contains(item)).collect(Collectors.toList()); - for (LngCustomerAttrPower lngCustomerAttrPower : lngCustomer.getLngCustomerAttrPowerList()) { - //如果不等于空则修改 + for (UpdateLngCustomerAttrPowerDto lngCustomerAttrPowerDto : updateLngCustomerDto.getLngCustomerAttrPowerList()) { + LngCustomerAttrPower lngCustomerAttrPower = new LngCustomerAttrPower(); + BeanUtil.copyProperties(lngCustomerAttrPowerDto, lngCustomerAttrPower); + //如果不等于空则修改 if (lngCustomerAttrPower.getId() != null) { + customerLngCustomerAttrPowerMapper.updateById(lngCustomerAttrPower); } //如果等于空 则新增 @@ -101,11 +124,13 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl lngCustomerBankList = customerLngCustomerBankMapper.selectList(Wrappers.lambdaQuery(LngCustomerBank.class).eq(LngCustomerBank::getCuCode, lngCustomer.getCuCode()).select(LngCustomerBank::getId)); List lngCustomerBankIds = lngCustomerBankList.stream().map(LngCustomerBank::getId).collect(Collectors.toList()); //原有子表单 没有被删除的主键 - List lngCustomerBankOldIds = lngCustomer.getLngCustomerBankList().stream().map(LngCustomerBank::getId).filter(Objects::nonNull).collect(Collectors.toList()); + List lngCustomerBankOldIds = updateLngCustomerDto.getLngCustomerBankList().stream().map(UpdateLngCustomerBankDto::getId).filter(Objects::nonNull).collect(Collectors.toList()); //找到需要删除的id List lngCustomerBankRemoveIds = lngCustomerBankIds.stream().filter(item -> !lngCustomerBankOldIds.contains(item)).collect(Collectors.toList()); - for (LngCustomerBank lngCustomerBank : lngCustomer.getLngCustomerBankList()) { + for (UpdateLngCustomerBankDto lngCustomerBankDto : updateLngCustomerDto.getLngCustomerBankList()) { + LngCustomerBank lngCustomerBank = new LngCustomerBank(); + BeanUtil.copyProperties(lngCustomerBankDto, lngCustomerBank); //如果不等于空则修改 if (lngCustomerBank.getId() != null) { customerLngCustomerBankMapper.updateById(lngCustomerBank); @@ -130,12 +155,14 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl lngCustomerDocList = customerLngCustomerDocMapper.selectList(Wrappers.lambdaQuery(LngCustomerDoc.class).eq(LngCustomerDoc::getCuCode, lngCustomer.getCuCode()).select(LngCustomerDoc::getId)); List lngCustomerDocIds = lngCustomerDocList.stream().map(LngCustomerDoc::getId).collect(Collectors.toList()); //原有子表单 没有被删除的主键 - List lngCustomerDocOldIds = lngCustomer.getLngCustomerDocList().stream().map(LngCustomerDoc::getId).filter(Objects::nonNull).collect(Collectors.toList()); + List lngCustomerDocOldIds = updateLngCustomerDto.getLngCustomerDocList().stream().map(UpdateLngCustomerDocDto::getId).filter(Objects::nonNull).collect(Collectors.toList()); //找到需要删除的id List lngCustomerDocRemoveIds = lngCustomerDocIds.stream().filter(item -> !lngCustomerDocOldIds.contains(item)).collect(Collectors.toList()); - for (LngCustomerDoc lngCustomerDoc : lngCustomer.getLngCustomerDocList()) { - //如果不等于空则修改 + for (UpdateLngCustomerDocDto lngCustomerDocDto : updateLngCustomerDto.getLngCustomerDocList()) { + LngCustomerDoc lngCustomerDoc = new LngCustomerDoc(); + BeanUtil.copyProperties(lngCustomerDocDto, lngCustomerDoc); + //如果不等于空则修改 if (lngCustomerDoc.getId() != null) { customerLngCustomerDocMapper.updateById(lngCustomerDoc); } @@ -159,12 +186,14 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl lngCustomerContactList = customerLngCustomerContactMapper.selectList(Wrappers.lambdaQuery(LngCustomerContact.class).eq(LngCustomerContact::getCuCode, lngCustomer.getCuCode()).select(LngCustomerContact::getId)); List lngCustomerContactIds = lngCustomerContactList.stream().map(LngCustomerContact::getId).collect(Collectors.toList()); //原有子表单 没有被删除的主键 - List lngCustomerContactOldIds = lngCustomer.getLngCustomerContactList().stream().map(LngCustomerContact::getId).filter(Objects::nonNull).collect(Collectors.toList()); + List lngCustomerContactOldIds = updateLngCustomerDto.getLngCustomerContactList().stream().map(UpdateLngCustomerContactDto::getId).filter(Objects::nonNull).collect(Collectors.toList()); //找到需要删除的id List lngCustomerContactRemoveIds = lngCustomerContactIds.stream().filter(item -> !lngCustomerContactOldIds.contains(item)).collect(Collectors.toList()); - for (LngCustomerContact lngCustomerContact : lngCustomer.getLngCustomerContactList()) { - //如果不等于空则修改 + for (UpdateLngCustomerContactDto lngCustomerContactDto : updateLngCustomerDto.getLngCustomerContactList()) { + LngCustomerContact lngCustomerContact = new LngCustomerContact(); + BeanUtil.copyProperties(lngCustomerContactDto, lngCustomerContact); + //如果不等于空则修改 if (lngCustomerContact.getId() != null) { customerLngCustomerContactMapper.updateById(lngCustomerContact); }