From 1d13c50b92480f47e0f0ecb78bd162cc3693610b Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Thu, 23 Mar 2023 16:17:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E8=A1=A8=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=97=B6=E8=87=AA=E5=8A=A8=E5=A1=AB?= =?UTF-8?q?=E5=85=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/MybatisPlusMetaObjectHandler.java | 1 + .../areasetting/entity/AreasettingEntity.java | 29 +++++++++---------- .../entity/ContractMobileEntity.java | 10 ++++--- .../entity/ContractFileEntity.java | 6 ++-- .../jnpf/customer/entity/CustomerEntity.java | 6 ++-- .../entity/InventoryOrgEntity.java | 29 +++++++++---------- .../entity/InventoryOrgDetailEntity.java | 4 +-- .../materialvo/entity/MaterialEntity.java | 6 ++-- .../entity/ReservoirareaEntity.java | 4 +-- .../jnpf/supplier/entity/SupplierEntity.java | 6 ++-- .../jnpf/vehicle/entity/VehicleEntity.java | 6 ++-- .../warehouse/entity/WareHouseEntity.java | 2 +- 12 files changed, 58 insertions(+), 51 deletions(-) diff --git a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java index 12650146..dec76ce5 100644 --- a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java +++ b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java @@ -10,6 +10,7 @@ import org.apache.ibatis.reflection.MetaObject; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; + /** * MybatisPlus配置类 * diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/areasetting/entity/AreasettingEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/areasetting/entity/AreasettingEntity.java index 7f1f2971..1d7a5baa 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/areasetting/entity/AreasettingEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/areasetting/entity/AreasettingEntity.java @@ -1,13 +1,9 @@ package jnpf.areasetting.entity; -import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonProperty; /** @@ -25,40 +21,41 @@ public class AreasettingEntity { @TableId("ID") private String id; - @TableField("CREATOR_USER_ID") + @TableField(value="CREATOR_USER_ID",fill = FieldFill.INSERT) private String creatoruserid; - @TableField("CREATOR_USER_NAME") + @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT) private String creatorusername; - @TableField("CREATOR_TIME") + @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT) private Date creatortime; - @TableField("LAST_MODIFY_USER_ID") + @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.UPDATE) private String lastmodifyuserid; - @TableField("LAST_MODIFY_USER_NAME") + @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.UPDATE) private String lastmodifyusername; - @TableField("LAST_MODIFY_TIME") + @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.UPDATE) private Date lastmodifytime; - @TableField("DELETE_USER_ID") + @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE) private String deleteuserid; - @TableField("DELETE_USER_NAME") + @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE) private String deleteusername; - @TableField("DELETE_TIME") + @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deletetime; @TableField("DELETE_MARK") + @TableLogic private String deletemark; - @TableField("ORGNIZE_ID") + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) private String orgnizeId; - @TableField("DEPARTMENT_ID") + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; @TableField("M_NAME") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java index 0db047fb..d4e43dc3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java @@ -41,15 +41,17 @@ public class ContractMobileEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - + @TableLogic @TableField("DELETE_MARK") private String deleteMark; - @TableLogic - @TableField("ORGNIZE_ID") + + + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) private String orgnizeId; - @TableField("DEPARTMENT_ID") + + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; @TableField("CONTRACT_CODE") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java index aa788ba8..fbf252b6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java @@ -53,12 +53,14 @@ public class ContractFileEntity { @TableField("DELETE_MARK") private String deletemark; - @TableField("ORGNIZE_ID") + + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) private String orgnizeId; - @TableField("DEPARTMENT_ID") + + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; @TableField("CONTRACT_CODE") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerEntity.java index 740787b9..253ae95a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerEntity.java @@ -52,10 +52,12 @@ public class CustomerEntity { @TableLogic private String deleteMark; - @TableField("ORGNIZE_ID") + + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) private String orgnizeId; - @TableField("DEPARTMENT_ID") + + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; @TableField("SUPPLIER_CD") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrd/entity/InventoryOrgEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrd/entity/InventoryOrgEntity.java index 6873b89f..62d42b51 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrd/entity/InventoryOrgEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrd/entity/InventoryOrgEntity.java @@ -1,13 +1,9 @@ package jnpf.inventoryOrd.entity; -import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonProperty; /** @@ -31,40 +27,41 @@ public class InventoryOrgEntity { @TableField("INVENTORY_ORG_CODE") private String inventoryOrgCode; - @TableField("CREATOR_USER_ID") + @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT) private String creatorUserId; - @TableField("CREATOR_USER_NAME") + @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT) private String creatorUserName; - @TableField("CREATOR_TIME") + @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT) private Date creatorTime; - @TableField("LAST_MODIFY_USER_ID") + @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.UPDATE) private String lastModifyUserId; - @TableField("LAST_MODIFY_USER_NAME") + @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.UPDATE) private String lastModifyUserName; - @TableField("LAST_MODIFY_TIME") + @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.UPDATE) private Date lastModifyTime; - @TableField("DELETE_USER_ID") + @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("DELETE_USER_NAME") + @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE) private String deleteUserName; - @TableField("DELETE_TIME") + @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; @TableField("DELETE_MARK") + @TableLogic private String deleteMark; - @TableField("ORGNIZE_ID") + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) private String orgnizeId; - @TableField("DEPARTMENT_ID") + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; @TableField("COMPANY_ID") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrdDetail/entity/InventoryOrgDetailEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrdDetail/entity/InventoryOrgDetailEntity.java index e12a2b43..dfb30673 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrdDetail/entity/InventoryOrgDetailEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrdDetail/entity/InventoryOrgDetailEntity.java @@ -61,10 +61,10 @@ public class InventoryOrgDetailEntity { @TableLogic private String deleteMark; - @TableField("ORGNIZE_ID") + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) private String orgnizeId; - @TableField("DEPARTMENT_ID") + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/entity/MaterialEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/entity/MaterialEntity.java index c094a37b..129d78c7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/entity/MaterialEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/entity/MaterialEntity.java @@ -53,10 +53,12 @@ public class MaterialEntity { @TableLogic private String deleteMark; - @TableField("ORGNIZE_ID") + + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) private String orgnizeId; - @TableField("DEPARTMENT_ID") + + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; @TableField("M_ID") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java index 111c5e18..8e97de23 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java @@ -52,10 +52,10 @@ public class ReservoirareaEntity { @TableLogic private String deleteMark; - @TableField("ORGNIZE_ID") + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) private String orgnizeId; - @TableField("DEPARTMENT_ID") + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; @TableField("WAREHOUSE_ID") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java index 088e4a3c..45dd971d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java @@ -70,10 +70,12 @@ public class SupplierEntity { @TableField("VAT_REGISTRATION_NUM") private String vatRegistrationNum; - @TableField("ORGNIZE_ID") + + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) private String orgnizeId; - @TableField("DEPARTMENT_ID") + + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; @TableField("SUPPLY") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java index 5b7f413a..00470642 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java @@ -52,10 +52,12 @@ public class VehicleEntity { @TableLogic private String deletemark; - @TableField("ORGNIZE_ID") + + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) private String orgnizeId; - @TableField("DEPARTMENT_ID") + + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; @TableField("TICKETNO") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/entity/WareHouseEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/entity/WareHouseEntity.java index bc78a876..979a8c4f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/entity/WareHouseEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/entity/WareHouseEntity.java @@ -55,7 +55,7 @@ public class WareHouseEntity { @TableField("ORG_ID") private String orgId; - @TableField("DEPARTMENT_ID") + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) private String departmentId; @TableField("CODE")