diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java index 9304d18..dbfeca4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java @@ -40,14 +40,14 @@ public class UpdateLngBBankDto implements Serializable { /** * 名称(不能与名称、简称重复) */ - @LogField(name="名称(不能与名称、简称重复)",index=2) + @LogField(name="名称",index=2) @ApiModelProperty("名称(不能与名称、简称重复)") private String fullName; /** * 简称(不能与名称、简称重复) */ - @LogField(name="简称(不能与名称、简称重复)",index=3) + @LogField(name="简称",index=3) @ApiModelProperty("简称(不能与名称、简称重复)") private String shortName; @@ -103,8 +103,8 @@ public class UpdateLngBBankDto implements Serializable { /** * 有效标志(Y-有效,N-无效) */ - @LogField(name="有效标志(Y-有效,N-无效)",index=11) - @ApiModelProperty("有效标志(Y-有效,N-无效)") + @LogField(name="有效标志",index=11) + @ApiModelProperty("有效标志") private String valid; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBFeeDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBFeeDto.java index 02bccfd..7cb2875 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBFeeDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBFeeDto.java @@ -51,7 +51,7 @@ public class UpdateLngBFeeDto extends BaseModel { /** * 名称(不能重复) */ - @LogField(name="名称(不能重复)",index=2) + @LogField(name="名称",index=2) @ApiModelProperty("名称(不能重复)") private String fullName; @@ -65,7 +65,7 @@ public class UpdateLngBFeeDto extends BaseModel { /** * 有效标志(Y-有效,N-无效) */ - @LogField(name="有效标志(Y-有效,N-无效)",index=4) + @LogField(name="有效标志",index=4) @ApiModelProperty("有效标志(Y-有效,N-无效)") private String valid; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPngLineDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPngLineDto.java index 9088c5c..188ddd5 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPngLineDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPngLineDto.java @@ -43,28 +43,28 @@ public class UpdateLngBPngLineDto implements Serializable { /** * 助记码(自动生成,4位,0001……) */ - @LogField(name="助记码(自动生成,4位,0001……)",index=1) + @LogField(name="助记码",index=1) @ApiModelProperty("助记码(自动生成,4位,0001……)") private String code; /** * 名称(不能重复) */ - @LogField(name="名称(不能重复)",index=2) + @LogField(name="名称",index=2) @ApiModelProperty("名称(不能重复)") private String fullName; /** * 自有管道标识(Y-是,N-否) */ - @LogField(name="自有管道标识(Y-是,N-否)",index=3) + @LogField(name="自有管道标识",index=3) @ApiModelProperty("自有管道标识(Y-是,N-否)") private String ownSign; /** * 自有接收站(惠州/阳江) */ - @LogField(name="自有接收站(惠州/阳江)",index=4) + @LogField(name="自有接收站",index=4) @ApiModelProperty("自有接收站(惠州/阳江)") private String staCodeLng; @@ -78,7 +78,7 @@ public class UpdateLngBPngLineDto implements Serializable { /** * 有效标志(Y-有效,N-无效) */ - @LogField(name="有效标志(Y-有效,N-无效)",index=6) + @LogField(name="有效标志",index=6) @ApiModelProperty("有效标志(Y-有效,N-无效)") private String valid; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java index b64e7d5..c29de09 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java @@ -40,7 +40,7 @@ public class UpdateLngBRegionDto implements Serializable { /** * 名称(不能重复) */ - @LogField(name="名称(不能重复)",index=2) + @LogField(name="名称",index=2) @ApiModelProperty("名称(不能重复)") private String fullName; @@ -68,7 +68,7 @@ public class UpdateLngBRegionDto implements Serializable { /** * 有效标志(Y-有效,N-无效) */ - @LogField(name="有效标志(Y-有效,N-无效)",index=6) + @LogField(name="有效标志",index=6) @ApiModelProperty("有效标志(Y-有效,N-无效)") private String valid; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBStationPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBStationPngDto.java index 23df4ba..db6f9bc 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBStationPngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBStationPngDto.java @@ -36,127 +36,127 @@ public class UpdateLngBStationPngDto implements Serializable { /** * */ - @LogField(name="",index=0) - @ApiModelProperty("") + @LogField(name="主键id",index=0) + @ApiModelProperty("主键id") private Long id; /** * */ - @LogField(name="",index=1) - @ApiModelProperty("") + @LogField(name="编码",index=1) + @ApiModelProperty("编码") private String code; /** * */ - @LogField(name="",index=2) - @ApiModelProperty("") + @LogField(name="全称",index=2) + @ApiModelProperty("全称") private String fullName; /** * */ - @LogField(name="",index=3) - @ApiModelProperty("") + @LogField(name="管道",index=3) + @ApiModelProperty("管道") private String pipelineCode; /** * */ - @LogField(name="",index=4) - @ApiModelProperty("") + @LogField(name="所属企业",index=4) + @ApiModelProperty("所属企业") private String enterprise; /** * */ - @LogField(name="",index=5) - @ApiModelProperty("") + @LogField(name="联系人",index=5) + @ApiModelProperty("联系人") private String contact; /** * */ - @LogField(name="",index=6) - @ApiModelProperty("") + @LogField(name="电话",index=6) + @ApiModelProperty("电话") private String tel; /** * */ - @LogField(name="",index=7) - @ApiModelProperty("") + @LogField(name="邮箱",index=7) + @ApiModelProperty("邮箱") private String email; /** * */ - @LogField(name="",index=8) - @ApiModelProperty("") + @LogField(name="地区编码",index=8) + @ApiModelProperty("地区编码") private String regionCode; /** * */ - @LogField(name="",index=9) - @ApiModelProperty("") + @LogField(name="地址",index=9) + @ApiModelProperty("地址") private String addr; /** * */ - @LogField(name="",index=10) - @ApiModelProperty("") + @LogField(name="通讯地址",index=10) + @ApiModelProperty("通讯地址") private String addrMail; /** * */ - @LogField(name="",index=11) - @ApiModelProperty("") + @LogField(name="自有上载点标识",index=11) + @ApiModelProperty("自有上载点标识") private String ownSign; /** * */ - @LogField(name="",index=12) - @ApiModelProperty("") + @LogField(name="lng气源地编码",index=12) + @ApiModelProperty("lng气源地编码") private String staCodeLng; /** * */ - @LogField(name="",index=13) - @ApiModelProperty("") + @LogField(name="自有管道沿线下载点标识",index=13) + @ApiModelProperty("自有管道沿线下载点标识") private String ownLineSign; /** * */ - @LogField(name="",index=14) - @ApiModelProperty("") + @LogField(name="显示顺序",index=14) + @ApiModelProperty("显示顺序") private Short sort; /** * */ - @LogField(name="",index=15) - @ApiModelProperty("") + @LogField(name="有效标识",index=15) + @ApiModelProperty("有效标识") private String valid; /** * */ - @LogField(name="",index=16) - @ApiModelProperty("") + @LogField(name="备注",index=16) + @ApiModelProperty("备注") private String note; /** * */ - @LogField(name="",index=17) - @ApiModelProperty("") + @LogField(name="租户id",index=17) + @ApiModelProperty("租户id") private Long tenantId; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBTaxDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBTaxDto.java index c5a5650..ca4d905 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBTaxDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBTaxDto.java @@ -43,14 +43,14 @@ public class UpdateLngBTaxDto implements Serializable { /** * 助记码(17/13/9/6/0) */ - @LogField(name="助记码(17/13/9/6/0)",index=1) + @LogField(name="助记码",index=1) @ApiModelProperty("助记码(17/13/9/6/0)") private String code; /** * 名称(不能重复) */ - @LogField(name="名称(不能重复)",index=2) + @LogField(name="名称",index=2) @ApiModelProperty("名称(不能重复)") private String fullName; @@ -71,7 +71,7 @@ public class UpdateLngBTaxDto implements Serializable { /** * 有效标志(Y-有效,N-无效) */ - @LogField(name="有效标志(Y-有效,N-无效)",index=5) + @LogField(name="有效标志",index=5) @ApiModelProperty("有效标志(Y-有效,N-无效)") private String valid; 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/mdm/entity/LngBBank.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java index c2b0fcc..09532b1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java @@ -1,5 +1,7 @@ package com.xjrsoft.module.mdm.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.xjrsoft.common.model.base.BaseModel; @@ -93,6 +95,7 @@ public class LngBBank extends BaseModel { * 显示顺序 */ @ApiModelProperty("显示顺序") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Short sort; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBFee.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBFee.java index 25b4d5d..15dd913 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBFee.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBFee.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.mdm.entity; 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; @@ -53,6 +54,7 @@ public class LngBFee 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/mdm/entity/LngBPlaceLngUnload.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPlaceLngUnload.java index 1f9e1e6..38a74a6 100644 --- 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 @@ -1,6 +1,7 @@ package com.xjrsoft.module.mdm.entity; 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; @@ -77,6 +78,7 @@ public class LngBPlaceLngUnload 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/mdm/entity/LngBRegion.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBRegion.java index 826e410..d332d68 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBRegion.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBRegion.java @@ -1,20 +1,17 @@ package com.xjrsoft.module.mdm.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.TableId; 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; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBStationPng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBStationPng.java index 0abb2b8..e23e231 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBStationPng.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBStationPng.java @@ -1,20 +1,18 @@ package com.xjrsoft.module.mdm.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.TableId; 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; /** @@ -33,20 +31,20 @@ public class LngBStationPng implements Serializable { /** * */ - @ApiModelProperty("") + @ApiModelProperty("主键") @TableId private Long id; /** * */ - @ApiModelProperty("") + @ApiModelProperty("助记码") private String code; /** * */ - @ApiModelProperty("") + @ApiModelProperty("名称(不能重复)") private String fullName; /** @@ -58,137 +56,136 @@ public class LngBStationPng implements Serializable { /** * */ - @ApiModelProperty("") + @ApiModelProperty("所属企业") private String enterprise; /** * */ - @ApiModelProperty("") + @ApiModelProperty("联系人") private String contact; /** * */ - @ApiModelProperty("") + @ApiModelProperty("电话") private String tel; /** * */ - @ApiModelProperty("") + @ApiModelProperty("电子邮箱") private String email; /** * */ - @ApiModelProperty("") + @ApiModelProperty("行政区域") private String regionCode; /** * */ - @ApiModelProperty("") + @ApiModelProperty("地址") private String addr; /** * */ - @ApiModelProperty("") + @ApiModelProperty("通讯地址") private String addrMail; /** * */ - @ApiModelProperty("") + @ApiModelProperty("自有设备标识") private String ownSign; /** * */ - @ApiModelProperty("") + @ApiModelProperty("lng气源地") private String staCodeLng; /** * */ - @ApiModelProperty("") + @ApiModelProperty("系统直连") private String ownLineSign; /** * */ - @ApiModelProperty("") + @ApiModelProperty("显示顺序") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Short sort; /** * */ - @ApiModelProperty("") + @ApiModelProperty("有效标识") private String valid; /** * */ - @ApiModelProperty("") + @ApiModelProperty("备注") private String note; /** - * - */ - @ApiModelProperty("") - @TableField(fill = FieldFill.INSERT) - private Long createUserId; - - /** - * - */ - @ApiModelProperty("") - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createDate; - - /** - * - */ - @ApiModelProperty("") - @TableField(fill = FieldFill.UPDATE) - private Long modifyUserId; - - /** - * - */ - @ApiModelProperty("") - @TableField(fill = FieldFill.UPDATE) - private LocalDateTime modifyDate; - - /** - * - */ - @ApiModelProperty("") - @TableField(fill = FieldFill.INSERT) - @TableLogic - private Integer deleteMark; - - /** - * - */ - @ApiModelProperty("") - private Long tenantId; - - /** - * - */ - @ApiModelProperty("") - @TableField(fill = FieldFill.INSERT) - private Long deptId; - - /** - * - */ - @ApiModelProperty("") - @TableField(fill = FieldFill.INSERT) - private Long ruleUserId; - - + * 创建人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/entity/LngBTax.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBTax.java index 4d183f5..c07c80f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBTax.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBTax.java @@ -1,20 +1,19 @@ package com.xjrsoft.module.mdm.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.TableId; 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; /** @@ -59,6 +58,7 @@ public class LngBTax 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/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; /**