fix 商户分类统计

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.9</version>
+    <version>1.4.10</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml

@@ -1116,13 +1116,13 @@
         statistics_customer_order so
         inner JOIN sys_clients c ON so.client_id = c.client_id
         AND c.is_valid = 1
-        <if test="industry != null and industry!=0 and industry!=1">
+        <if test="industry != null and industry=='1'">
+            AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
+        </if>
+        <if test="industry != null and industry!='0' and industry!='1'">
             <bind name="industry" value="industry+'%'"/>
             AND c.royalpayindustry like #{industry}
         </if>
-        <if test="industry != null and industry==1">
-            AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
-        </if>
         and so.date >= #{from}
         and so.date &lt; #{to}
         and so.client_id!=0
@@ -1147,13 +1147,13 @@
         statistics_customer_order so
         inner JOIN sys_clients c ON so.client_id = c.client_id
         AND c.is_valid = 1
-        <if test="industry != null and industry!=0 and industry!=1">
+        <if test="industry != null and industry=='1'.toString()">
+            AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
+        </if>
+        <if test="industry != null and industry!='0'.toString() and industry!='1'.toString()">
             <bind name="industry" value="industry+'%'"/>
             AND c.royalpayindustry like #{industry}
         </if>
-        <if test="industry != null and industry==1">
-            AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
-        </if>
         and so.date= #{transDate}
         and so.client_id!=0
         <if test="bd_user!=null">

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml

@@ -89,13 +89,13 @@
             <if test="business_structure!=null">
                 AND c.business_structure=#{business_structure}
             </if>
-            <if test="industry!=null and industry != 0 and industry and industry!=1">
+            <if test="industry != null and industry=='1'.toString()">
+                AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
+            </if>
+            <if test="industry!=null and industry != '0'.toString() and industry and industry!='1'.toString()">
                 <bind name="industry" value="industry+'%'"/>
                 AND c.royalpayindustry like #{industry}
             </if>
-            <if test="industry != null and industry==1">
-                AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
-            </if>
             <if test="create_start_time!=null">
                 AND c.create_time >= #{create_start_time}
             </if>