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

PDA任务修改 B2字段添加

Browse Source
This commit is contained in:
秦鸿展
2026-06-04 16:59:16 +08:00
parent 299a9fb91e
commit 1c72ce2ba5
11 changed files with 255 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_bms/src/main/resources/mapper/BillingStatementMapper.xml
+15 -3
View File
@@ -116,9 +116,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="billingStatementDO.billingFlow != null and billingStatementDO.billingFlow != ''">
AND billing_flow like concat('%', #{billingStatementDO.billingFlow}, '%')
</if>
<if test="billingStatementDO.businessFlow != null and billingStatementDO.businessFlow != ''">
AND business_flow like concat('%', #{billingStatementDO.businessFlow}, '%')
</if>
<if test="billingStatementDO.settlementEntity != null and billingStatementDO.settlementEntity != ''">
AND settlement_entity like concat('%', #{billingStatementDO.settlementEntity}, '%')
</if>
<if test="billingStatementDO.settlementCustomersCode != null and billingStatementDO.settlementCustomersCode != ''">
AND settlement_customers_code like concat('%', #{billingStatementDO.settlementCustomersCode}, '%')
</if>
<if test="billingStatementDO.firstSubjectName != null and billingStatementDO.firstSubjectName != ''">
AND first_subject_name like concat('%', #{billingStatementDO.firstSubjectName}, '%')
</if>
<if test="billingStatementDO.secondSubjectName != null and billingStatementDO.secondSubjectName != ''">
AND( first_subject_name like concat('%', #{billingStatementDO.secondSubjectName}, '%')
OR second_subject_name like concat('%', #{billingStatementDO.secondSubjectName}, '%') )
@@ -129,9 +138,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="billingStatementDO.accountExpenseType != null">
AND account_expense_type = #{billingStatementDO.accountExpenseType}
</if>
<if test="billingStatementDO.settlementCustomersCode != null">
AND settlement_customers_code = #{billingStatementDO.settlementCustomersCode}
</if>
<if test="billingStatementDO.belongModuleCode != null">
AND belong_module_code = #{billingStatementDO.belongModuleCode}
</if>
@@ -151,6 +157,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="billingStatementDO.documentType != null and billingStatementDO.documentType != ''">
AND document_type like concat('%', #{billingStatementDO.documentType}, '%')
</if>
<if test="billingStatementDO.documentTypeCode != null and billingStatementDO.documentTypeCode != ''">
AND document_type_code = #{billingStatementDO.documentTypeCode}
</if>
<if test="billingStatementDO.serviceItemsCode != null and billingStatementDO.serviceItemsCode != ''">
AND service_items_code = #{billingStatementDO.serviceItemsCode}
</if>
<if test="billingStatementDO.originalBusinessNum != null and billingStatementDO.originalBusinessNum != ''">
AND original_business_num like concat('%', #{billingStatementDO.originalBusinessNum}, '%')
</if>
mhd_bms/src/main/resources/mapper/BusinessDocumentMapper.xml
+12
View File
@@ -181,6 +181,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="businessDocumentDO.settlementEntity != null and businessDocumentDO.settlementEntity != ''">
AND settlement_entity like concat('%', #{businessDocumentDO.settlementEntity}, '%')
</if>
<if test="businessDocumentDO.settlementCustomersCode != null and businessDocumentDO.settlementCustomersCode != ''">
AND settlement_customers_code like concat('%', #{businessDocumentDO.settlementCustomersCode}, '%')
</if>
<if test="businessDocumentDO.serviceItemsName != null and businessDocumentDO.serviceItemsName != ''">
AND service_items_name like concat('%', #{businessDocumentDO.serviceItemsName}, '%')
</if>
<if test="businessDocumentDO.serviceItemsCode != null and businessDocumentDO.serviceItemsCode != ''">
AND service_items_code = #{businessDocumentDO.serviceItemsCode}
</if>
<if test="businessDocumentDO.documentTypeCode != null and businessDocumentDO.documentTypeCode != ''">
AND document_type_code = #{businessDocumentDO.documentTypeCode}
</if>
<if test="businessDocumentDO.businessDocumentIdSet != null">
and business_document_id in
<foreach item="id" collection="businessDocumentDO.businessDocumentIdSet" open="(" separator="," close=")">
mhd_bms/src/main/resources/mapper/SettlementCustomersMapper.xml
+99 -62
View File
@@ -32,71 +32,85 @@
<result property="updateByName" column="update_by_name" />
<result property="delFlag" column="del_flag" />
<result property="settlementCurrency" column="settlement_currency" />
<result property="businessDocumentId" column="business_document_id" />
<result property="businessFlow" column="business_flow" />
<result property="originalBusinessNum" column="original_business_num" />
<result property="serviceItemsName" column="service_items_name" />
<result property="firstSubjectName" column="first_subject_name" />
<result property="secondSubjectName" column="second_subject_name" />
<result property="businessState" column="business_state" />
<result property="documentType" column="document_type" />
<result property="documentTypeCode" column="document_type_code" />
<result property="businessCreateTime" column="business_create_time" />
</resultMap>
<sql id="selectSettlementCustomersPo">
select * from settlement_customers
</sql>
<sql id="selectSettlementCustomersPo1">
<where>
<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="topOrganizationId != null ">
and top_organization_id = #{topOrganizationId}
</if>
<if test="organizationId != null ">
and organization_id = #{organizationId}
</if>
<if test="organizationName != null and organizationName != ''">
and organization_name like concat('%', #{organizationName}, '%')
</if>
<if test="settlementCustomersCode != null and settlementCustomersCode != ''">
and settlement_customers_code = #{settlementCustomersCode}
</if>
<if test="settlementEntityId != null ">
and settlement_entity_id = #{settlementEntityId}
</if>
<if test="settlementEntity != null and settlementEntity != ''">
and settlement_entity = #{settlementEntity}
</if>
<if test="settlementMethod != null and settlementMethod != ''">
and settlement_method = #{settlementMethod}
</if>
<if test="settlementMethodCode != null and settlementMethodCode != ''">
and settlement_method_code = #{settlementMethodCode}
</if>
<if test="settlementDirection != null and settlementDirection != ''">
and settlement_direction = #{settlementDirection}
</if>
<if test="settlementDirectionCode != null and settlementDirectionCode != ''">
and settlement_direction_code = #{settlementDirectionCode}
</if>
<if test="bankName != null and bankName != ''">
and bank_name like concat('%', #{bankName}, '%')
</if>
<if test="bankCardNumber != null and bankCardNumber != ''">
and bank_card_number = #{bankCardNumber}
</if>
<if test="bankBindingName != null and bankBindingName != ''">
and bank_binding_name like concat('%', #{bankBindingName}, '%')
</if>
</where>
<sql id="business_document_where">
<if test="settlementCustomersDO.businessFlow != null and settlementCustomersDO.businessFlow != ''">
and bd.business_flow like concat('%', #{settlementCustomersDO.businessFlow}, '%')
</if>
<if test="settlementCustomersDO.originalBusinessNum != null and settlementCustomersDO.originalBusinessNum != ''">
and bd.original_business_num like concat('%', #{settlementCustomersDO.originalBusinessNum}, '%')
</if>
<if test="settlementCustomersDO.serviceItemsName != null and settlementCustomersDO.serviceItemsName != ''">
and bd.service_items_name like concat('%', #{settlementCustomersDO.serviceItemsName}, '%')
</if>
<if test="settlementCustomersDO.firstSubjectName != null and settlementCustomersDO.firstSubjectName != ''">
and bd.first_subject_name like concat('%', #{settlementCustomersDO.firstSubjectName}, '%')
</if>
<if test="settlementCustomersDO.secondSubjectName != null and settlementCustomersDO.secondSubjectName != ''">
and bd.second_subject_name like concat('%', #{settlementCustomersDO.secondSubjectName}, '%')
</if>
<if test="settlementCustomersDO.businessState != null">
and bd.business_state = #{settlementCustomersDO.businessState}
</if>
<if test="settlementCustomersDO.documentType != null and settlementCustomersDO.documentType != ''">
and bd.document_type like concat('%', #{settlementCustomersDO.documentType}, '%')
</if>
<if test="settlementCustomersDO.documentTypeCode != null and settlementCustomersDO.documentTypeCode != ''">
and bd.document_type_code = #{settlementCustomersDO.documentTypeCode}
</if>
</sql>
<select id="queryList" parameterType="com.mhd.bms.domain.settlementCustomers.repository.todo.SettlementCustomersDO"
resultMap="SettlementCustomersResult">
select
a.*,b.SETTLEMENT_CURRENCY
from settlement_customers a left join "NGWL_TEST_USER"."USER_SHIPPER" b on a.settlement_entity_id = b.user_id
a.*,
b.SETTLEMENT_CURRENCY as settlement_currency,
bd.business_document_id,
bd.business_flow,
bd.original_business_num,
bd.service_items_name,
bd.first_subject_name,
bd.second_subject_name,
bd.business_state,
bd.document_type,
bd.document_type_code,
bd.create_time as business_create_time
from settlement_customers a
left join "NGWL_TEST_USER"."USER_SHIPPER" b on a.settlement_entity_id = b.user_id
<choose>
<when test="(settlementCustomersDO.businessFlow != null and settlementCustomersDO.businessFlow != '')
or (settlementCustomersDO.originalBusinessNum != null and settlementCustomersDO.originalBusinessNum != '')
or (settlementCustomersDO.serviceItemsName != null and settlementCustomersDO.serviceItemsName != '')
or (settlementCustomersDO.firstSubjectName != null and settlementCustomersDO.firstSubjectName != '')
or (settlementCustomersDO.secondSubjectName != null and settlementCustomersDO.secondSubjectName != '')
or settlementCustomersDO.businessState != null
or (settlementCustomersDO.documentType != null and settlementCustomersDO.documentType != '')
or (settlementCustomersDO.documentTypeCode != null and settlementCustomersDO.documentTypeCode != '')">
inner join business_document bd on bd.settlement_customers_code = a.settlement_customers_code and bd.del_flag = 1
</when>
<otherwise>
left join business_document bd on bd.business_document_id = (
select max(business_document_id) from business_document
where settlement_customers_code = a.settlement_customers_code and del_flag = 1
)
</otherwise>
</choose>
where a.del_flag = 1
<include refid="common_where"/>
ORDER BY create_time IS NULL, create_time DESC
ORDER BY a.create_time IS NULL, a.create_time DESC, bd.create_time DESC
</select>
<select id="querySettlementObjects"
resultType="com.mhd.bms.domain.settlementCustomers.repository.po.SettlementCustomersPO">
select
@@ -115,15 +129,38 @@
<if test="settlementCustomersDO.settlementMethod != null and settlementCustomersDO.settlementMethod != ''">
and a.settlement_method like concat('%', #{settlementCustomersDO.settlementMethod}, '%')
</if>
<if test="settlementCustomersDO.settlementMethodCode != null and settlementCustomersDO.settlementMethodCode != ''">
and a.settlement_method_code = #{settlementCustomersDO.settlementMethodCode}
</if>
<if test="settlementCustomersDO.remark != null and settlementCustomersDO.remark != ''">
and a.remark like concat('%', #{settlementCustomersDO.remark}, '%')
</if>
<if test="settlementCustomersDO.createTimeStart != null and settlementCustomersDO.createTimeStart != ''">
AND date_format(a.create_time,'%Y-%m-%d') <![CDATA[>=]]> #{settlementCustomersDO.createTimeStart}
</if>
<if test="settlementCustomersDO.createTimeEnd != null and settlementCustomersDO.createTimeEnd != ''">
AND date_format(a.create_time,'%Y-%m-%d') <![CDATA[<=]]> #{settlementCustomersDO.createTimeEnd}
</if>
<choose>
<when test="(settlementCustomersDO.businessFlow != null and settlementCustomersDO.businessFlow != '')
or (settlementCustomersDO.originalBusinessNum != null and settlementCustomersDO.originalBusinessNum != '')
or (settlementCustomersDO.serviceItemsName != null and settlementCustomersDO.serviceItemsName != '')
or (settlementCustomersDO.firstSubjectName != null and settlementCustomersDO.firstSubjectName != '')
or (settlementCustomersDO.secondSubjectName != null and settlementCustomersDO.secondSubjectName != '')
or settlementCustomersDO.businessState != null
or (settlementCustomersDO.documentType != null and settlementCustomersDO.documentType != '')
or (settlementCustomersDO.documentTypeCode != null and settlementCustomersDO.documentTypeCode != '')">
<include refid="business_document_where"/>
<if test="settlementCustomersDO.createTimeStart != null and settlementCustomersDO.createTimeStart != ''">
and date_format(bd.create_time,'%Y-%m-%d') <![CDATA[>=]]> #{settlementCustomersDO.createTimeStart}
</if>
<if test="settlementCustomersDO.createTimeEnd != null and settlementCustomersDO.createTimeEnd != ''">
and date_format(bd.create_time,'%Y-%m-%d') <![CDATA[<=]]> #{settlementCustomersDO.createTimeEnd}
</if>
</when>
<otherwise>
<if test="settlementCustomersDO.createTimeStart != null and settlementCustomersDO.createTimeStart != ''">
AND date_format(a.create_time,'%Y-%m-%d') <![CDATA[>=]]> #{settlementCustomersDO.createTimeStart}
</if>
<if test="settlementCustomersDO.createTimeEnd != null and settlementCustomersDO.createTimeEnd != ''">
AND date_format(a.create_time,'%Y-%m-%d') <![CDATA[<=]]> #{settlementCustomersDO.createTimeEnd}
</if>
</otherwise>
</choose>
<if test="settlementCustomersDO.createByName != null and settlementCustomersDO.createByName != ''">
and a.create_by_name like concat('%', #{settlementCustomersDO.createByName}, '%')
</if>
@@ -143,4 +180,4 @@
and a.customer_type_code = #{settlementCustomersDO.customerTypeCode}
</if>
</sql>
</mapper>
</mapper>