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#1715修复

Browse Source
This commit is contained in:
gaoqr
2026-06-24 16:28:00 +08:00
parent b623567217
commit 22334591e1
2 changed files with 11 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/PurchaseRecordPageReqVO.java
+9
View File
@@ -2,6 +2,7 @@ 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.products.DurationUnitValid;
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;
@@ -37,9 +38,17 @@ public class PurchaseRecordPageReqVO extends PageParam {
@Schema(description = "购买时长") @Schema(description = "购买时长")
private Integer purchaseDuration; private Integer purchaseDuration;
@Schema(description = "购买时长单位")
@DurationUnitValid
private Integer purchaseDurationUnit;
@Schema(description = "赠送时长") @Schema(description = "赠送时长")
private Integer giftDuration; private Integer giftDuration;
@Schema(description = "赠送时长单位")
@DurationUnitValid
private Integer giftDurationUnit;
@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)
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java
+2
View File
@@ -47,7 +47,9 @@ public interface PurchaseRecordMapper extends BaseMapperX<PurchaseRecordDO> {
.likeIfPresent(PurchaseRecordDO::getProductName, pageReqVO.getProductName()) .likeIfPresent(PurchaseRecordDO::getProductName, pageReqVO.getProductName())
.likeIfPresent(PurchaseRecordDO::getId, pageReqVO.getId()) .likeIfPresent(PurchaseRecordDO::getId, pageReqVO.getId())
.eqIfPresent(PurchaseRecordDO::getPurchaseDuration, pageReqVO.getPurchaseDuration()) .eqIfPresent(PurchaseRecordDO::getPurchaseDuration, pageReqVO.getPurchaseDuration())
.eqIfPresent(PurchaseRecordDO::getPurchaseDurationUnit, pageReqVO.getPurchaseDurationUnit())
.eqIfPresent(PurchaseRecordDO::getGiftDuration, pageReqVO.getGiftDuration()) .eqIfPresent(PurchaseRecordDO::getGiftDuration, pageReqVO.getGiftDuration())
.eqIfPresent(PurchaseRecordDO::getGiftDurationUnit, pageReqVO.getGiftDurationUnit())
.betweenIfPresent(PurchaseRecordDO::getCreateTime, pageReqVO.getCreateTime()) .betweenIfPresent(PurchaseRecordDO::getCreateTime, pageReqVO.getCreateTime())
.likeIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getCreator()) .likeIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getCreator())
.eqIfPresent(PurchaseRecordDO::getTotalAmount, pageReqVO.getProductPrice()) .eqIfPresent(PurchaseRecordDO::getTotalAmount, pageReqVO.getProductPrice())