From 7612d99885f889ce1f63df70836d4fddd0156cf5 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Tue, 12 Nov 2024 16:38:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=A8=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E5=B9=B4=E6=9C=88=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/mjkf/xinke/main/model/db/Budget.java | 29 ++++++++++++++-----
 src/main/resources/_sql/init/mysql/v0.5.sql   |  3 ++
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/_sql/init/mysql/v0.5.sql

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 987a3e6..4997159 100644
--- a/src/main/java/mjkf/xinke/main/model/db/Budget.java
+++ b/src/main/java/mjkf/xinke/main/model/db/Budget.java
@@ -76,14 +76,23 @@ public class Budget extends Model<Budget> {
     @ApiModelProperty("日期")
     @TableField("`DATE`")
     private LocalDate date;
-//
-//    @ApiModelProperty("年份")
-//    @TableField("`YEAR`")
-//    private Integer year;
-//
-//    @ApiModelProperty("月份")
-//    @TableField(value="`MONTHS`", typeHandler = FastjsonArrayHandler.class)
-//    private List months;
+
+    @ApiModelProperty("当期年份")
+    @TableField("`YEAR`")
+    private Integer year;
+
+    @ApiModelProperty("当期月份")
+    @TableField(value="`MONTH`")
+    private Integer month;
+
+    @ApiModelProperty("基期年份")
+    @TableField("`BASE_YEAR`")
+    private Integer baseYear;
+
+    @ApiModelProperty("基期月份")
+    @TableField(value="`BASE_MONTH`")
+    private Integer baseMonth;
+
     @TableField(exist = false)
     private List<BudgetItem> items;
 
@@ -124,6 +133,10 @@ public class Budget extends Model<Budget> {
         this.diff = param.getTotalDiff();  // 调差金额
         this.amount = baseAmount + diff;  // 当期总价
         this.date = LocalDate.now();
+        this.year = param.getYear();
+        this.month = param.getMonth();
+        this.baseYear = param.getBaseYear();
+        this.baseMonth = param.getBaseMonth();
     }
 
 }
diff --git a/src/main/resources/_sql/init/mysql/v0.5.sql b/src/main/resources/_sql/init/mysql/v0.5.sql
new file mode 100644
index 0000000..b53a0c6
--- /dev/null
+++ b/src/main/resources/_sql/init/mysql/v0.5.sql
@@ -0,0 +1,3 @@
+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