fix 87668 工作组项目-没有锁定时-成员列表的单位和联系人需要随之改动吗
This commit is contained in:
+1
-2
@@ -35,8 +35,7 @@
|
||||
pdgs.create_time AS createTime,
|
||||
pdgs.update_by AS updateBy
|
||||
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 pcmt.company_id = pcm.id
|
||||
left join pay_company_management pcm on pdgs.charge_company_id = pcm.id
|
||||
<where>
|
||||
pdgs.drafting_group_id = #{payDraftingGroupSubItem.draftingGroupId} AND (pdgs.check_result = 1 OR pdgs.check_result = 2)
|
||||
<if test="payDraftingGroupSubItem.chargeCompanyTemporaryName != null and payDraftingGroupSubItem.chargeCompanyTemporaryName != ''">
|
||||
|
||||
+1
-4
@@ -8,8 +8,6 @@
|
||||
pwgs.working_group_id AS workingGroupId,
|
||||
pwgs.charge_company_id AS chargeCompanyId,
|
||||
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(
|
||||
pwgs.charge_company_temporary_name =
|
||||
IF(
|
||||
@@ -62,8 +60,7 @@
|
||||
pwgs.confirm_voucher
|
||||
FROM pay_working_group_subitem pwgs
|
||||
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 pcmt.company_id = pcm.id
|
||||
left join pay_company_management pcm on pwgs.charge_company_id = pcm.id
|
||||
<where>
|
||||
pwgs.working_group_id = #{payWorkingGroupSubItem.workingGroupId}
|
||||
<if test="payWorkingGroupSubItem.chargeCompanyTemporaryName != null and payWorkingGroupSubItem.chargeCompanyTemporaryName != ''">
|
||||
|
||||
Reference in New Issue
Block a user