Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道bug#1601修复

Browse Source
This commit is contained in:
gaoqr
2026-06-01 20:21:40 +08:00
parent 52d893b553
commit 1cc176bee0
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/SalesDetailsPageReqVO.java
+5
View File
@@ -1,6 +1,7 @@
package com.cf.imes.module.system.controller.admin.funds.purchase.vo; package com.cf.imes.module.system.controller.admin.funds.purchase.vo;
import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageParam;
import com.cf.imes.module.system.validation.pay.PayChannelCodeValid;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMax;
import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.DecimalMin;
@@ -44,4 +45,8 @@ public class SalesDetailsPageReqVO extends PageParam {
@Schema(description = "交易时间", example = "[2022-07-01 01:01:01 ,2022-07-01 01:01:01]") @Schema(description = "交易时间", example = "[2022-07-01 01:01:01 ,2022-07-01 01:01:01]")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
@Schema(description = "支付方式")
@PayChannelCodeValid
private Integer paymentMethod;
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java
+1
View File
@@ -125,6 +125,7 @@ public interface PurchaseRecordMapper extends BaseMapperX<PurchaseRecordDO> {
.eqIfPresent(PurchaseRecordDO::getTotalAmount, pageReqVO.getProductPrice()) .eqIfPresent(PurchaseRecordDO::getTotalAmount, pageReqVO.getProductPrice())
.eqIfPresent(PurchaseRecordDO::getOrganId, pageReqVO.getOrganId()) .eqIfPresent(PurchaseRecordDO::getOrganId, pageReqVO.getOrganId())
.eqIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getOperator()) .eqIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getOperator())
.eqIfPresent(PurchaseRecordDO::getPaymentMethod, pageReqVO.getPaymentMethod())
.eq(PurchaseRecordDO::getDeleted, false) .eq(PurchaseRecordDO::getDeleted, false)
.ne(PurchaseRecordDO::getInitial, true) .ne(PurchaseRecordDO::getInitial, true)
.orderByDesc(PurchaseRecordDO::getCreateTime) .orderByDesc(PurchaseRecordDO::getCreateTime)