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] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86-=E9=99=84?= =?UTF-8?q?=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; + } }