Browse Source

修复明细筛选根据微信订单号,作业公司筛选金额不正确bug

qzyReal 2 years ago
parent
commit
c31fcae128

+ 8 - 2
sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsMapper.xml

@@ -75,11 +75,14 @@
         <where>
             <if test=' this.has("id") '>and id = #{id}</if>
             <if test=' this.has("businessId") '>and business_id = #{businessId}</if>
+
             <if test=' this.has("businessNo") '>and (business_no like concat('%',#{businessNo},'%')
-                                                    or business_car_no like concat('%',#{businessNo},'%'))</if>
+                or business_car_no like concat('%',#{businessNo},'%'))
+            </if>
             <if test=' this.has("carNo") '>and car_no like concat('%',#{carNo},'%')</if>
             <if test=' this.has("transactionId") '>and transaction_id like concat('%',#{transactionId},'%')</if>
-            <if test=' this.has("pickCustomerName") '>and pick_customer_name like concat('%',#{pickCustomerName},'%')</if>
+            <if test=' this.has("pickCustomerName") '>and pick_customer_name like concat('%',#{pickCustomerName},'%')
+            </if>
             <if test=' this.has("feeType") '>and fee_type = #{feeType}</if>
             <if test=' this.has("itemTypeId") '>and item_type_id = #{itemTypeId}</if>
             <if test=' this.has("itemTypeName") '>and item_type_name = #{itemTypeName}</if>
@@ -141,10 +144,13 @@
             <if test=' this.has("itemTypeId") '>and item_type_id = #{itemTypeId}</if>
             <if test=' this.has("itemTypeName") '>and item_type_name = #{itemTypeName}</if>
             <if test=' this.has("itemId") '>and item_id = #{itemId}</if>
+            <if test=' this.has("transactionId") '>and transaction_id = #{transactionId}</if>
             <if test=' this.has("itemName") '>and item_name = #{itemName}</if>
             <if test=' this.has("payDay") '>and pay_day = #{payDay}</if>
             <if test=' this.has("payType") '>and pay_type = #{payType}</if>
             <if test=' this.has("createTime") '>and create_time = #{createTime}</if>
+            <if test=' this.has("pickCustomerName") '>and pick_customer_name like concat('%',#{pickCustomerName},'%')
+            </if>
             <if test=' this.has("beginTime") and this.has("endTime") '>
                 and pay_day >= #{beginTime}
                 and pay_day &lt;= #{endTime}