diff --git a/src/main/java/mjkf/xinke/main/model/db/Budget.java b/src/main/java/mjkf/xinke/main/model/db/Budget.java index 4997159..2362eb2 100644 --- a/src/main/java/mjkf/xinke/main/model/db/Budget.java +++ b/src/main/java/mjkf/xinke/main/model/db/Budget.java @@ -87,10 +87,12 @@ public class Budget extends Model { @ApiModelProperty("基期年份") @TableField("`BASE_YEAR`") + @JsonProperty(value = "base_year") private Integer baseYear; @ApiModelProperty("基期月份") @TableField(value="`BASE_MONTH`") + @JsonProperty(value = "base_month") private Integer baseMonth; @TableField(exist = false) diff --git a/src/main/java/mjkf/xinke/main/model/db/BudgetItem.java b/src/main/java/mjkf/xinke/main/model/db/BudgetItem.java index 410a1af..dca7450 100644 --- a/src/main/java/mjkf/xinke/main/model/db/BudgetItem.java +++ b/src/main/java/mjkf/xinke/main/model/db/BudgetItem.java @@ -49,9 +49,10 @@ public class BudgetItem extends Model { @TableField("`NAME`") private String name; -// @ApiModelProperty("总数") -// @TableField("QUANTITY") -// private Integer quantity; + @ApiModelProperty("材料id") + @TableField("`MATERIAL_ID`") + @JsonProperty(value = "material_id") + private String materialId; // @ApiModelProperty("数据") // @TableField(value="`META`", typeHandler = FastjsonArrayHandler.class) @@ -111,6 +112,7 @@ public class BudgetItem extends Model { public BudgetItem(Integer budgetId, BudgetCreateRequest.BudgetMaterial item) { this.budgetId = budgetId; + this.materialId = item.getMaterialId(); this.name = item.getName(); this.unit = item.getUnit(); this.price = item.getPrice(); diff --git a/src/main/java/mjkf/xinke/main/model/vo/BudgetCreateRequest.java b/src/main/java/mjkf/xinke/main/model/vo/BudgetCreateRequest.java index c522f9b..d05d6b7 100644 --- a/src/main/java/mjkf/xinke/main/model/vo/BudgetCreateRequest.java +++ b/src/main/java/mjkf/xinke/main/model/vo/BudgetCreateRequest.java @@ -41,7 +41,8 @@ public class BudgetCreateRequest { @Data static public class BudgetMaterial implements Serializable { @ApiModelProperty("材料id") - private String id; + @JsonProperty(value = "material_id") + private String materialId; @ApiModelProperty("材料名称") private String name; diff --git a/src/main/resources/_sql/init/mysql/v0.4.sql b/src/main/resources/_sql/init/mysql/v0.4.sql index 959384a..b76c51b 100644 --- a/src/main/resources/_sql/init/mysql/v0.4.sql +++ b/src/main/resources/_sql/init/mysql/v0.4.sql @@ -11,6 +11,9 @@ ALTER TABLE BUDGET_ITEM ADD AMOUNT decimal(16,4) default 0 comment '项目金额 ALTER TABLE BUDGET_ITEM ADD RATIO decimal(16,4) default 0 comment '材料占比'; ALTER TABLE BUDGET_ITEM ADD AMOUNT_DIFF decimal(16,4) default 0 comment '调差金额'; +ALTER TABLE BUDGET ADD MONTH varchar(16) default 0 comment '当期月份'; +ALTER TABLE BUDGET ADD BASE_YEAR varchar(16) default 0 comment '基期年份'; +ALTER TABLE BUDGET ADD BASE_MONTH varchar(16) default 0 comment '基期月份'; diff --git a/src/main/resources/_sql/init/mysql/v0.5.sql b/src/main/resources/_sql/init/mysql/v0.5.sql index b53a0c6..007bd7c 100644 --- a/src/main/resources/_sql/init/mysql/v0.5.sql +++ b/src/main/resources/_sql/init/mysql/v0.5.sql @@ -1,3 +1,2 @@ -ALTER TABLE BUDGET ADD MONTH varchar(16) default 0 comment '当期月份'; -ALTER TABLE BUDGET ADD BASE_YEAR varchar(16) default 0 comment '基期年份'; -ALTER TABLE BUDGET ADD BASE_MONTH varchar(16) default 0 comment '基期月份'; \ No newline at end of file +# ALTER TABLE BUDGET ADD MATERIAL_ID varchar(64) default 0 comment '材料id'; +ALTER TABLE BUDGET_ITEM ADD MATERIAL_ID varchar(64) default 0 comment '材料id';