Bladeren bron

垫款,优化充值记录导出功能

zhaoxian 2 jaren geleden
bovenliggende
commit
679b6791c9

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/controller/FinancePaymentRechargeApplicationController.java

@@ -214,7 +214,7 @@ public class FinancePaymentRechargeApplicationController {
         try {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(recharge.getUserId());
-            if ("sale".equals(roleCode) || "saleAssistant".equals(roleCode) || "saleAm".equals(roleCode)) {
+            if ("saleAssistant".equals(roleCode)) {
                 if ("4f6454dbad954a8094013bf4c6d74796".equals(recharge.getUserId())) {
                     /*销售助理 曹媛 4f6454dbad954a8094013bf4c6d74796:侯加鑫、王维新、高洪哲             */
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentRechargeApplicationMapper.xml

@@ -180,7 +180,7 @@
             </if>
             <if test="startDate != null and startDate != '' ">
                 and t1.create_time >= #{startDate}
-                and t1.create_time &lt;= #{endDate}
+                and t1.create_time &lt;= concat(#{endDate},' 23:59:59')
             </if>
         </where>
         GROUP BY t2.id