From 7bb592eb8c814b0b03fe80bbcc7e6e36dc766b59 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Tue, 18 Nov 2025 17:33:01 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/sales/dto/AddLngCustomerDto.java | 212 +++++++++++++ .../module/sales/dto/LngCustomerPageDto.java | 70 +++++ .../sales/dto/UpdateLngCustomerDto.java | 254 ++++++++++++++++ .../module/sales/vo/LngCustomerPageVo.java | 73 +++++ .../module/sales/vo/LngCustomerVo.java | 282 ++++++++++++++++++ .../sales/controller/CustomerController.java | 134 +++++++++ .../module/sales/entity/LngCustomer.java | 264 ++++++++++++++++ .../sales/mapper/LngCustomerMapper.java | 17 ++ .../sales/service/ICustomerService.java | 19 ++ .../service/impl/CustomerServiceImpl.java | 25 ++ 10 files changed, 1350 insertions(+) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngCustomerPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/ICustomerService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java new file mode 100644 index 0000000..0c5da5c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java @@ -0,0 +1,212 @@ +package com.xjrsoft.module.sales.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_customer",name="客户") +public class AddLngCustomerDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户编码(不能重复，以C开头) + */ + @ApiModelProperty("客户编码(不能重复，以C开头)") + @LogField(name="客户编码(不能重复，以C开头)",index=0) + private String cuCode; + /** + * 集团编码 + */ + @ApiModelProperty("集团编码") + @LogField(name="集团编码",index=0) + private String cuMcode; + /** + * 客户名称(不能与名称、简称重复) + */ + @ApiModelProperty("客户名称(不能与名称、简称重复)") + @LogField(name="客户名称(不能与名称、简称重复)",index=0) + private String cuName; + /** + * 简称(不能与名称、简称重复) + */ + @ApiModelProperty("简称(不能与名称、简称重复)") + @LogField(name="简称(不能与名称、简称重复)",index=0) + private String cuSname; + /** + * 国际/国内(I-国际，D-国内) + */ + @ApiModelProperty("国际/国内(I-国际，D-国内)") + @LogField(name="国际/国内(I-国际，D-国内)",index=0) + private String dI; + /** + * 企业性质(国有企业/非国有企业) + */ + @ApiModelProperty("企业性质(国有企业/非国有企业)") + @LogField(name="企业性质(国有企业/非国有企业)",index=0) + private String natureCode; + /** + * 母公司名称 + */ + @ApiModelProperty("母公司名称") + @LogField(name="母公司名称",index=0) + private String parentName; + /** + * 统一社会信用代码(非空时不可重复) + */ + @ApiModelProperty("统一社会信用代码(非空时不可重复)") + @LogField(name="统一社会信用代码(非空时不可重复)",index=0) + private String creditNo; + /** + * 纳税人识别号(非空时不可重复) + */ + @ApiModelProperty("纳税人识别号(非空时不可重复)") + @LogField(name="纳税人识别号(非空时不可重复)",index=0) + private String tiNo; + /** + * 法定代表人 + */ + @ApiModelProperty("法定代表人") + @LogField(name="法定代表人",index=0) + private String representative; + /** + * 成立日期 + */ + @ApiModelProperty("成立日期") + @LogField(name="成立日期",index=0) + private LocalDateTime dateEstab; + /** + * 准入日期 + */ + @ApiModelProperty("准入日期") + @LogField(name="准入日期",index=0) + private LocalDateTime dateEntry; + /** + * 注册资本（万元） + */ + @ApiModelProperty("注册资本（万元）") + @LogField(name="注册资本（万元）",index=0) + private String amtReg; + /** + * 注册地址 + */ + @ApiModelProperty("注册地址") + @LogField(name="注册地址",index=0) + private String addrReg; + /** + * 通讯地址 + */ + @ApiModelProperty("通讯地址") + @LogField(name="通讯地址",index=0) + private String addrMail; + /** + * 客户分类(一类/二类) + */ + @ApiModelProperty("客户分类(一类/二类)") + @LogField(name="客户分类(一类/二类)",index=0) + private String classCode; + /** + * 客户类别(电厂/工业用户/城燃/贸易商) + */ + @ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)") + @LogField(name="客户类别(电厂/工业用户/城燃/贸易商)",index=0) + private String typeCode; + /** + * 统计分类(内部/国电/华电/深能/其他) + */ + @ApiModelProperty("统计分类(内部/国电/华电/深能/其他)") + @LogField(name="统计分类(内部/国电/华电/深能/其他)",index=0) + private String propCode; + /** + * 国有企业持股 + */ + @ApiModelProperty("国有企业持股") + @LogField(name="国有企业持股",index=0) + private String stateSign; + /** + * 国企持股比例 + */ + @ApiModelProperty("国企持股比例") + @LogField(name="国企持股比例",index=0) + private BigDecimal rateShare; + /** + * 持股第一大股东名称 + */ + @ApiModelProperty("持股第一大股东名称") + @LogField(name="持股第一大股东名称",index=0) + private String shareName; + /** + * 集团持股比例 + */ + @ApiModelProperty("集团持股比例") + @LogField(name="集团持股比例",index=0) + private BigDecimal rateShareGn; + /** + * 是否校验预付款(Y-是，N-否) + */ + @ApiModelProperty("是否校验预付款(Y-是，N-否)") + @LogField(name="是否校验预付款(Y-是，N-否)",index=0) + private String prepaySign; + /** + * 有无线上(竞拍)(Y-有，N-无) + */ + @ApiModelProperty("有无线上(竞拍)(Y-有，N-无)") + @LogField(name="有无线上(竞拍)(Y-有，N-无)",index=0) + private String onlineSign; + /** + * 自有终端(Y-是，N-否) + */ + @ApiModelProperty("自有终端(Y-是，N-否)") + @LogField(name="自有终端(Y-是，N-否)",index=0) + private String tSign; + /** + * 组织架构编码 + */ + @ApiModelProperty("组织架构编码") + @LogField(name="组织架构编码",index=0) + private String orgCode; + /** + * 有效标志（不在黑名单）(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志（不在黑名单）(Y-有效，N-无效)") + @LogField(name="有效标志（不在黑名单）(Y-有效，N-无效)",index=0) + private String valid; + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + @LogField(name="状态(未提交/审批中/已审批/已驳回)",index=0) + private String approCode; + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=0) + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + @LogField(name="租户id",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngCustomerPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngCustomerPageDto.java new file mode 100644 index 0000000..35fc0fb --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngCustomerPageDto.java @@ -0,0 +1,70 @@ +package com.xjrsoft.module.sales.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngCustomerPageDto extends PageInput { + + /** + * 客户编码(不能重复，以C开头) + */ + @ApiModelProperty("客户编码(不能重复，以C开头)") + private String cuCode; + /** + * 客户名称(不能与名称、简称重复) + */ + @ApiModelProperty("客户名称(不能与名称、简称重复)") + private String cuName; + /** + * 简称(不能与名称、简称重复) + */ + @ApiModelProperty("简称(不能与名称、简称重复)") + private String cuSname; + /** + * 集团编码 + */ + @ApiModelProperty("集团编码") + private String cuMcode; + /** + * 客户分类(一类/二类) + */ + @ApiModelProperty("客户分类(一类/二类)") + private String classCode; + /** + * 客户类别(电厂/工业用户/城燃/贸易商) + */ + @ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)") + private String typeCode; + /** + * 企业性质(国有企业/非国有企业) + */ + @ApiModelProperty("企业性质(国有企业/非国有企业)") + private String natureCode; + /** + * 有效标志（不在黑名单）(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志（不在黑名单）(Y-有效，N-无效)") + private String valid; + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + +} 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 new file mode 100644 index 0000000..28706da --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java @@ -0,0 +1,254 @@ +package com.xjrsoft.module.sales.dto; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_customer",name="客户") +public class UpdateLngCustomerDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 客户编码(不能重复，以C开头) + */ + @LogField(name="客户编码(不能重复，以C开头)",index=1) + @ApiModelProperty("客户编码(不能重复，以C开头)") + private String cuCode; + + /** + * 集团编码 + */ + @LogField(name="集团编码",index=2) + @ApiModelProperty("集团编码") + private String cuMcode; + + /** + * 客户名称(不能与名称、简称重复) + */ + @LogField(name="客户名称(不能与名称、简称重复)",index=3) + @ApiModelProperty("客户名称(不能与名称、简称重复)") + private String cuName; + + /** + * 简称(不能与名称、简称重复) + */ + @LogField(name="简称(不能与名称、简称重复)",index=4) + @ApiModelProperty("简称(不能与名称、简称重复)") + private String cuSname; + + /** + * 国际/国内(I-国际，D-国内) + */ + @LogField(name="国际/国内(I-国际，D-国内)",index=5) + @ApiModelProperty("国际/国内(I-国际，D-国内)") + private String dI; + + /** + * 企业性质(国有企业/非国有企业) + */ + @LogField(name="企业性质(国有企业/非国有企业)",index=6) + @ApiModelProperty("企业性质(国有企业/非国有企业)") + private String natureCode; + + /** + * 母公司名称 + */ + @LogField(name="母公司名称",index=7) + @ApiModelProperty("母公司名称") + private String parentName; + + /** + * 统一社会信用代码(非空时不可重复) + */ + @LogField(name="统一社会信用代码(非空时不可重复)",index=8) + @ApiModelProperty("统一社会信用代码(非空时不可重复)") + private String creditNo; + + /** + * 纳税人识别号(非空时不可重复) + */ + @LogField(name="纳税人识别号(非空时不可重复)",index=9) + @ApiModelProperty("纳税人识别号(非空时不可重复)") + private String tiNo; + + /** + * 法定代表人 + */ + @LogField(name="法定代表人",index=10) + @ApiModelProperty("法定代表人") + private String representative; + + /** + * 成立日期 + */ + @LogField(name="成立日期",index=11) + @ApiModelProperty("成立日期") + private LocalDateTime dateEstab; + + /** + * 准入日期 + */ + @LogField(name="准入日期",index=12) + @ApiModelProperty("准入日期") + private LocalDateTime dateEntry; + + /** + * 注册资本（万元） + */ + @LogField(name="注册资本（万元）",index=13) + @ApiModelProperty("注册资本（万元）") + private String amtReg; + + /** + * 注册地址 + */ + @LogField(name="注册地址",index=14) + @ApiModelProperty("注册地址") + private String addrReg; + + /** + * 通讯地址 + */ + @LogField(name="通讯地址",index=15) + @ApiModelProperty("通讯地址") + private String addrMail; + + /** + * 客户分类(一类/二类) + */ + @LogField(name="客户分类(一类/二类)",index=16) + @ApiModelProperty("客户分类(一类/二类)") + private String classCode; + + /** + * 客户类别(电厂/工业用户/城燃/贸易商) + */ + @LogField(name="客户类别(电厂/工业用户/城燃/贸易商)",index=17) + @ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)") + private String typeCode; + + /** + * 统计分类(内部/国电/华电/深能/其他) + */ + @LogField(name="统计分类(内部/国电/华电/深能/其他)",index=18) + @ApiModelProperty("统计分类(内部/国电/华电/深能/其他)") + private String propCode; + + /** + * 国有企业持股 + */ + @LogField(name="国有企业持股",index=19) + @ApiModelProperty("国有企业持股") + private String stateSign; + + /** + * 国企持股比例 + */ + @LogField(name="国企持股比例",index=20) + @ApiModelProperty("国企持股比例") + private BigDecimal rateShare; + + /** + * 持股第一大股东名称 + */ + @LogField(name="持股第一大股东名称",index=21) + @ApiModelProperty("持股第一大股东名称") + private String shareName; + + /** + * 集团持股比例 + */ + @LogField(name="集团持股比例",index=22) + @ApiModelProperty("集团持股比例") + private BigDecimal rateShareGn; + + /** + * 是否校验预付款(Y-是，N-否) + */ + @LogField(name="是否校验预付款(Y-是，N-否)",index=23) + @ApiModelProperty("是否校验预付款(Y-是，N-否)") + private String prepaySign; + + /** + * 有无线上(竞拍)(Y-有，N-无) + */ + @LogField(name="有无线上(竞拍)(Y-有，N-无)",index=24) + @ApiModelProperty("有无线上(竞拍)(Y-有，N-无)") + private String onlineSign; + + /** + * 自有终端(Y-是，N-否) + */ + @LogField(name="自有终端(Y-是，N-否)",index=25) + @ApiModelProperty("自有终端(Y-是，N-否)") + private String tSign; + + /** + * 组织架构编码 + */ + @LogField(name="组织架构编码",index=26) + @ApiModelProperty("组织架构编码") + private String orgCode; + + /** + * 有效标志（不在黑名单）(Y-有效，N-无效) + */ + @LogField(name="有效标志（不在黑名单）(Y-有效，N-无效)",index=27) + @ApiModelProperty("有效标志（不在黑名单）(Y-有效，N-无效)") + private String valid; + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @LogField(name="状态(未提交/审批中/已审批/已驳回)",index=28) + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 备注 + */ + @LogField(name="备注",index=29) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=30) + @ApiModelProperty("租户id") + private Long tenantId; + + +} 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 new file mode 100644 index 0000000..f519554 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java @@ -0,0 +1,73 @@ +package com.xjrsoft.module.sales.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +public class LngCustomerPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 客户编码(不能重复，以C开头) + */ + @ApiModelProperty("客户编码(不能重复，以C开头)") + private String cuCode; + /** + * 集团编码 + */ + @ApiModelProperty("集团编码") + private String cuMcode; + /** + * 客户名称(不能与名称、简称重复) + */ + @ApiModelProperty("客户名称(不能与名称、简称重复)") + private String cuName; + /** + * 简称(不能与名称、简称重复) + */ + @ApiModelProperty("简称(不能与名称、简称重复)") + private String cuSname; + /** + * 企业性质(国有企业/非国有企业) + */ + @ApiModelProperty("企业性质(国有企业/非国有企业)") + private String natureCode; + /** + * 客户分类(一类/二类) + */ + @ApiModelProperty("客户分类(一类/二类)") + private String classCode; + /** + * 客户类别(电厂/工业用户/城燃/贸易商) + */ + @ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)") + private String typeCode; + /** + * 有效标志（不在黑名单）(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志（不在黑名单）(Y-有效，N-无效)") + private String valid; + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java new file mode 100644 index 0000000..cc3472f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java @@ -0,0 +1,282 @@ +package com.xjrsoft.module.sales.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +public class LngCustomerVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 客户编码(不能重复，以C开头) + */ + @ApiModelProperty("客户编码(不能重复，以C开头)") + private String cuCode; + + + /** + * 集团编码 + */ + @ApiModelProperty("集团编码") + private String cuMcode; + + + /** + * 客户名称(不能与名称、简称重复) + */ + @ApiModelProperty("客户名称(不能与名称、简称重复)") + private String cuName; + + + /** + * 简称(不能与名称、简称重复) + */ + @ApiModelProperty("简称(不能与名称、简称重复)") + private String cuSname; + + + /** + * 国际/国内(I-国际，D-国内) + */ + @ApiModelProperty("国际/国内(I-国际，D-国内)") + private String dI; + + + /** + * 企业性质(国有企业/非国有企业) + */ + @ApiModelProperty("企业性质(国有企业/非国有企业)") + private String natureCode; + + + /** + * 母公司名称 + */ + @ApiModelProperty("母公司名称") + private String parentName; + + + /** + * 统一社会信用代码(非空时不可重复) + */ + @ApiModelProperty("统一社会信用代码(非空时不可重复)") + private String creditNo; + + + /** + * 纳税人识别号(非空时不可重复) + */ + @ApiModelProperty("纳税人识别号(非空时不可重复)") + private String tiNo; + + + /** + * 法定代表人 + */ + @ApiModelProperty("法定代表人") + private String representative; + + + /** + * 成立日期 + */ + @ApiModelProperty("成立日期") + private LocalDateTime dateEstab; + + + /** + * 准入日期 + */ + @ApiModelProperty("准入日期") + private LocalDateTime dateEntry; + + + /** + * 注册资本（万元） + */ + @ApiModelProperty("注册资本（万元）") + private String amtReg; + + + /** + * 注册地址 + */ + @ApiModelProperty("注册地址") + private String addrReg; + + + /** + * 通讯地址 + */ + @ApiModelProperty("通讯地址") + private String addrMail; + + + /** + * 客户分类(一类/二类) + */ + @ApiModelProperty("客户分类(一类/二类)") + private String classCode; + + + /** + * 客户类别(电厂/工业用户/城燃/贸易商) + */ + @ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)") + private String typeCode; + + + /** + * 统计分类(内部/国电/华电/深能/其他) + */ + @ApiModelProperty("统计分类(内部/国电/华电/深能/其他)") + private String propCode; + + + /** + * 国有企业持股 + */ + @ApiModelProperty("国有企业持股") + private String stateSign; + + + /** + * 国企持股比例 + */ + @ApiModelProperty("国企持股比例") + private BigDecimal rateShare; + + + /** + * 持股第一大股东名称 + */ + @ApiModelProperty("持股第一大股东名称") + private String shareName; + + + /** + * 集团持股比例 + */ + @ApiModelProperty("集团持股比例") + private BigDecimal rateShareGn; + + + /** + * 是否校验预付款(Y-是，N-否) + */ + @ApiModelProperty("是否校验预付款(Y-是，N-否)") + private String prepaySign; + + + /** + * 有无线上(竞拍)(Y-有，N-无) + */ + @ApiModelProperty("有无线上(竞拍)(Y-有，N-无)") + private String onlineSign; + + + /** + * 自有终端(Y-是，N-否) + */ + @ApiModelProperty("自有终端(Y-是，N-否)") + private String tSign; + + + /** + * 组织架构编码 + */ + @ApiModelProperty("组织架构编码") + private String orgCode; + + + /** + * 有效标志（不在黑名单）(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志（不在黑名单）(Y-有效，N-无效)") + private String valid; + + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} 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 new file mode 100644 index 0000000..b1735df --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java @@ -0,0 +1,134 @@ +package com.xjrsoft.module.sales.controller; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.xjrsoft.common.constant.GlobalConstant; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.sales.dto.AddLngCustomerDto; +import com.xjrsoft.module.sales.dto.UpdateLngCustomerDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.sales.dto.LngCustomerPageDto; +import com.xjrsoft.module.sales.entity.LngCustomer; +import com.xjrsoft.module.sales.service.ICustomerService; +import com.xjrsoft.module.sales.vo.LngCustomerPageVo; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.sales.vo.LngCustomerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/sales" + "/customer") +@Api(value = "/sales" + "/customer",tags = "客户代码") +@AllArgsConstructor +public class CustomerController { + + + private final ICustomerService customerService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngCustomer列表(分页)") + @SaCheckPermission("customer:list") + public R page(@Valid LngCustomerPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getCuCode()),LngCustomer::getCuCode,dto.getCuCode()) + .like(StrUtil.isNotBlank(dto.getCuName()),LngCustomer::getCuName,dto.getCuName()) + .like(StrUtil.isNotBlank(dto.getCuSname()),LngCustomer::getCuSname,dto.getCuSname()) + .like(StrUtil.isNotBlank(dto.getCuMcode()),LngCustomer::getCuMcode,dto.getCuMcode()) + .like(StrUtil.isNotBlank(dto.getClassCode()),LngCustomer::getClassCode,dto.getClassCode()) + .like(StrUtil.isNotBlank(dto.getTypeCode()),LngCustomer::getTypeCode,dto.getTypeCode()) + .like(StrUtil.isNotBlank(dto.getNatureCode()),LngCustomer::getNatureCode,dto.getNatureCode()) + .like(StrUtil.isNotBlank(dto.getValid()),LngCustomer::getValid,dto.getValid()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngCustomer::getApproCode,dto.getApproCode()) + .orderByDesc(LngCustomer::getId) + .select(LngCustomer.class,x -> VoToColumnUtil.fieldsToColumns(LngCustomerPageVo.class).contains(x.getProperty())); + IPage page = customerService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngCustomerPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngCustomer信息") + @SaCheckPermission("customer:detail") + public R info(@RequestParam Long id){ + LngCustomer lngCustomer = customerService.getById(id); + if (lngCustomer == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngCustomer, LngCustomerVo.class)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngCustomer数据详细日志") + @SaCheckPermission("customer:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngCustomerDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngCustomer") + @SaCheckPermission("customer:add") + public R add(@Valid @RequestBody UpdateLngCustomerDto dto){ + UpdateLngCustomerDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngCustomer") + @SaCheckPermission("customer:edit") + public R update(@Valid @RequestBody UpdateLngCustomerDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("customer:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class, ids)); + + } + + @PostMapping("/enable") + @ApiOperation(value = "启用LngCustomer") + @SaCheckPermission("customer:enable") + public R enable(@Valid @RequestBody List ids){ + return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids)); + } + + + @PostMapping("/disable") + @ApiOperation(value = "禁用LngCustomer") + @SaCheckPermission("customer:disable") + public R disable(@Valid @RequestBody List ids){ + return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids)); + } + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java new file mode 100644 index 0000000..b3b8d76 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java @@ -0,0 +1,264 @@ +package com.xjrsoft.module.sales.entity; + +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 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; + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +@TableName("lng_customer") +@ApiModel(value = "客户对象", description = "客户") +public class LngCustomer implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 客户编码(不能重复，以C开头) + */ + @ApiModelProperty("客户编码(不能重复，以C开头)") + private String cuCode; + + /** + * 集团编码 + */ + @ApiModelProperty("集团编码") + private String cuMcode; + + /** + * 客户名称(不能与名称、简称重复) + */ + @ApiModelProperty("客户名称(不能与名称、简称重复)") + private String cuName; + + /** + * 简称(不能与名称、简称重复) + */ + @ApiModelProperty("简称(不能与名称、简称重复)") + private String cuSname; + + /** + * 国际/国内(I-国际，D-国内) + */ + @ApiModelProperty("国际/国内(I-国际，D-国内)") + private String dI; + + /** + * 企业性质(国有企业/非国有企业) + */ + @ApiModelProperty("企业性质(国有企业/非国有企业)") + private String natureCode; + + /** + * 母公司名称 + */ + @ApiModelProperty("母公司名称") + private String parentName; + + /** + * 统一社会信用代码(非空时不可重复) + */ + @ApiModelProperty("统一社会信用代码(非空时不可重复)") + private String creditNo; + + /** + * 纳税人识别号(非空时不可重复) + */ + @ApiModelProperty("纳税人识别号(非空时不可重复)") + private String tiNo; + + /** + * 法定代表人 + */ + @ApiModelProperty("法定代表人") + private String representative; + + /** + * 成立日期 + */ + @ApiModelProperty("成立日期") + private LocalDateTime dateEstab; + + /** + * 准入日期 + */ + @ApiModelProperty("准入日期") + private LocalDateTime dateEntry; + + /** + * 注册资本（万元） + */ + @ApiModelProperty("注册资本（万元）") + private String amtReg; + + /** + * 注册地址 + */ + @ApiModelProperty("注册地址") + private String addrReg; + + /** + * 通讯地址 + */ + @ApiModelProperty("通讯地址") + private String addrMail; + + /** + * 客户分类(一类/二类) + */ + @ApiModelProperty("客户分类(一类/二类)") + private String classCode; + + /** + * 客户类别(电厂/工业用户/城燃/贸易商) + */ + @ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)") + private String typeCode; + + /** + * 统计分类(内部/国电/华电/深能/其他) + */ + @ApiModelProperty("统计分类(内部/国电/华电/深能/其他)") + private String propCode; + + /** + * 国有企业持股 + */ + @ApiModelProperty("国有企业持股") + private String stateSign; + + /** + * 国企持股比例 + */ + @ApiModelProperty("国企持股比例") + private BigDecimal rateShare; + + /** + * 持股第一大股东名称 + */ + @ApiModelProperty("持股第一大股东名称") + private String shareName; + + /** + * 集团持股比例 + */ + @ApiModelProperty("集团持股比例") + private BigDecimal rateShareGn; + + /** + * 是否校验预付款(Y-是，N-否) + */ + @ApiModelProperty("是否校验预付款(Y-是，N-否)") + private String prepaySign; + + /** + * 有无线上(竞拍)(Y-有，N-无) + */ + @ApiModelProperty("有无线上(竞拍)(Y-有，N-无)") + private String onlineSign; + + /** + * 自有终端(Y-是，N-否) + */ + @ApiModelProperty("自有终端(Y-是，N-否)") + private String tSign; + + /** + * 组织架构编码 + */ + @ApiModelProperty("组织架构编码") + private String orgCode; + + /** + * 有效标志（不在黑名单）(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志（不在黑名单）(Y-有效，N-无效)") + private String valid; + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java new file mode 100644 index 0000000..7f046fb --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.sales.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.sales.entity.LngCustomer; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Mapper +public interface LngCustomerMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..539726f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/ICustomerService.java @@ -0,0 +1,19 @@ +package com.xjrsoft.module.sales.service; + +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.entity.LngCustomer; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ + +public interface ICustomerService extends IService { +} 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 new file mode 100644 index 0000000..6032edf --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java @@ -0,0 +1,25 @@ +package com.xjrsoft.module.sales.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.sales.entity.LngCustomer; +import com.xjrsoft.module.sales.mapper.LngCustomerMapper; +import com.xjrsoft.module.sales.service.ICustomerService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements ICustomerService { +} From 461d5c78b497b41ab8e553a257e2685d8dba795e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Wed, 19 Nov 2025 10:06:20 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=B8=E8=B4=A7?= =?UTF-8?q?=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdm/dto/AddLngBPlaceLngUnloadDto.java | 92 +++++++++++ .../mdm/dto/LngBPlaceLngUnloadPageDto.java | 70 ++++++++ .../mdm/dto/UpdateLngBPlaceLngUnloadDto.java | 103 ++++++++++++ .../mdm/vo/LngBPlaceLngUnloadPageVo.java | 75 +++++++++ .../module/mdm/vo/LngBPlaceLngUnloadVo.java | 142 ++++++++++++++++ .../controller/PlaceLngUnloadController.java | 127 +++++++++++++++ .../module/mdm/entity/LngBPlaceLngUnload.java | 152 ++++++++++++++++++ .../mdm/mapper/LngBPlaceLngUnloadMapper.java | 17 ++ .../mdm/service/IPlaceLngUnloadService.java | 19 +++ .../impl/PlaceLngUnloadServiceImpl.java | 25 +++ 10 files changed, 822 insertions(+) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPlaceLngUnloadDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPlaceLngUnloadPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPlaceLngUnloadDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PlaceLngUnloadController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPlaceLngUnload.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPlaceLngUnloadMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPlaceLngUnloadService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPlaceLngUnloadDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPlaceLngUnloadDto.java new file mode 100644 index 0000000..914b6d1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPlaceLngUnloadDto.java @@ -0,0 +1,92 @@ +package com.xjrsoft.module.mdm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + + + + +/** +* @title: 卸货地 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_place_lng_unload",name="卸货地") +public class AddLngBPlaceLngUnloadDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 助记码(自动生成，6位，000001……) + */ + @ApiModelProperty("助记码(自动生成，6位，000001……)") + @LogField(name="助记码(自动生成，6位，000001……)",index=0) + private String code; + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + @LogField(name="名称(不能重复)",index=0) + private String fullName; + /** + * 卸货区域 + */ + @ApiModelProperty("卸货区域") + @LogField(name="卸货区域",index=0) + private String regionCode; + /** + * 详细地址 + */ + @ApiModelProperty("详细地址") + @LogField(name="详细地址",index=0) + private String addr; + /** + * 经度 + */ + @ApiModelProperty("经度") + @LogField(name="经度",index=0) + private String longitude; + /** + * 纬度 + */ + @ApiModelProperty("纬度") + @LogField(name="纬度",index=0) + private String latitude; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + @LogField(name="显示顺序",index=0) + private Short sort; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + @LogField(name="有效标志(Y-有效，N-无效)",index=0) + private String valid; + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=0) + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + @LogField(name="租户id",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPlaceLngUnloadPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPlaceLngUnloadPageDto.java new file mode 100644 index 0000000..250c8fa --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPlaceLngUnloadPageDto.java @@ -0,0 +1,70 @@ +package com.xjrsoft.module.mdm.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngBPlaceLngUnloadPageDto extends PageInput { + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + /** + * 助记码(自动生成，6位，000001……) + */ + @ApiModelProperty("助记码(自动生成，6位，000001……)") + private String code; + /** + * 卸货区域 + */ + @ApiModelProperty("卸货区域") + private String regionCode; + /** + * 详细地址 + */ + @ApiModelProperty("详细地址") + private String addr; + /** + * 经度 + */ + @ApiModelProperty("经度") + private String longitude; + /** + * 纬度 + */ + @ApiModelProperty("纬度") + private String latitude; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPlaceLngUnloadDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPlaceLngUnloadDto.java new file mode 100644 index 0000000..1a153a4 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPlaceLngUnloadDto.java @@ -0,0 +1,103 @@ +package com.xjrsoft.module.mdm.dto; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + + + + +/** +* @title: 卸货地 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_place_lng_unload",name="卸货地") +public class UpdateLngBPlaceLngUnloadDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 助记码(自动生成，6位，000001……) + */ + @LogField(name="助记码(自动生成，6位，000001……)",index=1) + @ApiModelProperty("助记码(自动生成，6位，000001……)") + private String code; + + /** + * 名称(不能重复) + */ + @LogField(name="名称(不能重复)",index=2) + @ApiModelProperty("名称(不能重复)") + private String fullName; + + /** + * 卸货区域 + */ + @LogField(name="卸货区域",index=3) + @ApiModelProperty("卸货区域") + private String regionCode; + + /** + * 详细地址 + */ + @LogField(name="详细地址",index=4) + @ApiModelProperty("详细地址") + private String addr; + + /** + * 经度 + */ + @LogField(name="经度",index=5) + @ApiModelProperty("经度") + private String longitude; + + /** + * 纬度 + */ + @LogField(name="纬度",index=6) + @ApiModelProperty("纬度") + private String latitude; + + /** + * 显示顺序 + */ + @LogField(name="显示顺序",index=7) + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 有效标志(Y-有效，N-无效) + */ + @LogField(name="有效标志(Y-有效，N-无效)",index=8) + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + /** + * 备注 + */ + @LogField(name="备注",index=9) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=10) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadPageVo.java new file mode 100644 index 0000000..b551318 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadPageVo.java @@ -0,0 +1,75 @@ +package com.xjrsoft.module.mdm.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +public class LngBPlaceLngUnloadPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 助记码(自动生成，6位，000001……) + */ + @ApiModelProperty("助记码(自动生成，6位，000001……)") + private String code; + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + /** + * 卸货区域 + */ + @ApiModelProperty("卸货区域") + @Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7") + private String regionCode; + /** + * 详细地址 + */ + @ApiModelProperty("详细地址") + private String addr; + /** + * 经度 + */ + @ApiModelProperty("经度") + private String longitude; + /** + * 纬度 + */ + @ApiModelProperty("纬度") + private String latitude; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + @Trans(type = TransType.DIC, id = "1978057078528327681") + private String valid; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadVo.java new file mode 100644 index 0000000..84d7c7e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadVo.java @@ -0,0 +1,142 @@ +package com.xjrsoft.module.mdm.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +public class LngBPlaceLngUnloadVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 助记码(自动生成，6位，000001……) + */ + @ApiModelProperty("助记码(自动生成，6位，000001……)") + private String code; + + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + + + /** + * 卸货区域 + */ + @ApiModelProperty("卸货区域") + private String regionCode; + + + /** + * 详细地址 + */ + @ApiModelProperty("详细地址") + private String addr; + + + /** + * 经度 + */ + @ApiModelProperty("经度") + private String longitude; + + + /** + * 纬度 + */ + @ApiModelProperty("纬度") + private String latitude; + + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PlaceLngUnloadController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PlaceLngUnloadController.java new file mode 100644 index 0000000..d1654e3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PlaceLngUnloadController.java @@ -0,0 +1,127 @@ +package com.xjrsoft.module.mdm.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.mdm.dto.LngBPlaceLngUnloadPageDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBPlaceLngUnloadDto; +import com.xjrsoft.module.mdm.entity.LngBPlaceLngUnload; +import com.xjrsoft.module.mdm.service.IPlaceLngUnloadService; +import com.xjrsoft.module.mdm.vo.LngBPlaceLngUnloadPageVo; +import com.xjrsoft.module.mdm.vo.LngBPlaceLngUnloadVo; +import com.xjrsoft.module.system.client.ICodeRuleClient; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** +* @title: 卸货地 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/mdm" + "/placeLngUnload") +@Api(value = "/mdm" + "/placeLngUnload",tags = "卸货地代码") +@AllArgsConstructor +public class PlaceLngUnloadController { + + + private final IPlaceLngUnloadService placeLngUnloadService; + private final DatalogService dataService; + + private final ICodeRuleClient codeRuleClient; + + private final String CODE = "placeLngUnloadCode"; + + @GetMapping(value = "/page") + @ApiOperation(value="LngBPlaceLngUnload列表(分页)") + @SaCheckPermission("placeLngUnload:list") + public R page(@Valid LngBPlaceLngUnloadPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getFullName()),LngBPlaceLngUnload::getFullName,dto.getFullName()) + .eq(StrUtil.isNotBlank(dto.getValid()),LngBPlaceLngUnload::getValid,dto.getValid()) + .orderByAsc(LngBPlaceLngUnload::getSort, LngBPlaceLngUnload::getCode) + .select(LngBPlaceLngUnload.class,x -> VoToColumnUtil.fieldsToColumns(LngBPlaceLngUnloadPageVo.class).contains(x.getProperty())); + IPage page = placeLngUnloadService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngBPlaceLngUnloadPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngBPlaceLngUnload信息") + @SaCheckPermission("placeLngUnload:detail") + public R info(@RequestParam Long id){ + LngBPlaceLngUnload lngBPlaceLngUnload = placeLngUnloadService.getById(id); + if (lngBPlaceLngUnload == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngBPlaceLngUnload, LngBPlaceLngUnloadVo.class)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBPlaceLngUnload数据详细日志") + @SaCheckPermission("placeLngUnload:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBPlaceLngUnloadDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngBPlaceLngUnload") + @SaCheckPermission("placeLngUnload:add") + public R add(@Valid @RequestBody UpdateLngBPlaceLngUnloadDto dto){ + dto.setCode(codeRuleClient.genEncode(CODE)); + UpdateLngBPlaceLngUnloadDto res = dataService.insert(dto); + codeRuleClient.useEncode(CODE); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngBPlaceLngUnload") + @SaCheckPermission("placeLngUnload:edit") + public R update(@Valid @RequestBody UpdateLngBPlaceLngUnloadDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("placeLngUnload:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngBPlaceLngUnloadDto.class, ids)); + + } + + @PostMapping("/enable") + @ApiOperation(value = "启用LngBPlaceLngUnload") + @SaCheckPermission("placeLngUnload:enable") + public R enable(@Valid @RequestBody List ids){ + return R.ok(dataService.enable(UpdateLngBPlaceLngUnloadDto.class,ids)); + } + + + @PostMapping("/disable") + @ApiOperation(value = "禁用LngBPlaceLngUnload") + @SaCheckPermission("placeLngUnload:disable") + public R disable(@Valid @RequestBody List ids){ + return R.ok(dataService.disable(UpdateLngBPlaceLngUnloadDto.class,ids)); + } + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPlaceLngUnload.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPlaceLngUnload.java new file mode 100644 index 0000000..1f9e1e6 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPlaceLngUnload.java @@ -0,0 +1,152 @@ +package com.xjrsoft.module.mdm.entity; + +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 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; + + +/** +* @title: 卸货地 +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Data +@TableName("lng_b_place_lng_unload") +@ApiModel(value = "卸货地对象", description = "卸货地") +public class LngBPlaceLngUnload implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 助记码(自动生成，6位，000001……) + */ + @ApiModelProperty("助记码(自动生成，6位，000001……)") + private String code; + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + + /** + * 卸货区域 + */ + @ApiModelProperty("卸货区域") + private String regionCode; + + /** + * 详细地址 + */ + @ApiModelProperty("详细地址") + private String addr; + + /** + * 经度 + */ + @ApiModelProperty("经度") + private String longitude; + + /** + * 纬度 + */ + @ApiModelProperty("纬度") + private String latitude; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * 逻辑删除 + */ + @ApiModelProperty("逻辑删除") + @TableField(fill = FieldFill.INSERT) + @TableLogic + private Integer deleteMark; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPlaceLngUnloadMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPlaceLngUnloadMapper.java new file mode 100644 index 0000000..b3287a6 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPlaceLngUnloadMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.mdm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.mdm.entity.LngBPlaceLngUnload; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Mapper +public interface LngBPlaceLngUnloadMapper extends BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPlaceLngUnloadService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPlaceLngUnloadService.java new file mode 100644 index 0000000..8613d99 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPlaceLngUnloadService.java @@ -0,0 +1,19 @@ +package com.xjrsoft.module.mdm.service; + +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.mdm.entity.LngBPlaceLngUnload; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ + +public interface IPlaceLngUnloadService extends IService { +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java new file mode 100644 index 0000000..33ab535 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java @@ -0,0 +1,25 @@ +package com.xjrsoft.module.mdm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.mdm.entity.LngBPlaceLngUnload; +import com.xjrsoft.module.mdm.mapper.LngBPlaceLngUnloadMapper; +import com.xjrsoft.module.mdm.service.IPlaceLngUnloadService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-11-18 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PlaceLngUnloadServiceImpl extends ServiceImpl implements IPlaceLngUnloadService { +} From 3e1ad8abbf54836e972824923c39e73235e70e7f Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Wed, 19 Nov 2025 14:16:57 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B9=E6=8D=AEid?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8B=E7=BA=A7=E5=9C=B0=E5=8C=BA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CountryRegionController.java | 4 +- .../mdm/service/ICountryRegionService.java | 2 +- .../impl/CountryRegionServiceImpl.java | 10 ++-- .../sales/controller/CustomerController.java | 52 ++++++++++--------- .../module/sales/entity/LngCustomer.java | 15 +++--- 5 files changed, 41 insertions(+), 42 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java index fe31c72..1e4d2b5 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java @@ -231,11 +231,11 @@ public class CountryRegionController { @GetMapping("/getParentByCode") @ApiOperation(value = "根据id 查询下级区域") - public R getRegionByParentId(@RequestParam(required = true) String code,@RequestParam(required = false) String excludeType, + public R getParentByCode(@RequestParam(required = true) String code,@RequestParam(required = false) String excludeType, @RequestParam(required = false) String startPCode ) { - return R.ok(countryRegionService.getRegionByParentId(code,excludeType,startPCode)); + return R.ok(countryRegionService.getParentByCode(code,excludeType,startPCode)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java index fe86c8d..e91cca1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java @@ -19,7 +19,7 @@ import com.xjrsoft.module.mdm.vo.LngBRegionVo; public interface ICountryRegionService extends IService { - Map getRegionByParentId(String code, String excludeType, String startPCode); + Map getParentByCode(String code, String excludeType, String startPCode); List child(Long pid,String excludeType, String keyword,String startPCode); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java index aa9b2ec..cfa30d0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java @@ -39,7 +39,7 @@ import shade.powerjob.com.google.common.collect.Lists; public class CountryRegionServiceImpl extends ServiceImpl implements ICountryRegionService { @Override - public Map getRegionByParentId(String code,String excludeType,String startPCode) { + public Map getParentByCode(String code,String excludeType,String startPCode) { Map result = new HashMap<>(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(LngBRegion::getCode,code); @@ -51,17 +51,17 @@ public class CountryRegionServiceImpl extends ServiceImpl excludeTypeList = CollectionUtils.newArrayList(); if(StringUtils.isNotBlank(startPCode)) { LambdaQueryWrapper qw = new LambdaQueryWrapper(); - queryWrapper.eq(LngBRegion::getCode,startPCode); + qw.eq(LngBRegion::getCode,startPCode); LngBRegion tempPr = this.getOne(qw); excludeTypeList.add(tempPr.getRegionTypeCode()); } - if(StringUtils.isNotBlank(startPCode)) { + if(StringUtils.isNotBlank(excludeType)) { excludeTypeList.add(excludeType); } LambdaQueryWrapper tempQw = Wrappers.query().lambda() - .ne(StringUtils.isNotBlank(excludeType),LngBRegion::getRegionTypeCode, excludeType) - .eq(StringUtils.isNotBlank(startPCode),LngBRegion::getCode, startPCode); + .notIn(StringUtils.isNotBlank(excludeType),LngBRegion::getRegionTypeCode, excludeTypeList); + //.eq(StringUtils.isNotBlank(startPCode),LngBRegion::getCode, startPCode); List allList = this.list(tempQw); Map map = allList.stream().collect(Collectors.toMap(LngBRegion::getId, obj -> obj)); 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 b1735df..68859cf 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 @@ -1,36 +1,39 @@ package com.xjrsoft.module.sales.controller; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.xjrsoft.common.constant.GlobalConstant; -import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; -import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.utils.VoToColumnUtil; -import com.xjrsoft.module.sales.dto.AddLngCustomerDto; -import com.xjrsoft.module.sales.dto.UpdateLngCustomerDto; -import cn.dev33.satoken.annotation.SaCheckPermission; - +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.sales.dto.LngCustomerPageDto; +import com.xjrsoft.module.sales.dto.UpdateLngCustomerDto; import com.xjrsoft.module.sales.entity.LngCustomer; import com.xjrsoft.module.sales.service.ICustomerService; import com.xjrsoft.module.sales.vo.LngCustomerPageVo; -import com.xjrsoft.module.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.sales.vo.LngCustomerVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import java.util.List; /** * @title: 客户 @@ -39,8 +42,8 @@ import java.util.List; * @Version 1.0 */ @RestController -@RequestMapping("/sales" + "/customer") -@Api(value = "/sales" + "/customer",tags = "客户代码") +@RequestMapping("/sales/customer") +@Api(value = "/sales/customer",tags = "客户管理") @AllArgsConstructor public class CustomerController { @@ -64,8 +67,7 @@ public class CustomerController { .like(StrUtil.isNotBlank(dto.getNatureCode()),LngCustomer::getNatureCode,dto.getNatureCode()) .like(StrUtil.isNotBlank(dto.getValid()),LngCustomer::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getApproCode()),LngCustomer::getApproCode,dto.getApproCode()) - .orderByDesc(LngCustomer::getId) - .select(LngCustomer.class,x -> VoToColumnUtil.fieldsToColumns(LngCustomerPageVo.class).contains(x.getProperty())); + .orderByDesc(LngCustomer::getId); IPage page = customerService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngCustomerPageVo.class); return R.ok(pageOutput); @@ -110,7 +112,7 @@ public class CustomerController { @ApiOperation(value = "删除") @SaCheckPermission("customer:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class, ids)); } @@ -118,7 +120,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)); } @@ -126,7 +128,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)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java index b3b8d76..7da0e3f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java @@ -1,20 +1,17 @@ package com.xjrsoft.module.sales.entity; +import java.io.Serializable; +import java.math.BigDecimal; +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; /** From 0bbd96f6cfa3e9d9727cfe8683d06e979fd011ad Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Wed, 19 Nov 2025 16:56:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=94=9F=E6=88=90=E9=94=80=E5=94=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/dto/AddLngCustomerAttrPowerDto.java | 58 ++++++ .../sales/dto/AddLngCustomerBankDto.java | 74 ++++++++ .../sales/dto/AddLngCustomerContactDto.java | 80 ++++++++ .../sales/dto/AddLngCustomerDocDto.java | 80 ++++++++ .../module/sales/dto/AddLngCustomerDto.java | 31 ++- .../module/sales/dto/LngCustomerPageDto.java | 8 +- .../dto/UpdateLngCustomerAttrPowerDto.java | 79 ++++++++ .../sales/dto/UpdateLngCustomerBankDto.java | 93 +++++++++ .../dto/UpdateLngCustomerContactDto.java | 100 ++++++++++ .../sales/dto/UpdateLngCustomerDocDto.java | 100 ++++++++++ .../sales/dto/UpdateLngCustomerDto.java | 57 +++++- .../sales/vo/LngCustomerAttrPowerVo.java | 107 +++++++++++ .../module/sales/vo/LngCustomerBankVo.java | 121 ++++++++++++ .../module/sales/vo/LngCustomerContactVo.java | 128 +++++++++++++ .../module/sales/vo/LngCustomerDocVo.java | 128 +++++++++++++ .../module/sales/vo/LngCustomerPageVo.java | 9 +- .../module/sales/vo/LngCustomerVo.java | 31 ++- .../sales/controller/CustomerController.java | 17 +- .../module/sales/entity/LngCustomer.java | 32 +++- .../sales/entity/LngCustomerAttrPower.java | 111 +++++++++++ .../module/sales/entity/LngCustomerBank.java | 126 +++++++++++++ .../sales/entity/LngCustomerContact.java | 132 +++++++++++++ .../module/sales/entity/LngCustomerDoc.java | 132 +++++++++++++ .../mapper/LngCustomerAttrPowerMapper.java | 17 ++ .../sales/mapper/LngCustomerBankMapper.java | 17 ++ .../mapper/LngCustomerContactMapper.java | 17 ++ .../sales/mapper/LngCustomerDocMapper.java | 17 ++ .../sales/mapper/LngCustomerMapper.java | 4 +- .../sales/service/ICustomerService.java | 27 ++- .../service/impl/CustomerServiceImpl.java | 178 +++++++++++++++++- 30 files changed, 2059 insertions(+), 52 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerAttrPowerDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerBankDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerContactDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDocDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerAttrPowerDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerBankDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerContactDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerAttrPowerVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerBankVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerContactVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerAttrPower.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerBank.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerContact.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerAttrPowerMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerBankMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerContactMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerAttrPowerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerAttrPowerDto.java new file mode 100644 index 0000000..76e21c5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerAttrPowerDto.java @@ -0,0 +1,58 @@ +package com.xjrsoft.module.sales.dto; + +import java.io.Serializable; +import java.math.BigDecimal; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_customer_attr_power",name="客户") +public class AddLngCustomerAttrPowerDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + @LogField(name="客户编码",index=0) + private String cuCode; + /** + * 管道编码 + */ + @ApiModelProperty("管道编码") + @LogField(name="管道编码",index=0) + private String lineCode; + /** + * 装机量（万KW） + */ + @ApiModelProperty("装机量（万KW）") + @LogField(name="装机量（万KW）",index=0) + private BigDecimal capacity; + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=0) + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + @LogField(name="租户id",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerBankDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerBankDto.java new file mode 100644 index 0000000..a31c4b2 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerBankDto.java @@ -0,0 +1,74 @@ +package com.xjrsoft.module.sales.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_customer_bank",name="客户") +public class AddLngCustomerBankDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + @LogField(name="客户编码",index=0) + private String cuCode; + /** + * 银行 + */ + @ApiModelProperty("银行") + @LogField(name="银行",index=0) + private String bankCode; + /** + * 账号名称 + */ + @ApiModelProperty("账号名称") + @LogField(name="账号名称",index=0) + private String accountName; + /** + * 账号 + */ + @ApiModelProperty("账号") + @LogField(name="账号",index=0) + private String account; + /** + * 默认账号(Y-是，N-否；只能有一个Y的有效记录) + */ + @ApiModelProperty("默认账号(Y-是，N-否；只能有一个Y的有效记录)") + @LogField(name="默认账号(Y-是，N-否；只能有一个Y的有效记录)",index=0) + private String defaultSign; + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=0) + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + @LogField(name="租户id",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerContactDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerContactDto.java new file mode 100644 index 0000000..636d9ba --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerContactDto.java @@ -0,0 +1,80 @@ +package com.xjrsoft.module.sales.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_customer_contact",name="客户") +public class AddLngCustomerContactDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + @LogField(name="客户编码",index=0) + private String cuCode; + /** + * 姓名 + */ + @ApiModelProperty("姓名") + @LogField(name="姓名",index=0) + private String contactName; + /** + * 联系电话 + */ + @ApiModelProperty("联系电话") + @LogField(name="联系电话",index=0) + private String tel; + /** + * 通讯地址 + */ + @ApiModelProperty("通讯地址") + @LogField(name="通讯地址",index=0) + private String addrMail; + /** + * 电子邮箱 + */ + @ApiModelProperty("电子邮箱") + @LogField(name="电子邮箱",index=0) + private String email; + /** + * 职位 + */ + @ApiModelProperty("职位") + @LogField(name="职位",index=0) + private String position; + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=0) + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + @LogField(name="租户id",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDocDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDocDto.java new file mode 100644 index 0000000..0954a8a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDocDto.java @@ -0,0 +1,80 @@ +package com.xjrsoft.module.sales.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_customer_doc",name="客户") +public class AddLngCustomerDocDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + @LogField(name="客户编码",index=0) + private String cuCode; + /** + * 资质证书类型 + */ + @ApiModelProperty("资质证书类型") + @LogField(name="资质证书类型",index=0) + private String docTypeCode; + /** + * 资质证书编号 + */ + @ApiModelProperty("资质证书编号") + @LogField(name="资质证书编号",index=0) + private String docNo; + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + @LogField(name="有效期开始",index=0) + private LocalDateTime dateFrom; + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + @LogField(name="有效期结束",index=0) + private LocalDateTime dateTo; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + @LogField(name="显示顺序",index=0) + private Short sort; + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=0) + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + @LogField(name="租户id",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java index 0c5da5c..bf0740b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java @@ -1,25 +1,22 @@ package com.xjrsoft.module.sales.dto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; import java.io.Serializable; -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.time.LocalTime; -import java.time.LocalDateTime; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; import com.pictc.annotations.datalog.LogField; import com.pictc.annotations.datalog.LogTable; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * @title: 客户 * @Author 管理员 -* @Date: 2025-11-18 +* @Date: 2025-11-19 * @Version 1.0 */ @Data @@ -209,4 +206,24 @@ public class AddLngCustomerDto implements Serializable { @LogField(name="租户id",index=0) private Long tenantId; + /** + * lngCustomerAttrPower + */ + @ApiModelProperty("lngCustomerAttrPower子表") + private List lngCustomerAttrPowerList; + /** + * lngCustomerBank + */ + @ApiModelProperty("lngCustomerBank子表") + private List lngCustomerBankList; + /** + * lngCustomerDoc + */ + @ApiModelProperty("lngCustomerDoc子表") + private List lngCustomerDocList; + /** + * lngCustomerContact + */ + @ApiModelProperty("lngCustomerContact子表") + private List lngCustomerContactList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngCustomerPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngCustomerPageDto.java index 35fc0fb..bb1b2eb 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngCustomerPageDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngCustomerPageDto.java @@ -1,20 +1,16 @@ package com.xjrsoft.module.sales.dto; import com.xjrsoft.common.page.PageInput; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; /** * @title: 分页查询入参 * @Author 管理员 -* @Date: 2025-11-18 +* @Date: 2025-11-19 * @Version 1.0 */ @Data diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerAttrPowerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerAttrPowerDto.java new file mode 100644 index 0000000..81d5f77 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerAttrPowerDto.java @@ -0,0 +1,79 @@ +package com.xjrsoft.module.sales.dto; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_customer_attr_power",name="客户") +public class UpdateLngCustomerAttrPowerDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 客户编码 + */ + @LogField(name="客户编码",index=1) + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 管道编码 + */ + @LogField(name="管道编码",index=2) + @ApiModelProperty("管道编码") + private String lineCode; + + /** + * 装机量（万KW） + */ + @LogField(name="装机量（万KW）",index=3) + @ApiModelProperty("装机量（万KW）") + private BigDecimal capacity; + + /** + * 备注 + */ + @LogField(name="备注",index=4) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=5) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerBankDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerBankDto.java new file mode 100644 index 0000000..4ffe9a4 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerBankDto.java @@ -0,0 +1,93 @@ +package com.xjrsoft.module.sales.dto; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_customer_bank",name="客户") +public class UpdateLngCustomerBankDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 客户编码 + */ + @LogField(name="客户编码",index=1) + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 银行 + */ + @LogField(name="银行",index=2) + @ApiModelProperty("银行") + private String bankCode; + + /** + * 账号名称 + */ + @LogField(name="账号名称",index=3) + @ApiModelProperty("账号名称") + private String accountName; + + /** + * 账号 + */ + @LogField(name="账号",index=4) + @ApiModelProperty("账号") + private String account; + + /** + * 默认账号(Y-是，N-否；只能有一个Y的有效记录) + */ + @LogField(name="默认账号(Y-是，N-否；只能有一个Y的有效记录)",index=5) + @ApiModelProperty("默认账号(Y-是，N-否；只能有一个Y的有效记录)") + private String defaultSign; + + /** + * 备注 + */ + @LogField(name="备注",index=6) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=7) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerContactDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerContactDto.java new file mode 100644 index 0000000..897a583 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerContactDto.java @@ -0,0 +1,100 @@ +package com.xjrsoft.module.sales.dto; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_customer_contact",name="客户") +public class UpdateLngCustomerContactDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 客户编码 + */ + @LogField(name="客户编码",index=1) + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 姓名 + */ + @LogField(name="姓名",index=2) + @ApiModelProperty("姓名") + private String contactName; + + /** + * 联系电话 + */ + @LogField(name="联系电话",index=3) + @ApiModelProperty("联系电话") + private String tel; + + /** + * 通讯地址 + */ + @LogField(name="通讯地址",index=4) + @ApiModelProperty("通讯地址") + private String addrMail; + + /** + * 电子邮箱 + */ + @LogField(name="电子邮箱",index=5) + @ApiModelProperty("电子邮箱") + private String email; + + /** + * 职位 + */ + @LogField(name="职位",index=6) + @ApiModelProperty("职位") + private String position; + + /** + * 备注 + */ + @LogField(name="备注",index=7) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=8) + @ApiModelProperty("租户id") + private Long tenantId; + + +} 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 new file mode 100644 index 0000000..a0a5721 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java @@ -0,0 +1,100 @@ +package com.xjrsoft.module.sales.dto; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_customer_doc",name="客户") +public class UpdateLngCustomerDocDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 客户编码 + */ + @LogField(name="客户编码",index=1) + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 资质证书类型 + */ + @LogField(name="资质证书类型",index=2) + @ApiModelProperty("资质证书类型") + private String docTypeCode; + + /** + * 资质证书编号 + */ + @LogField(name="资质证书编号",index=3) + @ApiModelProperty("资质证书编号") + private String docNo; + + /** + * 有效期开始 + */ + @LogField(name="有效期开始",index=4) + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + /** + * 有效期结束 + */ + @LogField(name="有效期结束",index=5) + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + + /** + * 显示顺序 + */ + @LogField(name="显示顺序",index=6) + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 备注 + */ + @LogField(name="备注",index=7) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=8) + @ApiModelProperty("租户id") + private Long tenantId; + + +} 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 28706da..b93f067 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 @@ -1,30 +1,27 @@ package com.xjrsoft.module.sales.dto; -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 com.fasterxml.jackson.annotation.JsonFormat; +import java.time.LocalDateTime; import java.util.List; -import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; import com.pictc.annotations.datalog.LogField; import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; -import com.pictc.annotations.datalog.JoinCaseType; -import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogTable; import com.pictc.annotations.datalog.ValueDirectionType; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * @title: 客户 * @Author 管理员 -* @Date: 2025-11-18 +* @Date: 2025-11-19 * @Version 1.0 */ @Data @@ -251,4 +248,44 @@ public class UpdateLngCustomerDto implements Serializable { private Long tenantId; + /** + * lngCustomerAttrPower + */ + @ApiModelProperty("lngCustomerAttrPower子表") + @LogJoin(name = "lngCustomerAttrPower子表", + columns = { + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngCustomerAttrPowerDto.class, type = JoinType.MANY) + private List lngCustomerAttrPowerList; + /** + * lngCustomerBank + */ + @ApiModelProperty("lngCustomerBank子表") + @LogJoin(name = "lngCustomerBank子表", + columns = { + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngCustomerBankDto.class, type = JoinType.MANY) + private List lngCustomerBankList; + /** + * lngCustomerDoc + */ + @ApiModelProperty("lngCustomerDoc子表") + @LogJoin(name = "lngCustomerDoc子表", + columns = { + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngCustomerDocDto.class, type = JoinType.MANY) + private List lngCustomerDocList; + /** + * lngCustomerContact + */ + @ApiModelProperty("lngCustomerContact子表") + @LogJoin(name = "lngCustomerContact子表", + columns = { + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngCustomerContactDto.class, type = JoinType.MANY) + private List lngCustomerContactList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerAttrPowerVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerAttrPowerVo.java new file mode 100644 index 0000000..e9bfb35 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerAttrPowerVo.java @@ -0,0 +1,107 @@ +package com.xjrsoft.module.sales.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +public class LngCustomerAttrPowerVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + + /** + * 管道编码 + */ + @ApiModelProperty("管道编码") + private String lineCode; + + + /** + * 装机量（万KW） + */ + @ApiModelProperty("装机量（万KW）") + private BigDecimal capacity; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerBankVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerBankVo.java new file mode 100644 index 0000000..02ca81b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerBankVo.java @@ -0,0 +1,121 @@ +package com.xjrsoft.module.sales.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +public class LngCustomerBankVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + + /** + * 银行 + */ + @ApiModelProperty("银行") + private String bankCode; + + + /** + * 账号名称 + */ + @ApiModelProperty("账号名称") + private String accountName; + + + /** + * 账号 + */ + @ApiModelProperty("账号") + private String account; + + + /** + * 默认账号(Y-是，N-否；只能有一个Y的有效记录) + */ + @ApiModelProperty("默认账号(Y-是，N-否；只能有一个Y的有效记录)") + private String defaultSign; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerContactVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerContactVo.java new file mode 100644 index 0000000..363b72f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerContactVo.java @@ -0,0 +1,128 @@ +package com.xjrsoft.module.sales.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +public class LngCustomerContactVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + + /** + * 姓名 + */ + @ApiModelProperty("姓名") + private String contactName; + + + /** + * 联系电话 + */ + @ApiModelProperty("联系电话") + private String tel; + + + /** + * 通讯地址 + */ + @ApiModelProperty("通讯地址") + private String addrMail; + + + /** + * 电子邮箱 + */ + @ApiModelProperty("电子邮箱") + private String email; + + + /** + * 职位 + */ + @ApiModelProperty("职位") + private String position; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} 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 new file mode 100644 index 0000000..ef0d4fe --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java @@ -0,0 +1,128 @@ +package com.xjrsoft.module.sales.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +public class LngCustomerDocVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + + /** + * 资质证书类型 + */ + @ApiModelProperty("资质证书类型") + private String docTypeCode; + + + /** + * 资质证书编号 + */ + @ApiModelProperty("资质证书编号") + private String docNo; + + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} 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 f519554..6eecdab 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,19 +1,12 @@ package com.xjrsoft.module.sales.vo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.xjrsoft.common.annotation.Trans; -import com.xjrsoft.common.enums.TransType; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; - /** * @title: 分页列表出参 * @Author 管理员 -* @Date: 2025-11-18 +* @Date: 2025-11-19 * @Version 1.0 */ @Data diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java index cc3472f..863df61 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java @@ -1,17 +1,16 @@ package com.xjrsoft.module.sales.vo; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; - /** * @title: 表单出参 * @Author 管理员 -* @Date: 2025-11-18 +* @Date: 2025-11-19 * @Version 1.0 */ @Data @@ -278,5 +277,25 @@ public class LngCustomerVo { + /** + * lngCustomerAttrPower + */ + @ApiModelProperty("lngCustomerAttrPower子表") + private List lngCustomerAttrPowerList; + /** + * lngCustomerBank + */ + @ApiModelProperty("lngCustomerBank子表") + private List lngCustomerBankList; + /** + * lngCustomerDoc + */ + @ApiModelProperty("lngCustomerDoc子表") + private List lngCustomerDocList; + /** + * lngCustomerContact + */ + @ApiModelProperty("lngCustomerContact子表") + private List lngCustomerContactList; } 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 68859cf..bdbdd3f 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 @@ -38,12 +38,12 @@ import lombok.AllArgsConstructor; /** * @title: 客户 * @Author 管理员 -* @Date: 2025-11-18 +* @Date: 2025-11-19 * @Version 1.0 */ @RestController -@RequestMapping("/sales/customer") -@Api(value = "/sales/customer",tags = "客户管理") +@RequestMapping("/sales" + "/customer") +@Api(value = "/sales" + "/customer",tags = "客户代码") @AllArgsConstructor public class CustomerController { @@ -67,7 +67,8 @@ public class CustomerController { .like(StrUtil.isNotBlank(dto.getNatureCode()),LngCustomer::getNatureCode,dto.getNatureCode()) .like(StrUtil.isNotBlank(dto.getValid()),LngCustomer::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getApproCode()),LngCustomer::getApproCode,dto.getApproCode()) - .orderByDesc(LngCustomer::getId); + .orderByDesc(LngCustomer::getId) + .select(LngCustomer.class,x -> VoToColumnUtil.fieldsToColumns(LngCustomerPageVo.class).contains(x.getProperty())); IPage page = customerService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngCustomerPageVo.class); return R.ok(pageOutput); @@ -77,7 +78,7 @@ public class CustomerController { @ApiOperation(value="根据id查询LngCustomer信息") @SaCheckPermission("customer:detail") public R info(@RequestParam Long id){ - LngCustomer lngCustomer = customerService.getById(id); + LngCustomer lngCustomer = customerService.getByIdDeep(id); if (lngCustomer == null) { return R.error("找不到此数据！"); } @@ -112,7 +113,7 @@ public class CustomerController { @ApiOperation(value = "删除") @SaCheckPermission("customer:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class, ids)); } @@ -120,7 +121,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)); } @@ -128,7 +129,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)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java index 7da0e3f..9f7fb84 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java @@ -3,11 +3,13 @@ package com.xjrsoft.module.sales.entity; import java.io.Serializable; import java.math.BigDecimal; 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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -17,7 +19,7 @@ import lombok.Data; /** * @title: 客户 * @Author 管理员 -* @Date: 2025-11-18 +* @Date: 2025-11-19 * @Version 1.0 */ @Data @@ -257,5 +259,33 @@ public class LngCustomer implements Serializable { private Long ruleUserId; + /** + * lngCustomerAttrPower + */ + @ApiModelProperty("lngCustomerAttrPower子表") + @TableField(exist = false) + @EntityMapping(thisField = "cuCode", joinField = "cuCode") + private List lngCustomerAttrPowerList; + /** + * lngCustomerBank + */ + @ApiModelProperty("lngCustomerBank子表") + @TableField(exist = false) + @EntityMapping(thisField = "cuCode", joinField = "cuCode") + private List lngCustomerBankList; + /** + * lngCustomerDoc + */ + @ApiModelProperty("lngCustomerDoc子表") + @TableField(exist = false) + @EntityMapping(thisField = "cuCode", joinField = "cuCode") + private List lngCustomerDocList; + /** + * lngCustomerContact + */ + @ApiModelProperty("lngCustomerContact子表") + @TableField(exist = false) + @EntityMapping(thisField = "cuCode", joinField = "cuCode") + private List lngCustomerContactList; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerAttrPower.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerAttrPower.java new file mode 100644 index 0000000..4fab19e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerAttrPower.java @@ -0,0 +1,111 @@ +package com.xjrsoft.module.sales.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@TableName("lng_customer_attr_power") +@ApiModel(value = "客户对象", description = "客户") +public class LngCustomerAttrPower implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 管道编码 + */ + @ApiModelProperty("管道编码") + private String lineCode; + + /** + * 装机量（万KW） + */ + @ApiModelProperty("装机量（万KW）") + private BigDecimal capacity; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerBank.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerBank.java new file mode 100644 index 0000000..f0546a3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerBank.java @@ -0,0 +1,126 @@ +package com.xjrsoft.module.sales.entity; + +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 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; + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@TableName("lng_customer_bank") +@ApiModel(value = "客户对象", description = "客户") +public class LngCustomerBank implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 银行 + */ + @ApiModelProperty("银行") + private String bankCode; + + /** + * 账号名称 + */ + @ApiModelProperty("账号名称") + private String accountName; + + /** + * 账号 + */ + @ApiModelProperty("账号") + private String account; + + /** + * 默认账号(Y-是，N-否；只能有一个Y的有效记录) + */ + @ApiModelProperty("默认账号(Y-是，N-否；只能有一个Y的有效记录)") + private String defaultSign; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerContact.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerContact.java new file mode 100644 index 0000000..f204b1f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerContact.java @@ -0,0 +1,132 @@ +package com.xjrsoft.module.sales.entity; + +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 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; + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@TableName("lng_customer_contact") +@ApiModel(value = "客户对象", description = "客户") +public class LngCustomerContact implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 姓名 + */ + @ApiModelProperty("姓名") + private String contactName; + + /** + * 联系电话 + */ + @ApiModelProperty("联系电话") + private String tel; + + /** + * 通讯地址 + */ + @ApiModelProperty("通讯地址") + private String addrMail; + + /** + * 电子邮箱 + */ + @ApiModelProperty("电子邮箱") + private String email; + + /** + * 职位 + */ + @ApiModelProperty("职位") + private String position; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file 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 new file mode 100644 index 0000000..6986c82 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java @@ -0,0 +1,132 @@ +package com.xjrsoft.module.sales.entity; + +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 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; + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Data +@TableName("lng_customer_doc") +@ApiModel(value = "客户对象", description = "客户") +public class LngCustomerDoc implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 资质证书类型 + */ + @ApiModelProperty("资质证书类型") + private String docTypeCode; + + /** + * 资质证书编号 + */ + @ApiModelProperty("资质证书编号") + private String docNo; + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerAttrPowerMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerAttrPowerMapper.java new file mode 100644 index 0000000..3091a47 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerAttrPowerMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.sales.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.sales.entity.LngCustomerAttrPower; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Mapper +public interface LngCustomerAttrPowerMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerBankMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerBankMapper.java new file mode 100644 index 0000000..160671c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerBankMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.sales.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.sales.entity.LngCustomerBank; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Mapper +public interface LngCustomerBankMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerContactMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerContactMapper.java new file mode 100644 index 0000000..85b2b09 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerContactMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.sales.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.sales.entity.LngCustomerContact; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Mapper +public interface LngCustomerContactMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java new file mode 100644 index 0000000..200485d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.sales.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.sales.entity.LngCustomerDoc; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-11-19 +* @Version 1.0 +*/ +@Mapper +public interface LngCustomerDocMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java index 7f046fb..87fb9c2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java @@ -8,10 +8,10 @@ import org.apache.ibatis.annotations.Mapper; /** * @title: mapper * @Author 管理员 -* @Date: 2025-11-18 +* @Date: 2025-11-19 * @Version 1.0 */ @Mapper -public interface LngCustomerMapper extends BaseMapper { +public interface LngCustomerMapper extends MPJBaseMapper { } 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 539726f..be3aaa8 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 @@ -11,9 +11,32 @@ import java.util.List; /** * @title: service * @Author 管理员 -* @Date: 2025-11-18 +* @Date: 2025-11-19 * @Version 1.0 */ -public interface ICustomerService extends IService { +public interface ICustomerService extends MPJBaseService, MPJDeepService, MPJRelationService { + /** + * 新增 + * + * @param lngCustomer + * @return + */ + Boolean add(LngCustomer lngCustomer); + + /** + * 更新 + * + * @param lngCustomer + * @return + */ + Boolean update(LngCustomer lngCustomer); + + /** + * 删除 + * + * @param ids + * @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 6032edf..272d9f4 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 @@ -2,6 +2,14 @@ package com.xjrsoft.module.sales.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.sales.entity.LngCustomerAttrPower; +import com.xjrsoft.module.sales.mapper.LngCustomerAttrPowerMapper; +import com.xjrsoft.module.sales.entity.LngCustomerBank; +import com.xjrsoft.module.sales.mapper.LngCustomerBankMapper; +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.entity.LngCustomer; import com.xjrsoft.module.sales.mapper.LngCustomerMapper; import com.xjrsoft.module.sales.service.ICustomerService; @@ -16,10 +24,176 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** * @title: service * @Author 管理员 -* @Date: 2025-11-18 +* @Date: 2025-11-19 * @Version 1.0 */ @Service @AllArgsConstructor -public class CustomerServiceImpl extends ServiceImpl implements ICustomerService { +public class CustomerServiceImpl extends MPJBaseServiceImpl implements ICustomerService { + private final LngCustomerMapper customerLngCustomerMapper; + + private final LngCustomerAttrPowerMapper customerLngCustomerAttrPowerMapper; + private final LngCustomerBankMapper customerLngCustomerBankMapper; + private final LngCustomerDocMapper customerLngCustomerDocMapper; + private final LngCustomerContactMapper customerLngCustomerContactMapper; + + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean add(LngCustomer lngCustomer) { + customerLngCustomerMapper.insert(lngCustomer); + for (LngCustomerAttrPower lngCustomerAttrPower : lngCustomer.getLngCustomerAttrPowerList()) { + lngCustomerAttrPower.setCuCode(lngCustomer.getCuCode()); + customerLngCustomerAttrPowerMapper.insert(lngCustomerAttrPower); + } + for (LngCustomerBank lngCustomerBank : lngCustomer.getLngCustomerBankList()) { + lngCustomerBank.setCuCode(lngCustomer.getCuCode()); + customerLngCustomerBankMapper.insert(lngCustomerBank); + } + for (LngCustomerDoc lngCustomerDoc : lngCustomer.getLngCustomerDocList()) { + lngCustomerDoc.setCuCode(lngCustomer.getCuCode()); + customerLngCustomerDocMapper.insert(lngCustomerDoc); + } + for (LngCustomerContact lngCustomerContact : lngCustomer.getLngCustomerContactList()) { + lngCustomerContact.setCuCode(lngCustomer.getCuCode()); + customerLngCustomerContactMapper.insert(lngCustomerContact); + } + + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean update(LngCustomer lngCustomer) { + customerLngCustomerMapper.updateById(lngCustomer); + //********************************* LngCustomerAttrPower 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List 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()); + //找到需要删除的id + List lngCustomerAttrPowerRemoveIds = lngCustomerAttrPowerIds.stream().filter(item -> !lngCustomerAttrPowerOldIds.contains(item)).collect(Collectors.toList()); + + for (LngCustomerAttrPower lngCustomerAttrPower : lngCustomer.getLngCustomerAttrPowerList()) { + //如果不等于空则修改 + if (lngCustomerAttrPower.getId() != null) { + customerLngCustomerAttrPowerMapper.updateById(lngCustomerAttrPower); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngCustomerAttrPower.setCuCode(lngCustomer.getCuCode()); + customerLngCustomerAttrPowerMapper.insert(lngCustomerAttrPower); + } + } + //已经不存在的id 删除 + if(lngCustomerAttrPowerRemoveIds.size() > 0){ + customerLngCustomerAttrPowerMapper.deleteBatchIds(lngCustomerAttrPowerRemoveIds); + } + } + //********************************* LngCustomerAttrPower 增删改 结束 *******************************************/ + + //********************************* LngCustomerBank 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List 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()); + //找到需要删除的id + List lngCustomerBankRemoveIds = lngCustomerBankIds.stream().filter(item -> !lngCustomerBankOldIds.contains(item)).collect(Collectors.toList()); + + for (LngCustomerBank lngCustomerBank : lngCustomer.getLngCustomerBankList()) { + //如果不等于空则修改 + if (lngCustomerBank.getId() != null) { + customerLngCustomerBankMapper.updateById(lngCustomerBank); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngCustomerBank.setCuCode(lngCustomer.getCuCode()); + customerLngCustomerBankMapper.insert(lngCustomerBank); + } + } + //已经不存在的id 删除 + if(lngCustomerBankRemoveIds.size() > 0){ + customerLngCustomerBankMapper.deleteBatchIds(lngCustomerBankRemoveIds); + } + } + //********************************* LngCustomerBank 增删改 结束 *******************************************/ + + //********************************* LngCustomerDoc 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List 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()); + //找到需要删除的id + List lngCustomerDocRemoveIds = lngCustomerDocIds.stream().filter(item -> !lngCustomerDocOldIds.contains(item)).collect(Collectors.toList()); + + for (LngCustomerDoc lngCustomerDoc : lngCustomer.getLngCustomerDocList()) { + //如果不等于空则修改 + if (lngCustomerDoc.getId() != null) { + customerLngCustomerDocMapper.updateById(lngCustomerDoc); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngCustomerDoc.setCuCode(lngCustomer.getCuCode()); + customerLngCustomerDocMapper.insert(lngCustomerDoc); + } + } + //已经不存在的id 删除 + if(lngCustomerDocRemoveIds.size() > 0){ + customerLngCustomerDocMapper.deleteBatchIds(lngCustomerDocRemoveIds); + } + } + //********************************* LngCustomerDoc 增删改 结束 *******************************************/ + + //********************************* LngCustomerContact 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List 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()); + //找到需要删除的id + List lngCustomerContactRemoveIds = lngCustomerContactIds.stream().filter(item -> !lngCustomerContactOldIds.contains(item)).collect(Collectors.toList()); + + for (LngCustomerContact lngCustomerContact : lngCustomer.getLngCustomerContactList()) { + //如果不等于空则修改 + if (lngCustomerContact.getId() != null) { + customerLngCustomerContactMapper.updateById(lngCustomerContact); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngCustomerContact.setCuCode(lngCustomer.getCuCode()); + customerLngCustomerContactMapper.insert(lngCustomerContact); + } + } + //已经不存在的id 删除 + if(lngCustomerContactRemoveIds.size() > 0){ + customerLngCustomerContactMapper.deleteBatchIds(lngCustomerContactRemoveIds); + } + } + //********************************* LngCustomerContact 增删改 结束 *******************************************/ + + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean delete(List ids) { + customerLngCustomerMapper.deleteBatchIds(ids); + customerLngCustomerAttrPowerMapper.delete(Wrappers.lambdaQuery(LngCustomerAttrPower.class).in(LngCustomerAttrPower::getCuCode, ids)); + customerLngCustomerBankMapper.delete(Wrappers.lambdaQuery(LngCustomerBank.class).in(LngCustomerBank::getCuCode, ids)); + customerLngCustomerDocMapper.delete(Wrappers.lambdaQuery(LngCustomerDoc.class).in(LngCustomerDoc::getCuCode, ids)); + customerLngCustomerContactMapper.delete(Wrappers.lambdaQuery(LngCustomerContact.class).in(LngCustomerContact::getCuCode, ids)); + + return true; + } } From 01991ec09bb97126dfc870d3a787f85fde61f7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Thu, 20 Nov 2025 09:14:52 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8D=B8=E8=B4=A7=E5=9C=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/mdm/vo/LngBPlaceLngUnloadPageVo.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadPageVo.java index b551318..d8e4be1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPlaceLngUnloadPageVo.java @@ -1,14 +1,9 @@ package com.xjrsoft.module.mdm.vo; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import com.xjrsoft.common.annotation.Trans; import com.xjrsoft.common.enums.TransType; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * @title: 分页列表出参 @@ -38,7 +33,7 @@ public class LngBPlaceLngUnloadPageVo { * 卸货区域 */ @ApiModelProperty("卸货区域") - @Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7") + @Trans(type = TransType.REGION) private String regionCode; /** * 详细地址 From ac84b9a501df51a424bf34f4747bcfaca4d7f60b Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Thu, 20 Nov 2025 15:24:42 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=94=9F=E6=88=90=E9=94=80=E5=94=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/controller/CustomerController.java | 41 +++++++++++++++++-- .../module/sales/entity/LngCustomer.java | 24 +++++++++++ .../mapper/LngCustomerAttrPowerMapper.java | 2 +- .../sales/mapper/LngCustomerBankMapper.java | 2 +- .../mapper/LngCustomerContactMapper.java | 2 +- .../sales/mapper/LngCustomerDocMapper.java | 2 +- .../sales/mapper/LngCustomerMapper.java | 2 +- 7 files changed, 67 insertions(+), 8 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 bdbdd3f..83a1edd 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,6 +4,7 @@ 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; @@ -15,18 +16,26 @@ 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; import com.xjrsoft.module.sales.service.ICustomerService; import com.xjrsoft.module.sales.vo.LngCustomerPageVo; import com.xjrsoft.module.sales.vo.LngCustomerVo; +import com.xjrsoft.module.system.client.ICodeRuleClient; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; @@ -42,14 +51,20 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/sales" + "/customer") +@RequestMapping("/sales/customer") @Api(value = "/sales" + "/customer",tags = "客户代码") @AllArgsConstructor public class CustomerController { private final ICustomerService customerService; + private final DatalogService dataService; + + + private final ICodeRuleClient codeRuleClient; + + private final String CUSTOMER_CODE = "customerCode"; @GetMapping(value = "/page") @ApiOperation(value="LngCustomer列表(分页)") @@ -98,9 +113,29 @@ public class CustomerController { @ApiOperation(value = "新增LngCustomer") @SaCheckPermission("customer:add") public R add(@Valid @RequestBody UpdateLngCustomerDto dto){ - UpdateLngCustomerDto res = dataService.insert(dto); - return R.ok(res.getId()); + + return R.ok(dataService.insert(dto,new DataOperationListener() { + + @Override + public UpdateLngCustomerDto before(DataOperationContent content) { + String code = codeRuleClient.genEncode(CUSTOMER_CODE); + dto.setCuCode("C"+code); + return content.getObj(); + } + + @Override + public UpdateLngCustomerDto after(DataOperationContent content) { + String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + codeRuleClient.useEncode(CUSTOMER_CODE); + return content.getObj(); + } + })); + } + @PutMapping @ApiOperation(value = "修改LngCustomer") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java index 9f7fb84..0eac77e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java @@ -10,6 +10,11 @@ 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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -265,6 +270,10 @@ public class LngCustomer implements Serializable { @ApiModelProperty("lngCustomerAttrPower子表") @TableField(exist = false) @EntityMapping(thisField = "cuCode", joinField = "cuCode") + @LogJoin(name = "客户业务信息", + columns = { + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.LEFT) + }, caseType = JoinCaseType.NONE, target = LngCustomerAttrPower.class, type = JoinType.MANY) private List lngCustomerAttrPowerList; /** * lngCustomerBank @@ -272,6 +281,11 @@ public class LngCustomer implements Serializable { @ApiModelProperty("lngCustomerBank子表") @TableField(exist = false) @EntityMapping(thisField = "cuCode", joinField = "cuCode") + @LogJoin(name = "客户银行信息", + columns = { + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.LEFT) + }, caseType = JoinCaseType.NONE, target = LngCustomerBank.class, type = JoinType.MANY) + private List lngCustomerBankList; /** * lngCustomerDoc @@ -279,6 +293,11 @@ public class LngCustomer implements Serializable { @ApiModelProperty("lngCustomerDoc子表") @TableField(exist = false) @EntityMapping(thisField = "cuCode", joinField = "cuCode") + @LogJoin(name = "客户证书信息", + columns = { + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.LEFT) + }, caseType = JoinCaseType.NONE, target = LngCustomerDoc.class, type = JoinType.MANY) + private List lngCustomerDocList; /** * lngCustomerContact @@ -286,6 +305,11 @@ public class LngCustomer implements Serializable { @ApiModelProperty("lngCustomerContact子表") @TableField(exist = false) @EntityMapping(thisField = "cuCode", joinField = "cuCode") + @LogJoin(name = "客户联系人信息", + columns = { + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.LEFT) + }, caseType = JoinCaseType.NONE, target = LngCustomerContact.class, type = JoinType.MANY) + private List lngCustomerContactList; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerAttrPowerMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerAttrPowerMapper.java index 3091a47..566bf67 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerAttrPowerMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerAttrPowerMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngCustomerAttrPowerMapper extends MPJBaseMapper { +public interface LngCustomerAttrPowerMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerBankMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerBankMapper.java index 160671c..dcdaedc 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerBankMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerBankMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngCustomerBankMapper extends MPJBaseMapper { +public interface LngCustomerBankMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerContactMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerContactMapper.java index 85b2b09..ff40db2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerContactMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerContactMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngCustomerContactMapper extends MPJBaseMapper { +public interface LngCustomerContactMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java index 200485d..bc462f0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngCustomerDocMapper extends MPJBaseMapper { +public interface LngCustomerDocMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java index 87fb9c2..2abb756 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngCustomerMapper extends MPJBaseMapper { +public interface LngCustomerMapper extends MPJBaseMapper,BaseMapper{ } 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 7/7] =?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); }