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

应付账款-已付款tab页面支持付款账户的查询

1. 后端支持付款账户的查询,还需要前端调整为下拉框
2. 基础管理-账户管理 页面账户简称由原先的等值搜索调整为模糊搜索
lipf пре 1 месец
родитељ
комит
45f20f1571

+ 2 - 0
commons/src/main/java/com/jzg/commons/entity/dto/AmountAuditParam.java

@@ -63,4 +63,6 @@ public class AmountAuditParam extends PageRequest {
     @Schema(description = "付款时间-止")
     private String paymentTimeEnd;
 
+    @Schema(description = "付款账户ID")
+    private String accountId;
 }

+ 1 - 1
tenant/organization/src/main/resources/mapper/InvAccountCardMapper.xml

@@ -59,7 +59,7 @@
                 and ia.account_name like CONCAT('%',#{param.accountName}, '%')
             </if>
             <if test="param.cardName != null and param.cardName != ''">
-                and iac.card_name = #{param.cardName}
+                and iac.card_name like concat('%',#{param.cardName}, '%')
             </if>
             <if test="param.accountQuality != null ">
                 and iac.account_quality = #{param.accountQuality}

+ 3 - 0
tenant/organization/src/main/resources/mapper/finance/SysAmountAuditingMapper.xml

@@ -86,6 +86,9 @@
             <if test="param.auditTimeStart != null and param.auditTimeEnd != null">
                 and DATE_FORMAT(saa.auditing_time, '%Y-%m-%d') between #{param.auditTimeStart} AND #{param.auditTimeEnd}
             </if>
+            <if test="param.accountId != null and param.accountId != ''">
+                and saa.accountId = #{param.accountId}
+            </if>
             <if test="param.auditingUser != null and param.auditingUser != ''">
                 and (sua.username = #{param.auditingUser} or sua.mobile = #{param.auditingUser})
             </if>