From b3a2a1814156dfd35f89f6d0cc58682e540cb4d4 Mon Sep 17 00:00:00 2001 From: karlkyo Date: Tue, 4 Mar 2025 15:58:19 +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 --- .../screen/domain/bo/QscTaxBizVolBo.java | 3 + .../service/impl/QscTaxBizVolServiceImpl.java | 33 ++++++++- ziyun-ui/src/views/screen/taxBizVol/index.vue | 68 +++++++++---------- 3 files changed, 68 insertions(+), 36 deletions(-) diff --git a/ziyun-screen/src/main/java/com/ziyun/screen/domain/bo/QscTaxBizVolBo.java b/ziyun-screen/src/main/java/com/ziyun/screen/domain/bo/QscTaxBizVolBo.java index 0189a3f..8bc7aad 100644 --- a/ziyun-screen/src/main/java/com/ziyun/screen/domain/bo/QscTaxBizVolBo.java +++ b/ziyun-screen/src/main/java/com/ziyun/screen/domain/bo/QscTaxBizVolBo.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_biz_vol @@ -32,7 +33,9 @@ public class QscTaxBizVolBo extends BaseEntity { /** * 时间维度(单位:月) */ + @NotNull(message = "时间维度(单位:月)不能为空", groups = { AddGroup.class, EditGroup.class }) + @DateTimeFormat(pattern = "yyyy-MM") private Date bizMonthly; /** diff --git a/ziyun-screen/src/main/java/com/ziyun/screen/service/impl/QscTaxBizVolServiceImpl.java b/ziyun-screen/src/main/java/com/ziyun/screen/service/impl/QscTaxBizVolServiceImpl.java index aefde42..a47b8f2 100644 --- a/ziyun-screen/src/main/java/com/ziyun/screen/service/impl/QscTaxBizVolServiceImpl.java +++ b/ziyun-screen/src/main/java/com/ziyun/screen/service/impl/QscTaxBizVolServiceImpl.java @@ -15,7 +15,9 @@ import com.ziyun.screen.domain.vo.QscTaxBizVolVo; import com.ziyun.screen.domain.QscTaxBizVol; import com.ziyun.screen.mapper.QscTaxBizVolMapper; import com.ziyun.screen.service.IQscTaxBizVolService; +import com.ziyun.common.utils.DateUtils; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Collection; @@ -59,11 +61,13 @@ public class QscTaxBizVolServiceImpl implements IQscTaxBizVolService { LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(QscTaxBizVolBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getBizMonthly() != null, QscTaxBizVol::getBizMonthly, bo.getBizMonthly()); + // 如果bizMonthly不为空，则按年月格式进行模糊查询 + if (bo.getBizMonthly() != null) { + lqw.like(QscTaxBizVol::getBizMonthly, formatToYearMonth(bo.getBizMonthly())); + } lqw.eq(bo.getBizMonthlyVol() != null, QscTaxBizVol::getBizMonthlyVol, bo.getBizMonthlyVol()); lqw.eq(StringUtils.isNotBlank(bo.getBizMonthlyRatio()), QscTaxBizVol::getBizMonthlyRatio, bo.getBizMonthlyRatio()); lqw.eq(bo.getUserId() != null, QscTaxBizVol::getUserId, bo.getUserId()); @@ -71,6 +75,31 @@ public class QscTaxBizVolServiceImpl implements IQscTaxBizVolService { return lqw; } + /** + * 将日期对象格式化为年月字符串 + * + * @param date 日期对象 + * @return 格式化后的年月字符串（yyyy-MM） + */ + private String formatToYearMonth(Object date) { + if (date == null) { + return null; + } + // 如果已经是字符串格式且符合yyyy-MM格式，直接返回 + if (date instanceof String) { + String dateStr = (String) date; + if (dateStr.matches("\\d{4}-\\d{2}")) { + return dateStr; + } + } + // 尝试解析日期 + Date parsedDate = DateUtils.parseDate(date); + if (parsedDate != null) { + return DateUtils.parseDateToStr(DateUtils.YYYY_MM, parsedDate); + } + // 如果无法解析，返回原始字符串 + return date.toString(); + } /** * 新增业务量总览 */ diff --git a/ziyun-ui/src/views/screen/taxBizVol/index.vue b/ziyun-ui/src/views/screen/taxBizVol/index.vue index 2968aac..0481d4e 100644 --- a/ziyun-ui/src/views/screen/taxBizVol/index.vue +++ b/ziyun-ui/src/views/screen/taxBizVol/index.vue @@ -4,43 +4,43 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 重置