From 5ef2314e9d1b73173dc3824d0923f33187716010 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Wed, 24 Dec 2025 15:34:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89Logfeild=E6=B3=A8=E8=A7=A3=20?= =?UTF-8?q?name=E4=B8=AD=E7=9A=84=E5=88=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/UpdateLngCustomerAttrPowerDto.java | 2 +- .../sales/dto/UpdateLngCustomerBankDto.java | 2 +- .../sales/dto/UpdateLngCustomerDto.java | 32 +++++++++---------- .../sales/dto/UpdateLngScoreDtlDto.java | 10 +++--- .../module/sales/dto/UpdateLngScoreDto.java | 4 +-- .../supplier/dto/LngSupplierPageDto.java | 6 +--- .../supplier/dto/UpdateLngScoreDtlDto.java | 10 +++--- .../supplier/dto/UpdateLngScoreDto.java | 4 +-- .../dto/UpdateLngSupplierBankDto.java | 2 +- .../dto/UpdateLngSupplierContactDto.java | 22 ++++--------- .../supplier/dto/UpdateLngSupplierDocDto.java | 2 +- .../supplier/dto/UpdateLngSupplierDto.java | 24 +++++++------- .../module/sales/entity/LngCustomer.java | 3 ++ .../module/sales/entity/LngCustomerDoc.java | 2 ++ .../xjrsoft/module/sales/entity/LngScore.java | 2 ++ .../module/sales/entity/LngScoreDtl.java | 17 +++++----- .../module/supplier/entity/LngScore.java | 2 ++ .../supplier/entity/LngSupplierBank.java | 14 +++----- .../supplier/entity/LngSupplierContact.java | 14 +++----- .../supplier/entity/LngSupplierDoc.java | 16 ++++------ 20 files changed, 87 insertions(+), 103 deletions(-) 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 index ca7e8ae..a99ec72 100644 --- 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 @@ -57,7 +57,7 @@ public class UpdateLngCustomerAttrPowerDto implements Serializable { /** * 装机量（万KW） */ - @LogField(name="装机量（万KW）",index=3) + @LogField(name="装机量",index=3) @ApiModelProperty("装机量（万KW）") private BigDecimal capacity; 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 index 7a4554a..9d02717 100644 --- 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 @@ -71,7 +71,7 @@ public class UpdateLngCustomerBankDto implements Serializable { /** * 默认账号(Y-是，N-否；只能有一个Y的有效记录) */ - @LogField(name="默认账号(Y-是，N-否；只能有一个Y的有效记录)",index=5) + @LogField(name="默认账号",index=5) @ApiModelProperty("默认账号(Y-是，N-否；只能有一个Y的有效记录)") private String defaultSign; 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 0a1ca25..d3a42e0 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 @@ -42,7 +42,7 @@ public class UpdateLngCustomerDto implements Serializable { /** * 客户编码(不能重复，以C开头) */ - @LogField(name="客户编码(不能重复，以C开头)",index=1) + @LogField(name="客户编码",index=1) @ApiModelProperty("客户编码(不能重复，以C开头)") private String cuCode; @@ -56,28 +56,28 @@ public class UpdateLngCustomerDto implements Serializable { /** * 客户名称(不能与名称、简称重复) */ - @LogField(name="客户名称(不能与名称、简称重复)",index=3) + @LogField(name="客户名称",index=3) @ApiModelProperty("客户名称(不能与名称、简称重复)") private String cuName; /** * 简称(不能与名称、简称重复) */ - @LogField(name="简称(不能与名称、简称重复)",index=4) + @LogField(name="简称",index=4) @ApiModelProperty("简称(不能与名称、简称重复)") private String cuSname; /** * 国际/国内(I-国际，D-国内) */ - @LogField(name="国际/国内(I-国际，D-国内)",index=5) + @LogField(name="国际/国内",index=5) @ApiModelProperty("国际/国内(I-国际，D-国内)") private String dI; /** * 企业性质(国有企业/非国有企业) */ - @LogField(name="企业性质(国有企业/非国有企业)",index=6) + @LogField(name="企业性质",index=6) @ApiModelProperty("企业性质(国有企业/非国有企业)") private String natureCode; @@ -91,14 +91,14 @@ public class UpdateLngCustomerDto implements Serializable { /** * 统一社会信用代码(非空时不可重复) */ - @LogField(name="统一社会信用代码(非空时不可重复)",index=8) + @LogField(name="统一社会信用代码",index=8) @ApiModelProperty("统一社会信用代码(非空时不可重复)") private String creditNo; /** * 纳税人识别号(非空时不可重复) */ - @LogField(name="纳税人识别号(非空时不可重复)",index=9) + @LogField(name="纳税人识别号",index=9) @ApiModelProperty("纳税人识别号(非空时不可重复)") private String tiNo; @@ -126,7 +126,7 @@ public class UpdateLngCustomerDto implements Serializable { /** * 注册资本（万元） */ - @LogField(name="注册资本（万元）",index=13) + @LogField(name="注册资本",index=13) @ApiModelProperty("注册资本（万元）") private String amtReg; @@ -147,21 +147,21 @@ public class UpdateLngCustomerDto implements Serializable { /** * 客户分类(一类/二类) */ - @LogField(name="客户分类(一类/二类)",index=16) + @LogField(name="客户分类",index=16) @ApiModelProperty("客户分类(一类/二类)") private String classCode; /** * 客户类别(电厂/工业用户/城燃/贸易商) */ - @LogField(name="客户类别(电厂/工业用户/城燃/贸易商)",index=17) + @LogField(name="客户类别",index=17) @ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)") private String typeCode; /** * 统计分类(内部/国电/华电/深能/其他) */ - @LogField(name="统计分类(内部/国电/华电/深能/其他)",index=18) + @LogField(name="统计分类",index=18) @ApiModelProperty("统计分类(内部/国电/华电/深能/其他)") private String propCode; @@ -196,21 +196,21 @@ public class UpdateLngCustomerDto implements Serializable { /** * 是否校验预付款(Y-是，N-否) */ - @LogField(name="是否校验预付款(Y-是，N-否)",index=23) + @LogField(name="是否校验预付款",index=23) @ApiModelProperty("是否校验预付款") private String prepaySign; /** * 有无线上(竞拍)(Y-有，N-无) */ - @LogField(name="有无线上(竞拍)(Y-有，N-无)",index=24) + @LogField(name="有无线上",index=24) @ApiModelProperty("有无线上竞拍") private String onlineSign; /** * 自有终端(Y-是，N-否) */ - @LogField(name="自有终端(Y-是，N-否)",index=25) + @LogField(name="自有终端",index=25) @ApiModelProperty("自有终端") private String tSign; @@ -224,14 +224,14 @@ public class UpdateLngCustomerDto implements Serializable { /** * 有效标志（不在黑名单）(Y-有效，N-无效) */ - @LogField(name="有效标志（不在黑名单）(Y-有效，N-无效)",index=27) + @LogField(name="有效标志",index=27) @ApiModelProperty("有效标志（不在黑名单）") private String valid; /** * 状态(未提交/审批中/已审批/已驳回) */ - @LogField(name="状态(未提交/审批中/已审批/已驳回)",index=28) + @LogField(name="状态",index=28) @ApiModelProperty("状态") private String approCode; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDtlDto.java index 4840dc2..3520b02 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDtlDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDtlDto.java @@ -64,21 +64,21 @@ public class UpdateLngScoreDtlDto implements Serializable { /** * 评分事项(只读) */ - @LogField(name="评分事项(只读)",index=4) + @LogField(name="评分事项",index=4) @ApiModelProperty("评分事项(只读)") private String itemName; /** * 评分标准(只读) */ - @LogField(name="评分标准(只读)",index=5) + @LogField(name="评分标准",index=5) @ApiModelProperty("评分标准(只读)") private String itemDesc; /** * 评分部门(只读) */ - @LogField(name="评分部门(只读)",index=6) + @LogField(name="评分部门",index=6) @ApiModelProperty("评分部门(只读)") private String eDeptCode; @@ -92,14 +92,14 @@ public class UpdateLngScoreDtlDto implements Serializable { /** * 实际评分部门编码(当前登录人所在部门) */ - @LogField(name="实际评分部门编码(当前登录人所在部门)",index=8) + @LogField(name="实际评分部门编码",index=8) @ApiModelProperty("实际评分部门编码(当前登录人所在部门)") private String aDeptCode; /** * 实际评分人编码(当前登录人) */ - @LogField(name="实际评分人编码(当前登录人)",index=9) + @LogField(name="实际评分人编码",index=9) @ApiModelProperty("实际评分人编码(当前登录人)") private String aEmpCode; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDto.java index 66b906d..50d684e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDto.java @@ -58,7 +58,7 @@ public class UpdateLngScoreDto implements Serializable { /** * 表名(隐藏，供应商/客户/承运商表名；应与评价体系的对象一致) */ - @LogField(name="表名(隐藏，供应商/客户/承运商表名；应与评价体系的对象一致)",index=3) + @LogField(name="表名",index=3) @ApiModelProperty("表名(隐藏，供应商/客户/承运商表名；应与评价体系的对象一致)") private String tableName; @@ -79,7 +79,7 @@ public class UpdateLngScoreDto implements Serializable { /** * 审批状态(未审批/审批中/已审批/已驳回) */ - @LogField(name="审批状态(未审批/审批中/已审批/已驳回)",index=6) + @LogField(name="审批状态",index=6) @ApiModelProperty("审批状态(未审批/审批中/已审批/已驳回)") private String approCode; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/LngSupplierPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/LngSupplierPageDto.java index 5495409..1bef2fd 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/LngSupplierPageDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/LngSupplierPageDto.java @@ -1,14 +1,10 @@ package com.xjrsoft.module.supplier.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; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDtlDto.java index a6e141e..6c9e55d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDtlDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDtlDto.java @@ -64,21 +64,21 @@ public class UpdateLngScoreDtlDto implements Serializable { /** * 评分事项(只读) */ - @LogField(name="评分事项(只读)",index=4) + @LogField(name="评分事项",index=4) @ApiModelProperty("评分事项(只读)") private String itemName; /** * 评分标准(只读) */ - @LogField(name="评分标准(只读)",index=5) + @LogField(name="评分标准",index=5) @ApiModelProperty("评分标准(只读)") private String itemDesc; /** * 评分部门(只读) */ - @LogField(name="评分部门(只读)",index=6) + @LogField(name="评分部门",index=6) @ApiModelProperty("评分部门(只读)") private String eDeptCode; @@ -92,14 +92,14 @@ public class UpdateLngScoreDtlDto implements Serializable { /** * 实际评分部门编码(当前登录人所在部门) */ - @LogField(name="实际评分部门编码(当前登录人所在部门)",index=8) + @LogField(name="实际评分部门编码",index=8) @ApiModelProperty("实际评分部门编码(当前登录人所在部门)") private String aDeptCode; /** * 实际评分人编码(当前登录人) */ - @LogField(name="实际评分人编码(当前登录人)",index=9) + @LogField(name="实际评分人编码",index=9) @ApiModelProperty("实际评分人编码(当前登录人)") private String aEmpCode; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDto.java index 40944cd..a6db678 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDto.java @@ -58,7 +58,7 @@ public class UpdateLngScoreDto implements Serializable { /** * 表名(隐藏，供应商/客户/承运商表名；应与评价体系的对象一致) */ - @LogField(name="表名(隐藏，供应商/客户/承运商表名；应与评价体系的对象一致)",index=3) + @LogField(name="表名",index=3) @ApiModelProperty("表名(隐藏，供应商/客户/承运商表名；应与评价体系的对象一致)") private String tableName; @@ -79,7 +79,7 @@ public class UpdateLngScoreDto implements Serializable { /** * 审批状态(未审批/审批中/已审批/已驳回) */ - @LogField(name="审批状态(未审批/审批中/已审批/已驳回)",index=6) + @LogField(name="审批状态",index=6) @ApiModelProperty("审批状态(未审批/审批中/已审批/已驳回)") private String approCode; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierBankDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierBankDto.java index ccdcc15..bc3d1e6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierBankDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierBankDto.java @@ -71,7 +71,7 @@ public class UpdateLngSupplierBankDto implements Serializable { /** * 默认账号(Y-是，N-否；只能有一个Y的有效记录) */ - @LogField(name="默认账号(Y-是，N-否；只能有一个Y的有效记录)",index=5) + @LogField(name="默认账号",index=5) @ApiModelProperty("默认账号(Y-是，N-否；只能有一个Y的有效记录)") private String defaultSign; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierContactDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierContactDto.java index a9020b8..ff949df 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierContactDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierContactDto.java @@ -1,22 +1,12 @@ package com.xjrsoft.module.supplier.dto; +import java.io.Serializable; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + 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; @@ -85,7 +75,7 @@ public class UpdateLngSupplierContactDto implements Serializable { /** * 有效标志(Y-有效，N-无效) */ - @LogField(name="有效标志(Y-有效，N-无效)",index=7) + @LogField(name="有效标志",index=7) @ApiModelProperty("有效标志(Y-有效，N-无效)") private String valid; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDocDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDocDto.java index 010d68b..be76a36 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDocDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDocDto.java @@ -79,7 +79,7 @@ public class UpdateLngSupplierDocDto implements Serializable { /** * 有效标志(Y-有效，N-无效) */ - @LogField(name="有效标志(Y-有效，N-无效)",index=7) + @LogField(name="有效标志",index=7) @ApiModelProperty("有效标志(Y-有效，N-无效)") private String valid; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDto.java index 5135c6c..ba4fabf 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDto.java @@ -48,35 +48,35 @@ public class UpdateLngSupplierDto implements Serializable { /** * 供应商编码(不能重复，以S开头) */ - @LogField(name="供应商编码(不能重复，以S开头)",index=2) + @LogField(name="供应商编码",index=2) @ApiModelProperty("供应商编码(不能重复，以S开头)") private String suCode; /** * 供应商名称(不能与名称、简称重复) */ - @LogField(name="供应商名称(不能与名称、简称重复)",index=3) + @LogField(name="供应商名称",index=3) @ApiModelProperty("供应商名称(不能与名称、简称重复)") private String suName; /** * 简称(不能与名称、简称重复) */ - @LogField(name="简称(不能与名称、简称重复)",index=4) + @LogField(name="简称",index=4) @ApiModelProperty("简称(不能与名称、简称重复)") private String suSname; /** * 国际/国内(I-国际，D-国内) */ - @LogField(name="国际/国内(I-国际，D-国内)",index=5) + @LogField(name="国际/国内",index=5) @ApiModelProperty("国际/国内(I-国际，D-国内)") private String dI; /** * 企业性质(国有企业/非国有企业) */ - @LogField(name="企业性质(国有企业/非国有企业)",index=6) + @LogField(name="企业性质",index=6) @ApiModelProperty("企业性质(国有企业/非国有企业)") private String natureCode; @@ -90,14 +90,14 @@ public class UpdateLngSupplierDto implements Serializable { /** * 统一社会信用代码(非空时不可重复) */ - @LogField(name="统一社会信用代码(非空时不可重复)",index=8) + @LogField(name="统一社会信用代码",index=8) @ApiModelProperty("统一社会信用代码(非空时不可重复)") private String creditNo; /** * 纳税人识别号(非空时不可重复) */ - @LogField(name="纳税人识别号(非空时不可重复)",index=9) + @LogField(name="纳税人识别号",index=9) @ApiModelProperty("纳税人识别号(非空时不可重复)") private String tiNo; @@ -111,7 +111,7 @@ public class UpdateLngSupplierDto implements Serializable { /** * 注册资本（万元） */ - @LogField(name="注册资本（万元）",index=11) + @LogField(name="注册资本",index=11) @ApiModelProperty("注册资本（万元）") private String amtReg; @@ -146,14 +146,14 @@ public class UpdateLngSupplierDto implements Serializable { /** * 供应商分类(一类/二类) */ - @LogField(name="供应商分类(一类/二类)",index=16) + @LogField(name="供应商分类",index=16) @ApiModelProperty("供应商分类(一类/二类)") private String classCode; /** * 供应商类别(资源方/贸易商/托运商/接收站/多领域) */ - @LogField(name="供应商类别(资源方/贸易商/托运商/接收站/多领域)",index=17) + @LogField(name="供应商类别",index=17) @ApiModelProperty("供应商类别(资源方/贸易商/托运商/接收站/多领域)") private String typeCode; @@ -167,14 +167,14 @@ public class UpdateLngSupplierDto implements Serializable { /** * 有效标志(Y-有效，N-无效) */ - @LogField(name="有效标志(Y-有效，N-无效)",index=19) + @LogField(name="有效标志",index=19) @ApiModelProperty("有效标志(Y-有效，N-无效)") private String valid; /** * 状态(未提交/审批中/已审批/已驳回) */ - @LogField(name="状态(未提交/审批中/已审批/已驳回)",index=20) + @LogField(name="状态",index=20) @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") private String approCode; 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 d62cc2e..46db016 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 @@ -6,6 +6,7 @@ import java.time.LocalDateTime; import java.util.List; import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -159,6 +160,7 @@ public class LngCustomer implements Serializable { * 国企持股比例 */ @ApiModelProperty("国企持股比例") + @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal rateShare; /** @@ -171,6 +173,7 @@ public class LngCustomer implements Serializable { * 集团持股比例 */ @ApiModelProperty("集团持股比例") + @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal rateShareGn; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java index 5117fad..94b9025 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -67,6 +68,7 @@ public class LngCustomerDoc implements Serializable { * 显示顺序 */ @ApiModelProperty("显示顺序") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Short sort; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScore.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScore.java index 1bfd0f3..904e33b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScore.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScore.java @@ -6,6 +6,7 @@ import java.time.LocalDateTime; import java.util.List; import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ public class LngScore implements Serializable { * 分数 */ @ApiModelProperty("分数") + @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal score; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScoreDtl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScoreDtl.java index 5c009a9..7b4e26a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScoreDtl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScoreDtl.java @@ -1,20 +1,18 @@ 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.FieldStrategy; 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; /** @@ -77,6 +75,7 @@ public class LngScoreDtl implements Serializable { * 显示顺序 */ @ApiModelProperty("显示顺序") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Short sort; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScore.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScore.java index 6c6e6e2..00c8a21 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScore.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScore.java @@ -6,6 +6,7 @@ import java.time.LocalDateTime; import java.util.List; import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ public class LngScore implements Serializable { * 分数 */ @ApiModelProperty("分数") + @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal score; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierBank.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierBank.java index 61f6401..6c75a32 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierBank.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierBank.java @@ -1,20 +1,16 @@ package com.xjrsoft.module.supplier.entity; +import java.io.Serializable; +import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.Version; -import com.github.yulichang.annotation.EntityMapping; +import com.baomidou.mybatisplus.annotation.TableName; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierContact.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierContact.java index 878f994..1666e86 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierContact.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierContact.java @@ -1,20 +1,16 @@ package com.xjrsoft.module.supplier.entity; +import java.io.Serializable; +import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.Version; -import com.github.yulichang.annotation.EntityMapping; +import com.baomidou.mybatisplus.annotation.TableName; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierDoc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierDoc.java index cbe52c8..de35006 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierDoc.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplierDoc.java @@ -1,20 +1,17 @@ package com.xjrsoft.module.supplier.entity; +import java.io.Serializable; +import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; 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; /** @@ -71,6 +68,7 @@ public class LngSupplierDoc implements Serializable { * 显示顺序 */ @ApiModelProperty("显示顺序") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Short sort; /**