fix:收费bug修改

haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeAccountStaffMapper.xml

@@ -133,7 +133,7 @@
         DATE_FORMAT( expire_time, '%Y-%m-%d' ) interceptTime
         from tab_haoban_qywx_fee_account_staff
         where wx_enterprise_id = #{wxEnterpriseId}
-        and DATE_SUB(CURDATE(), INTERVAL 30 DAY)  <![CDATA[ <= ]]> date(expire_time)
+        and expire_time between DATE(CURDATE()) and DATE_add(CURDATE(), INTERVAL 30 DAY)
         group by DATE_FORMAT( expire_time, '%Y-%m-%d' )
     </select>
 
@@ -143,7 +143,7 @@
             expire_time expireTime
         from tab_haoban_qywx_fee_account_staff
         where wx_enterprise_id = #{wxEnterpriseId}
-        and DATE_SUB(CURDATE(), INTERVAL 30 DAY)  <![CDATA[ <= ]]> date(expire_time)
+        and expire_time between DATE(CURDATE()) and DATE_add(CURDATE(), INTERVAL 30 DAY)
         order by expire_time desc limit 1
     </select>
 
@@ -152,7 +152,7 @@
         count(distinct staff_id)
         from tab_haoban_qywx_fee_account_staff
         where wx_enterprise_id = #{wxEnterpriseId}
-          and DATE_SUB(CURDATE(), INTERVAL 30 DAY)  <![CDATA[ <= ]]> date(expire_time)
+        and expire_time between DATE(CURDATE()) and DATE_add(CURDATE(), INTERVAL 30 DAY)
     </select>
 </mapper>
 

haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeMapper.xml

@@ -46,11 +46,11 @@
                 and intercept_time <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="endDate != null and endDate != ''">
-                and intercept_time <![CDATA[ >= ]]> #{endDate}
+                and intercept_time <![CDATA[ <= ]]> #{endDate}
             </if>
             <choose>
                 <when test="interceptFlag != null and interceptFlag == 0">
-                    and DATE_SUB(CURDATE(), INTERVAL 30 DAY)  <![CDATA[ <= ]]> date(intercept_time)
+                    and intercept_time between DATE(CURDATE()) and DATE_add(CURDATE(), INTERVAL 30 DAY)
                     GROUP BY wx_enterprise_id
                     order by intercept_time asc
                 </when>