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 buildQueryWrapper(QscTaxIncomeYearBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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="选择时间"> - + + 搜索 重置 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 @@ - + @@ -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;