From 224ab6c45b13320ec959341b82a0dee319c10651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Tue, 17 Jun 2025 11:07:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=94=AF=E4=BB=98=E8=AE=B0=E5=BD=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA=E3=80=81=E6=94=AF=E4=BB=98=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/domain/bo/WxPayRecordBo.java | 14 +++++ .../business/domain/vo/WxPayRecordVo.java | 22 ++++---- .../service/impl/WxPayRecordServiceImpl.java | 2 + .../src/views/business/payRecord/index.vue | 51 ++++++++++++++----- 4 files changed, 66 insertions(+), 23 deletions(-) diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxPayRecordBo.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxPayRecordBo.java index cb7fea8..8617577 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxPayRecordBo.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxPayRecordBo.java @@ -1,5 +1,6 @@ package com.propertyManagement.business.domain.bo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import lombok.Data; @@ -10,6 +11,7 @@ import java.util.Date; import java.math.BigDecimal; import com.propertyManagement.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 缴费记录业务对象 wx_pay_record @@ -133,4 +135,16 @@ public class WxPayRecordBo extends BaseEntity { */ private String outTradeNo; + /** + * 创建开始时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createStartTime; + + /** + * 创建结束时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createEndTime; + } diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxPayRecordVo.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxPayRecordVo.java index 1f63d88..26dad4c 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxPayRecordVo.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxPayRecordVo.java @@ -3,6 +3,7 @@ package com.propertyManagement.business.domain.vo; import java.math.BigDecimal; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.propertyManagement.common.annotation.ExcelDictFormat; @@ -53,19 +54,18 @@ public class WxPayRecordVo implements Serializable { /** * 业主名称 */ - @ExcelProperty(value = "业主名称") + @ExcelProperty(value = "业主姓名") private String proprietorName; /** - * 业主房间 + * 业主户号 */ - @ExcelProperty(value = "业主房间") + @ExcelProperty(value = "业主户号") private String room; /** * 登记车牌 */ - @ExcelProperty(value = "登记车牌") private String plateNumber; /** @@ -78,31 +78,26 @@ public class WxPayRecordVo implements Serializable { /** * 支付渠道 */ - @ExcelProperty(value = "支付渠道") private String payChannelCode; /** * 支付商户code */ - @ExcelProperty(value = "支付商户code") private String payMchCode; /** * 支付类型 */ - @ExcelProperty(value = "支付类型") private String payTradeType; /** * 支付应用 */ - @ExcelProperty(value = "支付应用") private String payAppCode; /** * 支付业务 */ - @ExcelProperty(value = "支付业务") private String payBizCode; /** @@ -118,16 +113,23 @@ public class WxPayRecordVo implements Serializable { @ExcelDictFormat(dictType = "wx_pay_record_state") private Integer payState; + /** + * 支付时间 + */ + @ExcelProperty(value = "支付时间") + @ColumnWidth(18) + private Date createTime; + /** * 平台支付流水号 */ @ExcelProperty(value = "平台支付流水号") + @ColumnWidth(25) private String outTradeNo; /** * 更新时间 */ - @ExcelProperty(value = "更新时间") private Date updateTime; diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxPayRecordServiceImpl.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxPayRecordServiceImpl.java index 7f8c5d5..3ac7aba 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxPayRecordServiceImpl.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxPayRecordServiceImpl.java @@ -13,6 +13,7 @@ import com.propertyManagement.business.mapper.WxLiveBillMapper; import com.propertyManagement.business.mapper.WxProprietorLedgerMapper; import com.propertyManagement.business.mapper.WxRepairsMapper; import com.propertyManagement.business.support.util.AuthUtil; +import com.propertyManagement.common.core.domain.BaseEntity; import com.propertyManagement.common.enums.LiveBillState; import com.propertyManagement.common.enums.LiveBillType; import com.propertyManagement.common.enums.PayState; @@ -262,6 +263,7 @@ public class WxPayRecordServiceImpl implements IWxPayRecordService { lqw.eq(bo.getPayAmount() != null, WxPayRecord::getPayAmount, bo.getPayAmount()); lqw.eq(bo.getPayState() != null, WxPayRecord::getPayState, bo.getPayState()); lqw.eq(StringUtils.isNotBlank(bo.getOutTradeNo()), WxPayRecord::getOutTradeNo, bo.getOutTradeNo()); + lqw.between(bo.getCreateStartTime() != null, BaseEntity::getCreateTime, bo.getCreateStartTime(), bo.getCreateEndTime()); lqw.orderByDesc(WxPayRecord::getCreateTime); return lqw; } diff --git a/propertyManagement-ui/src/views/business/payRecord/index.vue b/propertyManagement-ui/src/views/business/payRecord/index.vue index 3cbc20a..6dfcd00 100644 --- a/propertyManagement-ui/src/views/business/payRecord/index.vue +++ b/propertyManagement-ui/src/views/business/payRecord/index.vue @@ -58,6 +58,17 @@ @keyup.enter.native="handleQuery" /> + + + + 搜索 重置 @@ -97,25 +108,25 @@ - - - - - - - - - - + + 导出 + - + - + @@ -134,6 +145,11 @@ + + + @@ -269,6 +285,7 @@ export default { // 是否显示弹出层 open: false, // 查询参数 + createTime: [], queryParams: { pageNum: 1, pageSize: 10, @@ -359,6 +376,13 @@ export default { /** 查询缴费记录列表 */ getList() { this.loading = true; + if (this.createTime.length > 0) { + this.queryParams.createStartTime = this.createTime[0] + this.queryParams.createEndTime = this.createTime[1] + }else { + this.queryParams.createStartTime = undefined + this.queryParams.createEndTime = undefined + } listPayRecord(this.queryParams).then(response => { this.payRecordList = response.rows; this.total = response.total; @@ -413,6 +437,7 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + this.createTime = [] this.handleQuery(); }, // 多选框选中数据 @@ -483,7 +508,7 @@ export default { handleExport() { this.download('business/payRecord/export', { ...this.queryParams - }, `payRecord_${new Date().getTime()}.xlsx`) + }, `缴费记录_${new Date().getTime()}.xlsx`) } } }; -- 2.22.0