机构类型

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/extend/ExpenseFlowDaoExtend.java

@@ -14,8 +14,22 @@ import org.springframework.data.domain.Pageable;
  * @Version: 1.0
  */
 public interface ExpenseFlowDaoExtend {
+
+    /**
+     * 查询消费流水记录
+     *
+     * @param pageable
+     * @param param
+     * @return
+     */
     Page<ExpenseFlow> page(Pageable pageable, ExpenseFlowSearch param);
 
+    /**
+     * 统计消费
+     *
+     * @param param
+     * @return
+     */
     ExpenseFlowCount countPayment(ExpenseFlowSearch param);
 
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/ExpenseFlowDaoImpl.java

@@ -56,7 +56,7 @@ public class ExpenseFlowDaoImpl extends BaseImpl implements ExpenseFlowDaoExtend
         }
 
         if (StringUtils.isNotEmpty(param.getMonth())) {
-            criteria.and("month").is(param.getMonth());
+            criteria.and("month").is(CommonUtil.turnMonthSearch(param.getMonth()));
         }
 
         if (param.getIsPaySuccess() != null) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/WalletRechargeDaoImpl.java

@@ -61,7 +61,7 @@ public class WalletRechargeDaoImpl extends BaseImpl implements WalletRechargeExt
         }
 
         if (StringUtils.isNotEmpty(param.getMonth())) {
-            criteria.and("month").is(param.getMonth());
+            criteria.and("month").is(CommonUtil.turnMonthSearch(param.getMonth()));
         }
 
         if (!CommonUtil.longIsEmpty(param.getStartTime()) && !CommonUtil.longIsEmpty(param.getEndTime())) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/util/CommonUtil.java

@@ -463,4 +463,21 @@ public class CommonUtil {
         return null;
     }
 
+    /**
+     * 月份搜索的时候转换
+     *
+     * @param month
+     * @return
+     */
+    public static String turnMonthSearch(String month) {
+        if (StringUtils.isNotEmpty(month)) {
+            if (month.length() == 2) {
+                return month;
+            } else {
+                return String.format("0%s", month);
+            }
+        }
+        return month;
+    }
+
 }