root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改字段名称

Browse Source
This commit is contained in:
han0
2024-11-12 17:37:52 +08:00
parent 7612d99885
commit c73a049d62
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/mjkf/xinke/main/model/db/Budget.java
View File

@@ -87,10 +87,12 @@ public class Budget extends Model<Budget> {
@ApiModelProperty("基期年份") @ApiModelProperty("基期年份")
@TableField("`BASE_YEAR`") @TableField("`BASE_YEAR`")
@JsonProperty(value = "base_year")
private Integer baseYear; private Integer baseYear;
@ApiModelProperty("基期月份") @ApiModelProperty("基期月份")
@TableField(value="`BASE_MONTH`") @TableField(value="`BASE_MONTH`")
@JsonProperty(value = "base_month")
private Integer baseMonth; private Integer baseMonth;
@TableField(exist = false) @TableField(exist = false)

8
src/main/java/mjkf/xinke/main/model/db/BudgetItem.java
View File

@@ -49,9 +49,10 @@ public class BudgetItem extends Model<BudgetItem> {
@TableField("`NAME`") @TableField("`NAME`")
private String name; private String name;
// @ApiModelProperty("总数") @ApiModelProperty("材料id")
// @TableField("QUANTITY") @TableField("`MATERIAL_ID`")
// private Integer quantity; @JsonProperty(value = "material_id")
private String materialId;
// @ApiModelProperty("数据") // @ApiModelProperty("数据")
// @TableField(value="`META`", typeHandler = FastjsonArrayHandler.class) // @TableField(value="`META`", typeHandler = FastjsonArrayHandler.class)
@@ -111,6 +112,7 @@ public class BudgetItem extends Model<BudgetItem> {
public BudgetItem(Integer budgetId, BudgetCreateRequest.BudgetMaterial item) { public BudgetItem(Integer budgetId, BudgetCreateRequest.BudgetMaterial item) {
this.budgetId = budgetId; this.budgetId = budgetId;
this.materialId = item.getMaterialId();
this.name = item.getName(); this.name = item.getName();
this.unit = item.getUnit(); this.unit = item.getUnit();
this.price = item.getPrice(); this.price = item.getPrice();

3
src/main/java/mjkf/xinke/main/model/vo/BudgetCreateRequest.java
View File

@@ -41,7 +41,8 @@ public class BudgetCreateRequest {
@Data @Data
static public class BudgetMaterial implements Serializable { static public class BudgetMaterial implements Serializable {
@ApiModelProperty("材料id") @ApiModelProperty("材料id")
private String id; @JsonProperty(value = "material_id")
private String materialId;
@ApiModelProperty("材料名称") @ApiModelProperty("材料名称")
private String name; private String name;

3
src/main/resources/_sql/init/mysql/v0.4.sql
View File

@@ -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 RATIO decimal(16,4) default 0 comment '材料占比';
ALTER TABLE BUDGET_ITEM ADD AMOUNT_DIFF 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 '基期月份';

5
src/main/resources/_sql/init/mysql/v0.5.sql
View File

@@ -1,3 +1,2 @@
ALTER TABLE BUDGET ADD MONTH varchar(16) default 0 comment '当期月份'; # ALTER TABLE BUDGET ADD MATERIAL_ID varchar(64) default 0 comment '材料id';
ALTER TABLE BUDGET ADD BASE_YEAR varchar(16) default 0 comment '基期年份'; ALTER TABLE BUDGET_ITEM ADD MATERIAL_ID varchar(64) default 0 comment '材料id';
ALTER TABLE BUDGET ADD BASE_MONTH varchar(16) default 0 comment '基期月份';