diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java index 10724fc..3fbe923 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java @@ -198,21 +198,21 @@ public class UpdateLngCustomerDto implements Serializable { * 是否校验预付款(Y-是，N-否) */ @LogField(name="是否校验预付款(Y-是，N-否)",index=23) - @ApiModelProperty("是否校验预付款(Y-是，N-否)") + @ApiModelProperty("是否校验预付款") private String prepaySign; /** * 有无线上(竞拍)(Y-有，N-无) */ @LogField(name="有无线上(竞拍)(Y-有，N-无)",index=24) - @ApiModelProperty("有无线上(竞拍)(Y-有，N-无)") + @ApiModelProperty("有无线上竞拍") private String onlineSign; /** * 自有终端(Y-是，N-否) */ @LogField(name="自有终端(Y-是，N-否)",index=25) - @ApiModelProperty("自有终端(Y-是，N-否)") + @ApiModelProperty("自有终端") private String tSign; /** @@ -226,14 +226,14 @@ public class UpdateLngCustomerDto implements Serializable { * 有效标志（不在黑名单）(Y-有效，N-无效) */ @LogField(name="有效标志（不在黑名单）(Y-有效，N-无效)",index=27) - @ApiModelProperty("有效标志（不在黑名单）(Y-有效，N-无效)") + @ApiModelProperty("有效标志（不在黑名单）") private String valid; /** * 状态(未提交/审批中/已审批/已驳回) */ @LogField(name="状态(未提交/审批中/已审批/已驳回)",index=28) - @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + @ApiModelProperty("状态") private String approCode; /** 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 ce5502e..ff55921 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 @@ -112,12 +112,7 @@ 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); -// Long id = customerService.add(dto); -// dto.setId(id); -// codeRuleClient.useEncode(CUSTOMER_CODE); -// return R.ok(dto); + String code = codeRuleClient.genEncode(CUSTOMER_CODE); dto.setCuCode("C"+code); return R.ok(dataService.insert(dto,new DataOperationListener() { @@ -131,9 +126,9 @@ public class CustomerController { @Override public UpdateLngCustomerDto after(DataOperationContent content) { String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); - if (StringUtils.isNotEmpty(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } + if (StringUtils.isNotEmpty(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } codeRuleClient.useEncode(CUSTOMER_CODE); return content.getObj(); } @@ -146,24 +141,23 @@ public class CustomerController { @ApiOperation(value = "修改LngCustomer") @SaCheckPermission("customer:edit") public R update(@Valid @RequestBody UpdateLngCustomerDto dto){ -// customerService.update(dto); -// return R.ok(); - return R.ok(dataService.updateById(dto,new DataOperationListener() { - @Override - public UpdateLngCustomerDto before(DataOperationContent content) { - return content.getObj(); - } - - @Override - public UpdateLngCustomerDto after(DataOperationContent content) { - String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); - if (StringUtils.isNotEmpty(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - return content.getObj(); - } - })); + return R.ok(dataService.updateById(dto,new DataOperationListener() { + + @Override + public UpdateLngCustomerDto before(DataOperationContent content) { + return content.getObj(); + } + + @Override + public UpdateLngCustomerDto after(DataOperationContent content) { + String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); + if (StringUtils.isNotEmpty(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + return content.getObj(); + } + })); } @DeleteMapping 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 4cc227b..aec6b52 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 @@ -1,13 +1,11 @@ package com.xjrsoft.module.sales.service; -import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + 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; /** * @title: service @@ -17,23 +15,7 @@ import java.util.List; */ public interface ICustomerService extends MPJBaseService, MPJDeepService, MPJRelationService { - /** - * 新增 - * - * @param lngCustomer - * @return - */ - - Long add(UpdateLngCustomerDto updateLngCustomerDto); - - /** - * 更新 - * - * @param lngCustomer - * @return - */ - Boolean update(UpdateLngCustomerDto updateLngCustomerDto); - + /** * 删除 * 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 2e798b8..6b2c36a 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 @@ -9,11 +9,6 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; -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.entity.LngCustomerAttrPower; import com.xjrsoft.module.sales.entity.LngCustomerBank; @@ -26,9 +21,7 @@ import com.xjrsoft.module.sales.mapper.LngCustomerDocMapper; import com.xjrsoft.module.sales.mapper.LngCustomerMapper; import com.xjrsoft.module.sales.service.ICustomerService; import com.xjrsoft.module.system.client.IFileClient; -import com.xjrsoft.module.system.dto.LngFileUploadBindDto; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import lombok.AllArgsConstructor; @@ -51,238 +44,7 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl lngCustomerAttrPowerList = lngCustomerAttrPowerMapper.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 = 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 (UpdateLngCustomerAttrPowerDto lngCustomerAttrPowerDto : updateLngCustomerDto.getLngCustomerAttrPowerList()) { - LngCustomerAttrPower lngCustomerAttrPower = new LngCustomerAttrPower(); - BeanUtil.copyProperties(lngCustomerAttrPowerDto, lngCustomerAttrPower); - //如果不等于空则修改 - if (lngCustomerAttrPower.getId() != null) { - - lngCustomerAttrPowerMapper.updateById(lngCustomerAttrPower); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngCustomerAttrPower.setCuCode(lngCustomer.getCuCode()); - lngCustomerAttrPowerMapper.insert(lngCustomerAttrPower); - } - } - //已经不存在的id 删除 - if(lngCustomerAttrPowerRemoveIds.size() > 0){ - lngCustomerAttrPowerMapper.deleteBatchIds(lngCustomerAttrPowerRemoveIds); - } - } - //********************************* LngCustomerAttrPower 增删改 结束 *******************************************/ - - //********************************* LngCustomerBank 增删改 开始 *******************************************/ - { - // 查出所有子级的id - List lngCustomerBankList = lngCustomerBankMapper.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 = 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 (UpdateLngCustomerBankDto lngCustomerBankDto : updateLngCustomerDto.getLngCustomerBankList()) { - LngCustomerBank lngCustomerBank = new LngCustomerBank(); - BeanUtil.copyProperties(lngCustomerBankDto, lngCustomerBank); - //如果不等于空则修改 - if (lngCustomerBank.getId() != null) { - lngCustomerBankMapper.updateById(lngCustomerBank); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngCustomerBank.setCuCode(lngCustomer.getCuCode()); - lngCustomerBankMapper.insert(lngCustomerBank); - } - } - //已经不存在的id 删除 - if(lngCustomerBankRemoveIds.size() > 0){ - lngCustomerBankMapper.deleteBatchIds(lngCustomerBankRemoveIds); - } - } - //********************************* LngCustomerBank 增删改 结束 *******************************************/ - - //********************************* LngCustomerDoc 增删改 开始 *******************************************/ - { - // 查出所有子级的id - List lngCustomerDocList = lngCustomerDocMapper.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 = 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 (UpdateLngCustomerDocDto lngCustomerDocDto : updateLngCustomerDto.getLngCustomerDocList()) { - LngCustomerDoc lngCustomerDoc = new LngCustomerDoc(); - BeanUtil.copyProperties(lngCustomerDocDto, lngCustomerDoc); - //如果不等于空则修改 - if (lngCustomerDoc.getId() != null) { - - lngCustomerDocMapper.updateById(lngCustomerDoc); - //lngFileUploadMapper.delete(Wrappers.lambdaQuery(LngFileUpload.class).eq(LngFileUpload::getTableName, "lng_customer_doc").eq(LngFileUpload::getTableId, lngCustomerDoc.getId())); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngCustomerDoc.setCuCode(lngCustomer.getCuCode()); - lngCustomerDocMapper.insert(lngCustomerDoc); - } - if(CollectionUtil.isNotEmpty(lngCustomerDocDto.getFileList())) { -// for(UpdateLngFileUploadDto lngFileUploadDto:lngCustomerDocDto.getFileList()) { -// LngFileUpload lngFileUpload = new LngFileUpload(); -// BeanUtil.copyProperties(lngFileUploadDto, lngFileUpload); -// lngFileUpload.setTableName("lng_customer_doc"); -// lngFileUpload.setTableId(lngCustomerDoc.getId()); -// lngFileUploadMapper.insert(lngFileUpload); -// } - - } - } - //已经不存在的id 删除 - if(lngCustomerDocRemoveIds.size() > 0){ - lngCustomerDocMapper.deleteBatchIds(lngCustomerDocRemoveIds); - //lngFileUploadMapper.delete(Wrappers.lambdaQuery(LngFileUpload.class).eq(LngFileUpload::getTableName, "lng_customer_doc").in(LngFileUpload::getTableId, lngCustomerDocRemoveIds)); - - } - } - //********************************* LngCustomerDoc 增删改 结束 *******************************************/ - - //********************************* LngCustomerContact 增删改 开始 *******************************************/ - { - // 查出所有子级的id - List lngCustomerContactList = lngCustomerContactMapper.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 = 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 (UpdateLngCustomerContactDto lngCustomerContactDto : updateLngCustomerDto.getLngCustomerContactList()) { - LngCustomerContact lngCustomerContact = new LngCustomerContact(); - BeanUtil.copyProperties(lngCustomerContactDto, lngCustomerContact); - //如果不等于空则修改 - if (lngCustomerContact.getId() != null) { - lngCustomerContactMapper.updateById(lngCustomerContact); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngCustomerContact.setCuCode(lngCustomer.getCuCode()); - lngCustomerContactMapper.insert(lngCustomerContact); - } - } - //已经不存在的id 删除 - if(lngCustomerContactRemoveIds.size() > 0){ - lngCustomerContactMapper.deleteBatchIds(lngCustomerContactRemoveIds); - } - } - //********************************* LngCustomerContact 增删改 结束 *******************************************/ - - //********************************* LngFileUpload 增删改 开始 *******************************************/ - { - // 查出所有子级的id -// List lngFileUploadList = lngFileUploadMapper.selectList(Wrappers.lambdaQuery(LngFileUpload.class).eq(LngFileUpload::getTableName, "lng_customer").eq(LngFileUpload::getTableId, lngCustomer.getId()).select(LngFileUpload::getId)); -// List lngFileUploadIds = lngFileUploadList.stream().map(LngFileUpload::getId).collect(Collectors.toList()); -// //原有子表单 没有被删除的主键 -// List lngFileUploadOldIds = updateLngCustomerDto.getLngFileUploadList().stream().map(UpdateLngFileUploadDto::getId).filter(Objects::nonNull).collect(Collectors.toList()); -// //找到需要删除的id -// List lngFileUploadRemoveIds = lngFileUploadIds.stream().filter(item -> !lngFileUploadOldIds.contains(item)).collect(Collectors.toList()); -// -// for (UpdateLngFileUploadDto lngFileUploadDto : updateLngCustomerDto.getLngFileUploadList()) { -// LngFileUpload lngFileUpload = new LngFileUpload(); -// BeanUtil.copyProperties(lngFileUploadDto, lngFileUpload); -// lngFileUpload.setTableName("lng_customer"); -// //如果不等于空则修改 -// if (lngFileUpload.getId() != null) { -// lngFileUploadMapper.updateById(lngFileUpload); -// } -// //如果等于空 则新增 -// else { -// lngFileUpload.setTableId(lngCustomer.getId()); -// lngFileUploadMapper.insert(lngFileUpload); -// } -// } -// //已经不存在的id 删除 -// if(lngFileUploadRemoveIds.size() > 0){ -// lngFileUploadMapper.deleteBatchIds(lngFileUploadRemoveIds); -// } - } - //********************************* LngFileUpload 增删改 结束 *******************************************/ - return true; - } - + @Override @Transactional(rollbackFor = Exception.class) public Boolean delete(List ids) { @@ -294,7 +56,6 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl VoToColumnUtil.fieldsToColumns(LngSupplierPageVo.class).contains(x.getProperty())); @@ -109,7 +112,7 @@ public class SupplierController { @ApiOperation(value = "删除") @SaCheckPermission("supplier:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids)); } @@ -117,7 +120,7 @@ public class SupplierController { @ApiOperation(value = "启用LngSupplier") @SaCheckPermission("supplier:enable") public R enable(@Valid @RequestBody List ids){ - return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids)); + return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids)); } @@ -125,7 +128,7 @@ public class SupplierController { @ApiOperation(value = "禁用LngSupplier") @SaCheckPermission("supplier:disable") public R disable(@Valid @RequestBody List ids){ - return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids)); + return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids)); }