diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java index 570135b..58d3989 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java @@ -42,6 +42,7 @@ public class ApiAppletAmountController { .orderByDesc(AppletAmountLog::getCreateTime) .eq(AppletAmountLog::getUserId, appletAmountLog.getUserId()) .eq(appletAmountLog.getType() != null, AppletAmountLog::getType, appletAmountLog.getType()) + .eq(appletAmountLog.getMoneyType() != null, AppletAmountLog::getMoneyType, appletAmountLog.getMoneyType()) .list(); return AjaxResult.success("金额流水信息列表数据", amountLogList); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java index 48f1a23..b740f83 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java @@ -70,7 +70,7 @@ public class AppletOrderDateFrequency { private Long userId; /** 完成状态 */ - @Excel(name = "完成状态") + @Excel(name = "完成状态 0草稿 1待完成 1已完成") private String status; /** 完成时间 */ diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java index 1926e49..bbf1cdc 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java @@ -432,21 +432,21 @@ public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl