Преглед изворни кода

Merge remote-tracking branch 'origin/master'

yumeng пре 2 година
родитељ
комит
1c70f38d38

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

@@ -105,9 +105,9 @@
                  SELECT t1.audit_status,
                         IFNULL(t1.revieweder_id, '-'),
                         IFNULL(t1.revieweder, '-'),
-                        CASE revieweder_id
-                            WHEN 'financialReview' THEN '财务审核'
-                            WHEN 'meidaManager' THEN '媒介'
+                        CASE
+                            WHEN revieweder_id like'financ%' THEN '财务审核'
+                            WHEN revieweder_id ='meidaManager' THEN '媒介'
                             ELSE
                                 t4.role_name
                             END,

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

@@ -15,9 +15,9 @@
                  SELECT t1.audit_status,
                         IFNULL(t1.revieweder_id, '-'),
                         IFNULL(t1.revieweder, '-'),
-                        CASE revieweder_id
-                            WHEN 'financialReview' THEN '财务审核'
-                            WHEN 'meidaManager' THEN '媒介'
+                        CASE
+                            WHEN revieweder_id like'financ%' THEN '财务审核'
+                            WHEN revieweder_id ='meidaManager' THEN '媒介'
                             ELSE
                                 t4.role_name
                             END,
@@ -105,7 +105,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 t1.id