Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

2025-12-24 17:31:10 +08:00
parent 0cb12bbf0e 5ef2314e9d
commit 4a075272d6
32 changed files with 236 additions and 251 deletions
--- 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;
    
    /**
--- 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;
    
    /**
--- 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;
    
    /**
--- 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;


 /**
--- 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;

 }
--- 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;
    
    /**
--- 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;
    
    /**
--- 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;
    
    /**
--- 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;
    
    /**
--- 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;
    
    /**
--- 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;
    
    /**
--- 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;


 /**
--- 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;


 /**
--- 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;
    
    /**