Browse Source

催款列表BUG修复

anderx 3 years ago
parent
commit
ac39b1dfe4

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1237,6 +1237,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="shiroType == 2 and fid !=null">
   	 and tm.finance_id in (select id from admin where superior_id= #{fid,jdbcType=VARCHAR})
   	</if>
+    <if test="amountStatus == 0">
+      and b.total_amount &lt; 10
+    </if>
     <if test="amountStatus == 1">
       and b.total_amount between 10 and 20
     </if>
@@ -1306,6 +1309,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="shiroType == 2 and fid !=null">
   	 and tm.finance_id in (select id from admin where superior_id= #{fid,jdbcType=VARCHAR})
   	</if>
+     <if test="amountStatus == 0">
+       and b.total_amount &lt; 10
+     </if>
      <if test="amountStatus == 1">
        and b.total_amount between 10 and 20
      </if>

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20