LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 87668 工作组项目-没有锁定时-成员列表的单位和联系人需要随之改动吗

Browse Source
This commit is contained in:
lijiarao
2024-07-29 14:28:23 +08:00
parent 5bdd887843
commit d627e02dda
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml
+1 -2
View File
@@ -35,8 +35,7 @@
pdgs.create_time AS createTime, pdgs.create_time AS createTime,
pdgs.update_by AS updateBy pdgs.update_by AS updateBy
FROM pay_drafting_group_subitem pdgs FROM pay_drafting_group_subitem pdgs
left join pay_company_management_temporary pcmt on pdgs.charge_company_temporary_id = pcmt.id left join pay_company_management pcm on pdgs.charge_company_id = pcm.id
left join pay_company_management pcm on pcmt.company_id = pcm.id
<where> <where>
pdgs.drafting_group_id = #{payDraftingGroupSubItem.draftingGroupId} AND (pdgs.check_result = 1 OR pdgs.check_result = 2) pdgs.drafting_group_id = #{payDraftingGroupSubItem.draftingGroupId} AND (pdgs.check_result = 1 OR pdgs.check_result = 2)
<if test="payDraftingGroupSubItem.chargeCompanyTemporaryName != null and payDraftingGroupSubItem.chargeCompanyTemporaryName != ''"> <if test="payDraftingGroupSubItem.chargeCompanyTemporaryName != null and payDraftingGroupSubItem.chargeCompanyTemporaryName != ''">
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+1 -4
View File
@@ -8,8 +8,6 @@
pwgs.working_group_id AS workingGroupId, pwgs.working_group_id AS workingGroupId,
pwgs.charge_company_id AS chargeCompanyId, pwgs.charge_company_id AS chargeCompanyId,
pwgs.charge_company_temporary_id AS chargeCompanyTemporaryId, pwgs.charge_company_temporary_id AS chargeCompanyTemporaryId,
<!-- pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName,-->
# if(pwgs.charge_company_temporary_name = pcm.company_name, pwgs.charge_company_temporary_name, concat(pwgs.charge_company_temporary_name,'（更名为',pcm.company_name,'）')) as chargeCompanyTemporaryName,
ifnull( IF( ifnull( IF(
pwgs.charge_company_temporary_name = pwgs.charge_company_temporary_name =
IF( IF(
@@ -62,8 +60,7 @@
pwgs.confirm_voucher pwgs.confirm_voucher
FROM pay_working_group_subitem pwgs FROM pay_working_group_subitem pwgs
LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id
left join pay_company_management_temporary pcmt on pwgs.charge_company_temporary_id = pcmt.id left join pay_company_management pcm on pwgs.charge_company_id = pcm.id
left join pay_company_management pcm on pcmt.company_id = pcm.id
<where> <where>
pwgs.working_group_id = #{payWorkingGroupSubItem.workingGroupId} pwgs.working_group_id = #{payWorkingGroupSubItem.workingGroupId}
<if test="payWorkingGroupSubItem.chargeCompanyTemporaryName != null and payWorkingGroupSubItem.chargeCompanyTemporaryName != ''"> <if test="payWorkingGroupSubItem.chargeCompanyTemporaryName != null and payWorkingGroupSubItem.chargeCompanyTemporaryName != ''">