From 68450da4f9daab0f2a73650e3e5b6668a3d037f5 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Mon, 24 Nov 2025 17:53:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=8E=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/dto/UpdateLngCustomerDocDto.java | 2 + .../module/sales/vo/LngCustomerPageVo.java | 8 ++++ .../module/sales/entity/LngCustomerDoc.java | 20 +++++----- .../sales/service/ICustomerService.java | 2 + .../service/impl/CustomerServiceImpl.java | 39 ++++++++++++++++--- 5 files changed, 55 insertions(+), 16 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java index 4dc1f3b..1a8327e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java @@ -98,4 +98,6 @@ public class UpdateLngCustomerDocDto implements Serializable { private String filePath; + + private Long filesize; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java index 6eecdab..7bd0101 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java @@ -1,5 +1,8 @@ package com.xjrsoft.module.sales.vo; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -41,26 +44,31 @@ public class LngCustomerPageVo { * 企业性质(国有企业/非国有企业) */ @ApiModelProperty("企业性质(国有企业/非国有企业)") + @Trans(type = TransType.DIC, id = "1990667133987635201") private String natureCode; /** * 客户分类(一类/二类) */ @ApiModelProperty("客户分类(一类/二类)") + @Trans(type = TransType.DIC, id = "1990668094164484097") private String classCode; /** * 客户类别(电厂/工业用户/城燃/贸易商) */ @ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)") + @Trans(type = TransType.DIC, id = "1990668471983194113") private String typeCode; /** * 有效标志（不在黑名单）(Y-有效，N-无效) */ @ApiModelProperty("有效标志（不在黑名单）(Y-有效，N-无效)") + @Trans(type = TransType.DIC, id = "1978057078528327681") private String valid; /** * 状态(未提交/审批中/已审批/已驳回) */ @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + @Trans(type = TransType.DIC, id = "1990669393069129729") private String approCode; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java index 6986c82..391b5ae 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java @@ -1,20 +1,16 @@ package com.xjrsoft.module.sales.entity; +import java.io.Serializable; +import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.Version; -import com.github.yulichang.annotation.EntityMapping; +import com.baomidou.mybatisplus.annotation.TableName; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** @@ -127,6 +123,10 @@ public class LngCustomerDoc implements Serializable { @TableField(fill = FieldFill.INSERT) private Long ruleUserId; - + @TableField(exist = false) + private String filePath; + + @TableField(exist = false) + private Long filesize; } \ No newline at end of file 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 21b690f..a7b1ff3 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 @@ -42,4 +42,6 @@ public interface ICustomerService extends MPJBaseService, MPJDeepSe */ Boolean delete(List ids); + LngCustomer getCustomerById(Long id); + } 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 2c9d2d9..83b5af5 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 @@ -24,9 +24,12 @@ import com.xjrsoft.module.sales.mapper.LngFileUploadMapper; import com.xjrsoft.module.sales.service.ICustomerService; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -90,13 +93,16 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl fileList = lngFileUploadMapper.selectList(Wrappers.lambdaQuery(LngFileUpload.class).eq(LngFileUpload::getTableId, lngCustomer.getId()).eq(LngFileUpload::getTableName, "lng_customer")); + lngCustomer.setLngFileUploadList(fileList); + return lngCustomer; + } } From 19d6990c796773ac02d5264e5d1311b990edc42d Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Mon, 24 Nov 2025 17:54:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=8E=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/sales/controller/CustomerController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 582c3fb..66acac8 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 @@ -85,7 +85,7 @@ public class CustomerController { @ApiOperation(value="根据id查询LngCustomer信息") @SaCheckPermission("customer:detail") public R info(@RequestParam Long id){ - LngCustomer lngCustomer = customerService.getByIdDeep(id); + LngCustomer lngCustomer = customerService.getCustomerById(id); if (lngCustomer == null) { return R.error("找不到此数据！"); } @@ -147,7 +147,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.delete(ids)); } @@ -155,7 +155,7 @@ public class CustomerController { @ApiOperation(value = "启用LngCustomer") @SaCheckPermission("customer:enable") public R enable(@Valid @RequestBody List ids){ - return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids)); + return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids)); } @@ -163,7 +163,7 @@ public class CustomerController { @ApiOperation(value = "禁用LngCustomer") @SaCheckPermission("customer:disable") public R disable(@Valid @RequestBody List ids){ - return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids)); + return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids)); } From d8d7672e7c8061cc0d627cc8727f6fbda6ceb379 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Mon, 1 Dec 2025 16:52:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/dto/UpdateLngCustomerDocDto.java | 14 +++- .../module/sales/vo/LngCustomerDocVo.java | 6 +- .../module/sales/vo/LngCustomerPageVo.java | 5 +- .../module/sales/vo/LngFileUploadVo.java | 5 +- .../sales/controller/CustomerController.java | 9 ++- .../module/sales/entity/LngCustomerDoc.java | 26 +++++-- .../module/sales/entity/LngFileUpload.java | 4 +- .../sales/service/ICustomerService.java | 2 +- .../service/impl/CustomerServiceImpl.java | 77 ++++++++++++------- 9 files changed, 103 insertions(+), 45 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java index 1a8327e..67b239b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java @@ -96,8 +96,14 @@ public class UpdateLngCustomerDocDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; - - private String filePath; - - private Long filesize; + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogJoin(name = "lngFileUpload子表", + columns = { + @LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngFileUploadDto.class, type = JoinType.MANY) + private List fileList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java index ef0d4fe..0eb2de3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java @@ -122,7 +122,11 @@ public class LngCustomerDocVo { private Long ruleUserId; - + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java index 7bd0101..d8c563a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java @@ -68,7 +68,10 @@ public class LngCustomerPageVo { * 状态(未提交/审批中/已审批/已驳回) */ @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") - @Trans(type = TransType.DIC, id = "1990669393069129729") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") private String approCode; + + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approName; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java index 1fa1b60..f05f4df 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java @@ -8,6 +8,8 @@ import java.time.LocalDateTime; import java.math.BigDecimal; import java.util.List; +import com.baomidou.mybatisplus.annotation.TableField; + /** * @title: 表单出参 * @Author 管理员 @@ -129,7 +131,8 @@ public class LngFileUploadVo { private Long ruleUserId; - + @ApiModelProperty("") + private String presignedUrl; } 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 66acac8..05d4148 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 @@ -15,6 +15,7 @@ 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.utils.StringUtils; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -107,9 +108,10 @@ public class CustomerController { public R add(@Valid @RequestBody UpdateLngCustomerDto dto){ String code = codeRuleClient.genEncode(CUSTOMER_CODE); dto.setCuCode("C"+code); - customerService.add(dto); + Long id = customerService.add(dto); + dto.setId(id); codeRuleClient.useEncode(CUSTOMER_CODE); - return R.ok(); + return R.ok(dto); /** return R.ok(dataService.insert(dto,new DataOperationListener() { @@ -138,7 +140,6 @@ public class CustomerController { @ApiOperation(value = "修改LngCustomer") @SaCheckPermission("customer:edit") public R update(@Valid @RequestBody UpdateLngCustomerDto dto){ - // return R.ok(dataService.updateById(dto)); customerService.update(dto); return R.ok(); } @@ -147,7 +148,7 @@ public class CustomerController { @ApiOperation(value = "删除") @SaCheckPermission("customer:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.delete(ids)); + return R.ok(customerService.delete(ids)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java index 391b5ae..75122b7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java @@ -2,11 +2,19 @@ package com.xjrsoft.module.sales.entity; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.List; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.github.yulichang.annotation.EntityMapping; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.sales.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -123,10 +131,18 @@ public class LngCustomerDoc implements Serializable { @TableField(fill = FieldFill.INSERT) private Long ruleUserId; - @TableField(exist = false) - private String filePath; - - @TableField(exist = false) - private Long filesize; + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "tableId") + @LogJoin(name = "lngFileUpload子表", + columns = { + @LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngFileUploadDto.class, type = JoinType.MANY) + private List fileList; + } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java index 06de11d..effac17 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java @@ -133,6 +133,8 @@ public class LngFileUpload implements Serializable { @TableField(fill = FieldFill.INSERT) private Long ruleUserId; - + @ApiModelProperty("") + @TableField(exist = false) + private String presignedUrl; } \ No newline at end of file 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 a7b1ff3..4cc227b 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 @@ -24,7 +24,7 @@ public interface ICustomerService extends MPJBaseService, MPJDeepSe * @return */ - Boolean add(UpdateLngCustomerDto updateLngCustomerDto); + Long add(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 83b5af5..75f92a9 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 @@ -12,6 +12,8 @@ import com.xjrsoft.module.sales.entity.LngFileUpload; import com.xjrsoft.module.sales.mapper.LngCustomerDocMapper; import com.xjrsoft.module.sales.entity.LngCustomerContact; import com.xjrsoft.module.sales.mapper.LngCustomerContactMapper; +import com.xjrsoft.common.factory.CloudStorageService; +import com.xjrsoft.common.factory.OssFactory; import com.xjrsoft.module.sales.dto.UpdateLngCustomerAttrPowerDto; import com.xjrsoft.module.sales.dto.UpdateLngCustomerBankDto; import com.xjrsoft.module.sales.dto.UpdateLngCustomerContactDto; @@ -24,6 +26,7 @@ import com.xjrsoft.module.sales.mapper.LngFileUploadMapper; import com.xjrsoft.module.sales.service.ICustomerService; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -55,7 +58,7 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl ids) { - lngCustomerMapper.deleteBatchIds(ids); - lngCustomerAttrPowerMapper.delete(Wrappers.lambdaQuery(LngCustomerAttrPower.class).in(LngCustomerAttrPower::getCuCode, ids)); - lngCustomerBankMapper.delete(Wrappers.lambdaQuery(LngCustomerBank.class).in(LngCustomerBank::getCuCode, ids)); - lngCustomerDocMapper.delete(Wrappers.lambdaQuery(LngCustomerDoc.class).in(LngCustomerDoc::getCuCode, ids)); - lngCustomerContactMapper.delete(Wrappers.lambdaQuery(LngCustomerContact.class).in(LngCustomerContact::getCuCode, ids)); - lngFileUploadMapper.delete(Wrappers.lambdaQuery(LngFileUpload.class).in(LngFileUpload::getTableId, ids)); - return true; + 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)); + lngFileUploadMapper.delete(Wrappers.lambdaQuery(LngFileUpload.class).in(LngFileUpload::getTableId, ids).eq(LngFileUpload::getTableName, "lng_customer")); + + } + return true; } @Override @@ -302,15 +316,24 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl tempList = lngFileUploadMapper.selectList(Wrappers.lambdaQuery(LngFileUpload.class).eq(LngFileUpload::getTableId, lngCustomerDoc.getId()).eq(LngFileUpload::getTableName, "lng_customer_doc")); + if(CollectionUtil.isNotEmpty(tempList)) { + CloudStorageService storageService = OssFactory.build(); + tempList.forEach(file -> { + file.setPresignedUrl(storageService.fixUrl(file.getFilePath())); + }); + lngCustomerDoc.setFileList(tempList); } } } List fileList = lngFileUploadMapper.selectList(Wrappers.lambdaQuery(LngFileUpload.class).eq(LngFileUpload::getTableId, lngCustomer.getId()).eq(LngFileUpload::getTableName, "lng_customer")); - lngCustomer.setLngFileUploadList(fileList); + if (CollUtil.isNotEmpty(fileList)) { + CloudStorageService storageService = OssFactory.build(); + fileList.forEach(file -> { + file.setPresignedUrl(storageService.fixUrl(file.getFilePath())); + }); + } + lngCustomer.setLngFileUploadList(fileList); return lngCustomer; } } From 9bfda21a15acd41bd4b4c801a05195659a4393cc Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Mon, 1 Dec 2025 17:11:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java index 0eb2de3..6e2cc24 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java @@ -126,7 +126,7 @@ public class LngCustomerDocVo { * lngFileUpload */ @ApiModelProperty("lngFileUpload子表") - private List lngFileUploadList; + private List fileList; }