From f5324e53d4d3569f3adff3bf33eea57c6c2f5943 Mon Sep 17 00:00:00 2001
From: karlkyo <karlkyoseven@gmail.com>
Date: Wed, 26 Feb 2025 17:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9incomeyear=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ziyun/screen/domain/bo/QscTaxIncomeYearBo.java |  2 ++
 .../service/impl/QscTaxIncomeYearServiceImpl.java      |  6 +++++-
 ziyun-ui/src/views/screen/taxIncomeMonth/index.vue     |  8 ++++----
 ziyun-ui/src/views/screen/taxIncomeYear/index.vue      | 10 +++++-----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ziyun-screen/src/main/java/com/ziyun/screen/domain/bo/QscTaxIncomeYearBo.java b/ziyun-screen/src/main/java/com/ziyun/screen/domain/bo/QscTaxIncomeYearBo.java
index 492f410..c98af6e 100644
--- a/ziyun-screen/src/main/java/com/ziyun/screen/domain/bo/QscTaxIncomeYearBo.java
+++ b/ziyun-screen/src/main/java/com/ziyun/screen/domain/bo/QscTaxIncomeYearBo.java
@@ -11,6 +11,7 @@ import java.util.Date;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ziyun.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 税收收入(年)业务对象 qsc_tax_income_year
@@ -33,6 +34,7 @@ public class QscTaxIncomeYearBo extends BaseEntity {
      * 时间
      */
     @NotNull(message = "时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date incomeYear;
 
     /**
diff --git a/ziyun-screen/src/main/java/com/ziyun/screen/service/impl/QscTaxIncomeYearServiceImpl.java b/ziyun-screen/src/main/java/com/ziyun/screen/service/impl/QscTaxIncomeYearServiceImpl.java
index 931d233..a5b1f9a 100644
--- a/ziyun-screen/src/main/java/com/ziyun/screen/service/impl/QscTaxIncomeYearServiceImpl.java
+++ b/ziyun-screen/src/main/java/com/ziyun/screen/service/impl/QscTaxIncomeYearServiceImpl.java
@@ -63,7 +63,11 @@ public class QscTaxIncomeYearServiceImpl implements IQscTaxIncomeYearService {
     private LambdaQueryWrapper<QscTaxIncomeYear> buildQueryWrapper(QscTaxIncomeYearBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<QscTaxIncomeYear> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getIncomeYear() != null, QscTaxIncomeYear::getIncomeYear, bo.getIncomeYear());
+        // 对年份进行模糊匹配，格式化年份
+        if (bo.getIncomeYear() != null) {
+            String yearStr = String.valueOf(bo.getIncomeYear().getYear() + 1900);
+            lqw.like(QscTaxIncomeYear::getIncomeYear, yearStr);
+        }
         lqw.eq(bo.getIncome() != null, QscTaxIncomeYear::getIncome, bo.getIncome());
         lqw.eq(bo.getRate() != null, QscTaxIncomeYear::getRate, bo.getRate());
         lqw.eq(bo.getUserId() != null, QscTaxIncomeYear::getUserId, bo.getUserId());
diff --git a/ziyun-ui/src/views/screen/taxIncomeMonth/index.vue b/ziyun-ui/src/views/screen/taxIncomeMonth/index.vue
index ce6523f..9fd682b 100644
--- a/ziyun-ui/src/views/screen/taxIncomeMonth/index.vue
+++ b/ziyun-ui/src/views/screen/taxIncomeMonth/index.vue
@@ -27,7 +27,7 @@
           placeholder="选择时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="税收收入" prop="taxIncome">
+      <!-- <el-form-item label="税收收入" prop="taxIncome">
         <el-input
           v-model="queryParams.taxIncome"
           placeholder="请输入税收收入"
@@ -35,8 +35,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="非税收入" prop="nonTaxIncome">
+      </el-form-item> -->
+      <!-- <el-form-item label="非税收入" prop="nonTaxIncome">
         <el-input
           v-model="queryParams.nonTaxIncome"
           placeholder="请输入非税收入"
@@ -44,7 +44,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
diff --git a/ziyun-ui/src/views/screen/taxIncomeYear/index.vue b/ziyun-ui/src/views/screen/taxIncomeYear/index.vue
index 81e9ecb..76130bb 100644
--- a/ziyun-ui/src/views/screen/taxIncomeYear/index.vue
+++ b/ziyun-ui/src/views/screen/taxIncomeYear/index.vue
@@ -5,11 +5,11 @@
         <el-date-picker clearable
           v-model="queryParams.incomeYear"
           type="year"
-          value-format="yyyy-01-01"
+          value-format="yyyy"
           placeholder="请选择年份">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="收入" prop="income">
+      <!-- <el-form-item label="收入" prop="income">
         <el-input
           v-model="queryParams.income"
           placeholder="请输入收入"
@@ -24,7 +24,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
 <!--      <el-form-item label="用户ID" prop="userId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.userId"-->
@@ -260,8 +260,8 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       if (this.queryParams.incomeYear) {
-        // 确保日期格式为 yyyy-MM-01
-        const formattedDate = `${this.queryParams.incomeYear}-01`;
+        // 确保日期格式为 yyyy-MM-dd HH:mm:ss
+        const formattedDate = `${this.queryParams.incomeYear}-01-01 00:00:00`;
         this.queryParams.incomeYear = formattedDate;
       }
       this.queryParams.pageNum = 1;