From 12736916bd7292be0a988e851f3e5db5d70d825b Mon Sep 17 00:00:00 2001
From: karlkyo <karlkyoseven@gmail.com>
Date: Tue, 25 Feb 2025 17:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E9=94=99=E8=AF=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ziyun/screen/domain/QscTaxBizVol.java |  2 +-
 .../ziyun/screen/domain/QscTaxIncomeYear.java |  2 +-
 .../src/views/screen/taxIncomeYear/index.vue  | 23 ++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ziyun-screen/src/main/java/com/ziyun/screen/domain/QscTaxBizVol.java b/ziyun-screen/src/main/java/com/ziyun/screen/domain/QscTaxBizVol.java
index 791f0f3..3a5a71e 100644
--- a/ziyun-screen/src/main/java/com/ziyun/screen/domain/QscTaxBizVol.java
+++ b/ziyun-screen/src/main/java/com/ziyun/screen/domain/QscTaxBizVol.java
@@ -27,7 +27,7 @@ public class QscTaxBizVol extends BaseEntity {
     /**
      * ID
      */
-    @TableId(value = "id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 时间维度(单位:月)
diff --git a/ziyun-screen/src/main/java/com/ziyun/screen/domain/QscTaxIncomeYear.java b/ziyun-screen/src/main/java/com/ziyun/screen/domain/QscTaxIncomeYear.java
index 74822d8..eb380b0 100644
--- a/ziyun-screen/src/main/java/com/ziyun/screen/domain/QscTaxIncomeYear.java
+++ b/ziyun-screen/src/main/java/com/ziyun/screen/domain/QscTaxIncomeYear.java
@@ -27,7 +27,7 @@ public class QscTaxIncomeYear extends BaseEntity {
     /**
      * id
      */
-    @TableId(value = "id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 时间
diff --git a/ziyun-ui/src/views/screen/taxIncomeYear/index.vue b/ziyun-ui/src/views/screen/taxIncomeYear/index.vue
index e5a9995..81e9ecb 100644
--- a/ziyun-ui/src/views/screen/taxIncomeYear/index.vue
+++ b/ziyun-ui/src/views/screen/taxIncomeYear/index.vue
@@ -4,9 +4,9 @@
       <el-form-item label="时间" prop="incomeYear">
         <el-date-picker clearable
           v-model="queryParams.incomeYear"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择时间">
+          type="year"
+          value-format="yyyy-01-01"
+          placeholder="请选择年份">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="收入" prop="income">
@@ -139,9 +139,9 @@
         <el-form-item label="时间" prop="incomeYear">
           <el-date-picker clearable
             v-model="form.incomeYear"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择时间">
+            type="year"
+            value-format="yyyy"
+            placeholder="请选择年份">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="收入" prop="income">
@@ -259,6 +259,11 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      if (this.queryParams.incomeYear) {
+        // 确保日期格式为 yyyy-MM-01
+        const formattedDate = `${this.queryParams.incomeYear}-01`;
+        this.queryParams.incomeYear = formattedDate;
+      }
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -304,8 +309,10 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+          const formattedDate = `${this.form.incomeYear}-01-01 00:00:00`;
+          const form = {...this.form, incomeYear: formattedDate};
           if (this.form.id != null) {
-            updateTaxIncomeYear(this.form).then(response => {
+            updateTaxIncomeYear(form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -313,7 +320,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addTaxIncomeYear(this.form).then(response => {
+            addTaxIncomeYear(form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();