diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectAccount.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectAccount.java index 863f0b9a..75da4128 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectAccount.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectAccount.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; */ @Data @ApiModel(value = "项目信息", description = "项目信息") -@TableName("project_account") +//@TableName("project_account") public class ProjectAccount extends EntityWithId { private String sid ; private String projectSid; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java index 0726fb72..543e03ce 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java @@ -1,5 +1,6 @@ package com.yxt.supervise.report.ds.crm; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -7,7 +8,7 @@ import java.math.BigDecimal; import java.time.Period; @Data -@TableName("project_information") +//@TableName("project_information") public class ProjectInfo { private String id; private String sid; @@ -17,12 +18,20 @@ public class ProjectInfo { private double useLimit=0; private double bankPledgeRate=0; private double bankPledgeRateNew=0; + @TableField(exist = false) private String count; + @TableField(exist = false) private String projectType; + @TableField(exist = false) private String bankName; + @TableField(exist = false) private String bManagerName; + @TableField(exist = false) private String signingDate; + @TableField(exist = false) private String managerSid; + @TableField(exist = false) private String bankSid; + @TableField(exist = false) private String typeSid; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RiskAlarm.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RiskAlarm.java index 27fde184..e5ea6a3e 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RiskAlarm.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RiskAlarm.java @@ -1,5 +1,6 @@ package com.yxt.supervise.report.ds.rms; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -15,7 +16,7 @@ import java.util.UUID; */ @Data @ApiModel(value = "风险报警表") -@TableName("risk_alarm") +//@TableName("risk_alarm") public class RiskAlarm { @ApiModelProperty("ID,唯一编号") private Integer id ; @@ -69,5 +70,6 @@ public class RiskAlarm { @ApiModelProperty("风险类别名称") private String typeName; private String content; + @TableField(exist = false) private String zt; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/supplychain/GdInventoryOk.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/supplychain/GdInventoryOk.java index 1a34153d..fdfad74a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/supplychain/GdInventoryOk.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/supplychain/GdInventoryOk.java @@ -43,7 +43,7 @@ import lombok.Data; * @since 1.0 */ @Data -@TableName("gd_inventory_ok") +//@TableName("gd_inventory_ok") public class GdInventoryOk extends EntityWithId { private String orgCode; // 企业组织机构代码证 private String warehouseCode; // 仓库/门店编号 diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/system/SysUser.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/system/SysUser.java index f4eb6377..fb2921d3 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/system/SysUser.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/system/SysUser.java @@ -25,7 +25,7 @@ import java.util.List; * @since 1.0 */ @ApiModel(value = "用户表", description = "用户表") -@TableName("sys_user") +//@TableName("sys_user") @Data public class SysUser extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/ProdStock.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/ProdStock.java index 17412038..561b39a0 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/ProdStock.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/ProdStock.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data -@TableName("prod_stock") +//@TableName("prod_stock") public class ProdStock { private String sid; private String pro_name; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/StoreHouse.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/StoreHouse.java index f6ae969e..3f779fa1 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/StoreHouse.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/StoreHouse.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data -@TableName("sh_storehouse") +//@TableName("sh_storehouse") public class StoreHouse { private String sid; private String name;