weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev_qinhongzhan' into dev

Browse Source 
# Conflicts:
#	mhd-auth/src/main/resources/bootstrap.yml
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
#	mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
#	mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java
This commit is contained in:
1745237360-cloud
2026-01-10 16:45:38 +08:00
parent 3ec71c4a88 4b427e1b2e
commit f7e6f70321
104 changed files with 3099 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml
+26 -1
View File
@@ -11,10 +11,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="delFlag" column="del_flag" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="topOrganizationId" column="top_organization_id" />
<result property="organizationId" column="organization_id" />
</resultMap>
<sql id="selectReceivingAccountPo">
select id, account_name, account_information, del_flag, create_time, update_time
select id, account_name, account_information, del_flag, create_time, update_time, top_organization_id, organization_id
from receiving_account
</sql>
@@ -30,6 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="accountInformation != null and accountInformation != ''">
and account_information like concat('%', #{accountInformation}, '%')
</if>
<if test="topOrganizationId != null and topOrganizationId != ''">
and top_organization_id = #{topOrganizationId}
</if>
<if test="organizationId != null and organizationId != ''">
and organization_id = #{organizationId}
</if>
order by create_time desc
</where>
</sql>
@@ -47,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="delFlag != null">del_flag,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="topOrganizationId != null and topOrganizationId != ''">top_organization_id,</if>
<if test="organizationId != null and organizationId != ''">organization_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="accountName != null and accountName != ''">#{accountName},</if>
@@ -54,6 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="delFlag != null">#{delFlag},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="topOrganizationId != null and topOrganizationId != ''">#{topOrganizationId},</if>
<if test="organizationId != null and organizationId != ''">#{organizationId},</if>
</trim>
</insert>
@@ -84,4 +96,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time = now()
where del_flag = 1
</update>
<update id="deleteByOrganization">
update receiving_account
set del_flag = 2,
update_time = now()
where del_flag = 1
<if test="topOrganizationId != null and topOrganizationId != ''">
and top_organization_id = #{topOrganizationId}
</if>
<if test="organizationId != null and organizationId != ''">
and organization_id = #{organizationId}
</if>
</update>
</mapper>
mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml
+13
View File
@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateByName" column="update_by_name" />
<result property="delFlag" column="del_flag" />
<result property="organizationId" column="organization_id" />
<result property="organizationName" column="organization_name" />
<result property="topOrganizationId" column="top_organization_id" />
<result property="approvalNumber" column="approval_number" />
<result property="isInvoice" column="is_invoice" />
@@ -134,12 +135,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateByName != null and updateByName != ''">
and a.update_by_name like concat('%', #{updateByName}, '%')
</if>
<!-- 组织ID过滤条件：如果设置了organizationId，则按组织ID精确匹配 -->
<if test="organizationId != null ">
and a.organization_id = #{organizationId}
</if>
<!-- 一级组织ID过滤条件：如果设置了topOrganizationId，则按一级组织ID匹配 -->
<if test="topOrganizationId != null ">
and a.top_organization_id = #{topOrganizationId}
</if>
<!-- 组织名称模糊查询条件：如果前端传入了组织名称，则按组织名称模糊匹配 -->
<if test="organizationName != null and organizationName != ''">
and a.organization_name LIKE CONCAT('%',#{organizationName},'%')
</if>
<!-- 当设置了组织相关查询条件时，确保organization_name不为null且不为空字符串 -->
<if test="organizationId != null or topOrganizationId != null or (organizationName != null and organizationName != '')">
and a.organization_name IS NOT NULL
and a.organization_name &lt;&gt; ''
and LENGTH(TRIM(a.organization_name)) > 0
</if>
<if test="collectionTimeStart != null and collectionTimeEnd != null">
AND (date_format(a.collection_time,'%Y-%m-%d') >= date_format(#{collectionTimeStart},'%Y-%m-%d')
and date_format(a.collection_time,'%Y-%m-%d') <![CDATA[<=]]> date_format(#{collectionTimeEnd},'%Y-%m-%d'))
mhd_finance/src/main/resources/mapper/revenueExpensesRecord/RevenueExpensesRecordMapper.xml
-4
View File
@@ -45,8 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="bankAccount" column="bank_account" />
<result property="oilNumber" column="oil_number" />
<result property="voucherImages" column="voucher_images" />
<result property="payChannel" column="pay_channel" />
<result property="payChannelName" column="pay_channel_name" />
<result property="kingdee" column="kingdee" />
<result property="kingdeeSubjectCode" column="kingdee_subject_code" />
@@ -95,8 +93,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bank_account,
oil_number,
voucher_images,
pay_channel,
pay_channel_name,
kingdee,
kingdee_subject_code,
kingdee_subject_name,
mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml
+16
View File
@@ -97,6 +97,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="accountInformation != null and accountInformation != ''">
and account_information like concat('%', #{accountInformation}, '%')
</if>
<!-- 无论什么情况，organization_name 都不能为空，也不能为空字符串 -->
and organization_name IS NOT NULL
and organization_name &lt;&gt; ''
and LENGTH(TRIM(organization_name)) > 0
<!-- 组织ID过滤条件：如果设置了organizationId，则按组织ID精确匹配 -->
<if test="organizationId != null ">
and organization_id = #{organizationId}
</if>
<!-- 一级组织ID过滤条件：如果设置了topOrganizationId，则按一级组织ID匹配 -->
<if test="topOrganizationId != null ">
and top_organization_id = #{topOrganizationId}
</if>
<!-- 组织名称模糊查询条件：如果前端传入了组织名称，则按组织名称模糊匹配 -->
<if test="organizationName != null and organizationName != ''">
and organization_name LIKE CONCAT('%',#{organizationName},'%')
</if>
order by create_time desc
</where>
mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml
+169 -126
View File
@@ -47,61 +47,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="delFlag" column="del_flag" />
<result property="organizationId" column="organization_id" />
<result property="topOrganizationId" column="top_organization_id" />
<result property="organizationName" column="organization_name" />
</resultMap>
<sql id="selectVerificationVo">
SELECT
verification_id,
verification_status,
business_document_detali_id,
business_document_detali_number,
business_document_id,
business_document_number,
business_type,
inner_number,
enter_account_time,
expense_item,
first_subject,
first_subject_name,
second_subject,
second_subject_name,
verification_money,
pay_id,
pay_person,
pay_channel,
pay_channel_name,
bank_number,
receipt_number,
pay_remark,
account_holder_name,
account_holder_bank,
bank_account,
images,
audit_remark,
create_time,
create_by,
create_by_name,
update_time,
update_by,
update_by_name,
del_flag,
pay_way,
pay_way_name,
organization_id,
top_organization_id,
receivable_type,
department_id,
department_name,
payee,
pay_type,
license_number,
pay_id,
pay_name,
bill_remarks,
payment_method,
fuel_card_number
v.verification_id,
v.verification_status,
v.business_document_detali_id,
v.business_document_detali_number,
v.business_document_id,
v.business_document_number,
v.business_type,
v.inner_number,
v.enter_account_time,
v.expense_item,
v.first_subject,
v.first_subject_name,
v.second_subject,
v.second_subject_name,
v.verification_money,
v.pay_id,
v.pay_person,
v.pay_channel,
v.pay_channel_name,
v.bank_number,
v.receipt_number,
v.pay_remark,
v.account_holder_name,
v.account_holder_bank,
v.bank_account,
v.images,
v.audit_remark,
v.create_time,
v.create_by,
v.create_by_name,
v.update_time,
v.update_by,
v.update_by_name,
v.del_flag,
v.pay_way,
v.pay_way_name,
v.organization_id,
v.top_organization_id,
v.receivable_type,
v.department_id,
v.department_name,
v.payee,
v.pay_type,
v.license_number,
v.pay_name,
v.bill_remarks,
v.payment_method,
v.fuel_card_number,
v.organization_name
FROM
verification
verification v
</sql>
<select id="selectVerificationOneList" parameterType="com.mhd.common.core.domain.po.VerificationPo" resultMap="VerificationResult">
@@ -343,9 +344,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectVerificationList" parameterType="com.mhd.common.core.domain.po.VerificationPo" resultMap="VerificationResult">
<include refid="selectVerificationVo"/>
<where>
and del_flag = 1
and v.del_flag = 1
<!-- 组织查询条件：南光组织查所有，其他组织查自己 -->
<if test="organizationId != null">
<choose>
<!-- 南光组织判断：如果topOrganizationId为null，则为顶级组织（南光组织），查所有 -->
<when test="topOrganizationId == null">
<!-- 南光组织查所有数据，不添加组织过滤条件 -->
<!-- 如果organizationName为null，根据组织ID查询时不显示organizationName为null的数据 -->
<if test="organizationName == null or organizationName == ''">
AND v.organization_name IS NOT NULL
</if>
</when>
<otherwise>
<!-- 其他组织只查自己组织的数据 -->
AND v.organization_id = #{organizationId}
<!-- organizationName为null时，根据组织ID查询时不显示organizationName为null的数据 -->
<if test="organizationName == null or organizationName == ''">
AND v.organization_name IS NOT NULL
</if>
</otherwise>
</choose>
</if>
<if test="businessDocumentNumberList != null and businessDocumentNumberList.size() != 0">
AND business_document_number in
AND v.business_document_number in
<foreach item="waybill" collection="businessDocumentNumberList" open="(" separator="," close=")">
#{waybill}
</foreach>
@@ -369,55 +391,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- )-->
<!-- </if>-->
<if test="enterAccountTimeStart != null">
AND date_format(create_time,'%Y-%m-%d') >= #{enterAccountTimeStart}
AND date_format(v.create_time,'%Y-%m-%d') >= #{enterAccountTimeStart}
</if>
<if test="enterAccountTimeEnd != null">
AND date_format(create_time,'%Y-%m-%d') <![CDATA[<=]]> #{enterAccountTimeEnd}
AND date_format(v.create_time,'%Y-%m-%d') <![CDATA[<=]]> #{enterAccountTimeEnd}
</if>
<if test="cancelAfterVerificationTimeStart != null and cancelAfterVerificationTimeStart != ''">
AND date_format(cancel_after_verification_time,'%Y-%m-%d') >= #{cancelAfterVerificationTimeStart}
AND date_format(v.cancel_after_verification_time,'%Y-%m-%d') >= #{cancelAfterVerificationTimeStart}
</if>
<if test="cancelAfterVerificationTimeEnd != null and cancelAfterVerificationTimeEnd != ''">
AND date_format(cancel_after_verification_time,'%Y-%m-%d') <![CDATA[<=]]> #{cancelAfterVerificationTimeEnd}
AND date_format(v.cancel_after_verification_time,'%Y-%m-%d') <![CDATA[<=]]> #{cancelAfterVerificationTimeEnd}
</if>
<if test="cancelAfterVerificationType != null"> and cancel_after_verification_type = #{cancelAfterVerificationType}</if>
<if test="mailBranch != null"> and mail_branch = #{mailBranch}</if>
<if test="accountHolderBank != null and accountHolderBank != ''"> and account_holder_bank = #{accountHolderBank}</if>
<if test="accountHolderName != null and accountHolderName != ''"> and account_holder_name = #{accountHolderName}</if>
<if test="bankAccount != null and bankAccount != ''"> and bank_account = #{bankAccount}</if>
<if test="arriveBranch != null"> and arrive_branch = #{arriveBranch}</if>
<if test="verificationType != null "> and verification_type = #{verificationType}</if>
<if test="verificationStatusOne != null and verificationStatusOne != '0'.toString()"> and verification_status = #{verificationStatusOne}</if>
<if test="verificationStatus != null and verificationStatus == '5'.toString()"> and verification_status <![CDATA[<=]]> #{verificationStatus}</if>
<if test="verificationStatus != null and verificationStatus == '6'.toString()"> and verification_status = #{verificationStatus}</if>
<if test="innerNumber != null and innerNumber != ''"> and inner_number like concat('%', #{innerNumber}, '%')</if>
<if test="enterAccountTime != null "> and enter_account_time = #{enterAccountTime}</if>
<if test="firstSubject != null and firstSubject != ''"> and first_subject = #{firstSubject}</if>
<if test="secondSubject != null and secondSubject != ''"> and second_subject = #{secondSubject}</if>
<if test="verificationMoney != null "> and verification_money = #{verificationMoney}</if>
<if test="payPerson != null and payPerson != ''"> and pay_person = #{payPerson}</if>
<if test="payChannel != null and payChannel != ''"> and pay_channel = #{payChannel}</if>
<if test="bankNumber != null and bankNumber != ''"> and bank_number = #{bankNumber}</if>
<if test="receiptNumber != null and receiptNumber != ''"> and receipt_number = #{receiptNumber}</if>
<if test="collectionRemark != null and collectionRemark != ''"> and collection_remark = #{collectionRemark}</if>
<if test="waybillId != null "> and waybill_id = #{waybillId}</if>
<if test="waybillNumber != null and waybillNumber != ''"> and waybill_number like concat('%', #{waybillNumber}, '%')</if>
<if test="waybillRemark != null and waybillRemark != ''"> and waybill_remark = #{waybillRemark}</if>
<if test="waybillSource != null and waybillSource != ''"> and waybill_source = #{waybillSource}</if>
<if test="revenueExpensesNumber != null and revenueExpensesNumber != ''"> and revenue_expenses_number = #{revenueExpensesNumber}</if>
<if test="enterAccountId != null "> and enter_account_id = #{enterAccountId}</if>
<if test="enterAccountName != null and enterAccountName != ''"> and enter_account_name like concat('%', #{enterAccountName}, '%')</if>
<if test="cancelAfterVerificationId != null "> and cancel_after_verification_id = #{cancelAfterVerificationId}</if>
<if test="cancelAfterVerificationName != null and cancelAfterVerificationName != ''"> and cancel_after_verification_name like concat('%', #{cancelAfterVerificationName}, '%')</if>
<if test="cancelAfterVerificationTime != null "> and cancel_after_verification_time = #{cancelAfterVerificationTime}</if>
<if test="createByName != null and createByName != ''"> and create_by_name like concat('%', #{createByName}, '%')</if>
<if test="updateByName != null and updateByName != ''"> and update_by_name like concat('%', #{updateByName}, '%')</if>
<if test="cancelAfterVerificationStatus != null and cancelAfterVerificationStatus == '5'.toString()"> and verification_status in (1,2,3,4,5)</if>
<if test="cancelAfterVerificationStatus != null and cancelAfterVerificationStatus == '6'.toString()"> and verification_status = 6</if>
<if test="inVerificationStatus != null"> and in_verification_status = #{inVerificationStatus}</if>
<if test="uuidCode != null"> and uuid_code = #{uuidCode}</if>
<if test="cancelAfterVerificationType != null"> and v.cancel_after_verification_type = #{cancelAfterVerificationType}</if>
<if test="mailBranch != null"> and v.mail_branch = #{mailBranch}</if>
<if test="accountHolderBank != null and accountHolderBank != ''"> and v.account_holder_bank = #{accountHolderBank}</if>
<if test="accountHolderName != null and accountHolderName != ''"> and v.account_holder_name = #{accountHolderName}</if>
<if test="bankAccount != null and bankAccount != ''"> and v.bank_account = #{bankAccount}</if>
<if test="arriveBranch != null"> and v.arrive_branch = #{arriveBranch}</if>
<if test="verificationType != null "> and v.verification_type = #{verificationType}</if>
<if test="verificationStatusOne != null and verificationStatusOne != '0'.toString()"> and v.verification_status = #{verificationStatusOne}</if>
<if test="verificationStatus != null and verificationStatus == '5'.toString()"> and v.verification_status <![CDATA[<=]]> #{verificationStatus}</if>
<if test="verificationStatus != null and verificationStatus == '6'.toString()"> and v.verification_status = #{verificationStatus}</if>
<if test="innerNumber != null and innerNumber != ''"> and v.inner_number like concat('%', #{innerNumber}, '%')</if>
<if test="enterAccountTime != null "> and v.enter_account_time = #{enterAccountTime}</if>
<if test="firstSubject != null and firstSubject != ''"> and v.first_subject = #{firstSubject}</if>
<if test="secondSubject != null and secondSubject != ''"> and v.second_subject = #{secondSubject}</if>
<if test="verificationMoney != null "> and v.verification_money = #{verificationMoney}</if>
<if test="payPerson != null and payPerson != ''"> and v.pay_person = #{payPerson}</if>
<if test="payChannel != null and payChannel != ''"> and v.pay_channel = #{payChannel}</if>
<if test="bankNumber != null and bankNumber != ''"> and v.bank_number = #{bankNumber}</if>
<if test="receiptNumber != null and receiptNumber != ''"> and v.receipt_number = #{receiptNumber}</if>
<if test="collectionRemark != null and collectionRemark != ''"> and v.collection_remark = #{collectionRemark}</if>
<if test="waybillId != null "> and v.waybill_id = #{waybillId}</if>
<if test="waybillNumber != null and waybillNumber != ''"> and v.waybill_number like concat('%', #{waybillNumber}, '%')</if>
<if test="waybillRemark != null and waybillRemark != ''"> and v.waybill_remark = #{waybillRemark}</if>
<if test="waybillSource != null and waybillSource != ''"> and v.waybill_source = #{waybillSource}</if>
<if test="revenueExpensesNumber != null and revenueExpensesNumber != ''"> and v.revenue_expenses_number = #{revenueExpensesNumber}</if>
<if test="enterAccountId != null "> and v.enter_account_id = #{enterAccountId}</if>
<if test="enterAccountName != null and enterAccountName != ''"> and v.enter_account_name like concat('%', #{enterAccountName}, '%')</if>
<if test="cancelAfterVerificationId != null "> and v.cancel_after_verification_id = #{cancelAfterVerificationId}</if>
<if test="cancelAfterVerificationName != null and cancelAfterVerificationName != ''"> and v.cancel_after_verification_name like concat('%', #{cancelAfterVerificationName}, '%')</if>
<if test="cancelAfterVerificationTime != null "> and v.cancel_after_verification_time = #{cancelAfterVerificationTime}</if>
<if test="createByName != null and createByName != ''"> and v.create_by_name like concat('%', #{createByName}, '%')</if>
<if test="updateByName != null and updateByName != ''"> and v.update_by_name like concat('%', #{updateByName}, '%')</if>
<if test="cancelAfterVerificationStatus != null and cancelAfterVerificationStatus == '5'.toString()"> and v.verification_status in (1,2,3,4,5)</if>
<if test="cancelAfterVerificationStatus != null and cancelAfterVerificationStatus == '6'.toString()"> and v.verification_status = 6</if>
<if test="inVerificationStatus != null"> and v.in_verification_status = #{inVerificationStatus}</if>
<if test="uuidCode != null"> and v.uuid_code = #{uuidCode}</if>
</where>
order by create_time desc
order by v.create_time desc
</select>
<select id="selectVerificationByVerificationId" parameterType="java.lang.Long" resultMap="VerificationResult">
@@ -989,12 +1011,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY
a.create_time DESC, a.verification_id DESC
</select>
<select id="selectOutVerificationList" resultType="com.mhd.common.core.domain.po.VerificationPo">
<select id="selectOutVerificationList" parameterType="com.mhd.common.core.domain.po.VerificationPo" resultMap="VerificationResult">
<include refid="selectVerificationVo"/>
<where>
and del_flag = 1
and v.del_flag = 1
<!-- 组织查询条件：南光组织查所有，其他组织查自己 -->
<if test="organizationId != null">
<choose>
<!-- 南光组织判断：如果topOrganizationId为null，则为顶级组织（南光组织），查所有 -->
<when test="topOrganizationId == null">
<!-- 南光组织查所有数据，不添加组织过滤条件 -->
<!-- 如果organizationName为null，根据组织ID查询时不显示organizationName为null的数据 -->
<if test="organizationName == null or organizationName == ''">
AND v.organization_name IS NOT NULL
</if>
</when>
<otherwise>
<!-- 其他组织只查自己组织的数据 -->
AND v.organization_id = #{organizationId}
<!-- organizationName为null时，根据组织ID查询时不显示organizationName为null的数据 -->
<if test="organizationName == null or organizationName == ''">
AND v.organization_name IS NOT NULL
</if>
</otherwise>
</choose>
</if>
<if test="businessDocumentNumberList != null and businessDocumentNumberList.size() != 0">
AND business_document_number in
AND v.business_document_number in
<foreach item="waybill" collection="businessDocumentNumberList" open="(" separator="," close=")">
#{waybill}
</foreach>
@@ -1018,50 +1061,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- )-->
<!-- </if>-->
<if test="enterAccountTimeStart != null">
AND date_format(create_time,'%Y-%m-%d') >= #{enterAccountTimeStart}
AND date_format(v.create_time,'%Y-%m-%d') >= #{enterAccountTimeStart}
</if>
<if test="enterAccountTimeEnd != null">
AND date_format(create_time,'%Y-%m-%d') <![CDATA[<=]]> #{enterAccountTimeEnd}
AND date_format(v.create_time,'%Y-%m-%d') <![CDATA[<=]]> #{enterAccountTimeEnd}
</if>
<if test="paymentMethod != null ">
and payment_method = #{paymentMethod}
and v.payment_method = #{paymentMethod}
</if>
<if test="cancelAfterVerificationTimeStart != null and cancelAfterVerificationTimeStart != ''">
AND date_format(cancel_after_verification_time,'%Y-%m-%d') >= #{cancelAfterVerificationTimeStart}
AND date_format(v.cancel_after_verification_time,'%Y-%m-%d') >= #{cancelAfterVerificationTimeStart}
</if>
<if test="cancelAfterVerificationTimeEnd != null and cancelAfterVerificationTimeEnd != ''">
AND date_format(cancel_after_verification_time,'%Y-%m-%d') <![CDATA[<=]]> #{cancelAfterVerificationTimeEnd}
AND date_format(v.cancel_after_verification_time,'%Y-%m-%d') <![CDATA[<=]]> #{cancelAfterVerificationTimeEnd}
</if>
<!-- <if test="cancelAfterVerificationType != null"> and cancel_after_verification_type = #{cancelAfterVerificationType}</if>-->
<!-- <if test="mailBranch != null"> and mail_branch = #{mailBranch}</if>-->
<if test="accountHolderBank != null and accountHolderBank != ''"> and account_holder_bank = #{accountHolderBank}</if>
<if test="businessDocumentDetaliNumber != null and businessDocumentDetaliNumber != ''"> and business_document_detali_number like concat('%', #{businessDocumentDetaliNumber}, '%')</if>
<if test="accountHolderName != null and accountHolderName != ''"> and account_holder_name = #{accountHolderName}</if>
<if test="bankAccount != null and bankAccount != ''"> and bank_account = #{bankAccount}</if>
<if test="accountHolderBank != null and accountHolderBank != ''"> and v.account_holder_bank = #{accountHolderBank}</if>
<if test="businessDocumentDetaliNumber != null and businessDocumentDetaliNumber != ''"> and v.business_document_detali_number like concat('%', #{businessDocumentDetaliNumber}, '%')</if>
<if test="accountHolderName != null and accountHolderName != ''"> and v.account_holder_name = #{accountHolderName}</if>
<if test="bankAccount != null and bankAccount != ''"> and v.bank_account = #{bankAccount}</if>
<!-- <if test="arriveBranch != null"> and arrive_branch = #{arriveBranch}</if>-->
<!-- <if test="verificationType != null "> and verification_type = #{verificationType}</if>-->
<!-- <if test="verificationStatusOne != null and verificationStatusOne != '0'.toString()"> and verification_status = #{verificationStatusOne}</if>-->
<!-- <if test="verificationStatus != null and verificationStatus == '5'.toString()"> and verification_status <![CDATA[<=]]> #{verificationStatus}</if>-->
<if test="verificationStatus != null "> and verification_status = #{verificationStatus}</if>
<if test="businessType != null "> and business_type = #{businessType}</if>
<if test="innerNumber != null and innerNumber != ''"> and inner_number like concat('%', #{innerNumber}, '%')</if>
<if test="businessDocumentNumber != null and businessDocumentNumber != ''"> and business_document_number = #{businessDocumentNumber} </if>
<if test="expenseItem != null and expenseItem != ''"> and expense_item = #{expenseItem} </if>
<if test="enterAccountTime != null "> and enter_account_time = #{enterAccountTime}</if>
<if test="firstSubject != null and firstSubject != ''"> and first_subject = #{firstSubject}</if>
<if test="secondSubject != null and secondSubject != ''"> and second_subject = #{secondSubject}</if>
<if test="payType != null and payType != ''"> and pay_type = #{payType}</if>
<if test="payee != null and payee != ''"> and payee like concat('%', #{payee}, '%')</if>
<if test="payName != null and payName != ''"> and pay_name like concat('%', #{payName}, '%')</if>
<if test="licenseNumber != null and licenseNumber != ''"> and license_number like concat('%', #{licenseNumber}, '%')</if>
<if test="departmentName != null and departmentName != ''"> and department_name like concat('%', #{departmentName}, '%')</if>
<if test="verificationMoney != null "> and verification_money = #{verificationMoney}</if>
<if test="payPerson != null and payPerson != ''"> and pay_person = #{payPerson}</if>
<if test="payChannel != null and payChannel != ''"> and pay_channel = #{payChannel}</if>
<if test="bankNumber != null and bankNumber != ''"> and bank_number = #{bankNumber}</if>
<if test="receiptNumber != null and receiptNumber != ''"> and receipt_number = #{receiptNumber}</if>
<if test="verificationStatus != null "> and v.verification_status = #{verificationStatus}</if>
<if test="businessType != null "> and v.business_type = #{businessType}</if>
<if test="innerNumber != null and innerNumber != ''"> and v.inner_number like concat('%', #{innerNumber}, '%')</if>
<if test="businessDocumentNumber != null and businessDocumentNumber != ''"> and v.business_document_number = #{businessDocumentNumber} </if>
<if test="expenseItem != null and expenseItem != ''"> and v.expense_item = #{expenseItem} </if>
<if test="enterAccountTime != null "> and v.enter_account_time = #{enterAccountTime}</if>
<if test="firstSubject != null and firstSubject != ''"> and v.first_subject = #{firstSubject}</if>
<if test="secondSubject != null and secondSubject != ''"> and v.second_subject = #{secondSubject}</if>
<if test="payType != null and payType != ''"> and v.pay_type = #{payType}</if>
<if test="payee != null and payee != ''"> and v.payee like concat('%', #{payee}, '%')</if>
<if test="payName != null and payName != ''"> and v.pay_name like concat('%', #{payName}, '%')</if>
<if test="licenseNumber != null and licenseNumber != ''"> and v.license_number like concat('%', #{licenseNumber}, '%')</if>
<if test="departmentName != null and departmentName != ''"> and v.department_name like concat('%', #{departmentName}, '%')</if>
<if test="verificationMoney != null "> and v.verification_money = #{verificationMoney}</if>
<if test="payPerson != null and payPerson != ''"> and v.pay_person = #{payPerson}</if>
<if test="payChannel != null and payChannel != ''"> and v.pay_channel = #{payChannel}</if>
<if test="bankNumber != null and bankNumber != ''"> and v.bank_number = #{bankNumber}</if>
<if test="receiptNumber != null and receiptNumber != ''"> and v.receipt_number = #{receiptNumber}</if>
<!-- <if test="collectionRemark != null and collectionRemark != ''"> and collection_remark = #{collectionRemark}</if>-->
<!-- <if test="waybillId != null "> and waybill_id = #{waybillId}</if>-->
<!-- <if test="waybillNumber != null and waybillNumber != ''"> and waybill_number like concat('%', #{waybillNumber}, '%')</if>-->
@@ -1073,12 +1116,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- <if test="cancelAfterVerificationId != null "> and cancel_after_verification_id = #{cancelAfterVerificationId}</if>-->
<!-- <if test="cancelAfterVerificationName != null and cancelAfterVerificationName != ''"> and cancel_after_verification_name like concat('%', #{cancelAfterVerificationName}, '%')</if>-->
<!-- <if test="cancelAfterVerificationTime != null "> and cancel_after_verification_time = #{cancelAfterVerificationTime}</if>-->
<if test="createByName != null and createByName != ''"> and create_by_name like concat('%', #{createByName}, '%')</if>
<if test="updateByName != null and updateByName != ''"> and update_by_name like concat('%', #{updateByName}, '%')</if>
<if test="createByName != null and createByName != ''"> and v.create_by_name like concat('%', #{createByName}, '%')</if>
<if test="updateByName != null and updateByName != ''"> and v.update_by_name like concat('%', #{updateByName}, '%')</if>
<!-- <if test="cancelAfterVerificationStatus != null and cancelAfterVerificationStatus == '5'.toString()"> and verification_status in (1,2,3,4,5)</if>-->
<!-- <if test="cancelAfterVerificationStatus != null and cancelAfterVerificationStatus == '6'.toString()"> and verification_status = 6</if>-->
</where>
order by create_time desc
order by v.create_time desc
</select>