管乐迷迭代

mec-biz/src/main/java/com/ym/mec/biz/dal/page/AccountLogQueryInfo.java

@@ -15,6 +15,8 @@ public class AccountLogQueryInfo extends QueryInfo {
 
     private String groupType;
 
+    private String returnFeeType;
+
     private Date payStartTime;
 
     private Date payEndTime;
@@ -23,6 +25,14 @@ public class AccountLogQueryInfo extends QueryInfo {
 
     private Date createEndTime;
 
+    public String getReturnFeeType() {
+        return returnFeeType;
+    }
+
+    public void setReturnFeeType(String returnFeeType) {
+        this.returnFeeType = returnFeeType;
+    }
+
     public String getOrganId() {
         return organId;
     }

mec-biz/src/main/resources/config/mybatis/SysUserCashAccountLogMapper.xml

@@ -84,17 +84,20 @@
                 AND cal.create_time_ >= #{createStartTime}
             </if>
             <if test="createEndTime != null">
-                AND cal.create_time_ &lt;= #{createStartTime}
+                AND cal.create_time_ &lt;= #{createEndTime}
             </if>
             <if test="payStartTime != null">
                 AND cal.pay_time_ >= #{payStartTime}
             </if>
             <if test="payEndTime != null">
-                AND cal.pay_time_ &lt;= #{payStartTime}
+                AND cal.pay_time_ &lt;= #{payEndTime}
             </if>
             <if test="groupType != null and groupType != ''">
                 AND cal.group_type_ = #{groupType}
             </if>
+            <if test="returnFeeType != null and returnFeeType != ''">
+                AND cal.return_fee_type_ = #{returnFeeType}
+            </if>
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(cal.organ_id_,#{organId})
             </if>