企业端-合同修改
This commit is contained in:
+26
-1
@@ -201,8 +201,33 @@
|
|||||||
ORDER BY createTime DESC,projectId DESC
|
ORDER BY createTime DESC,projectId DESC
|
||||||
</select>
|
</select>
|
||||||
<select id="queryCompanyPageList" resultType="com.jero.contract.entity.PayIncomeContract">
|
<select id="queryCompanyPageList" resultType="com.jero.contract.entity.PayIncomeContract">
|
||||||
select pic.*,pmc.post_status as postStatus from pay_income_contract pic
|
select
|
||||||
|
pic.*,
|
||||||
|
pmc.post_status as postStatus,
|
||||||
|
GROUP_CONCAT(project.projectName ORDER BY project.id DESC) AS associatedProject
|
||||||
|
from pay_income_contract pic
|
||||||
|
LEFT JOIN pay_income_contract_associated pica ON pica.contract_id = pic.id
|
||||||
left join pay_mail_contract pmc ON pic.id = pmc.contract_id
|
left join pay_mail_contract pmc ON pic.id = pmc.contract_id
|
||||||
|
LEFT JOIN
|
||||||
|
(
|
||||||
|
SELECT id,charge_project AS projectName FROM pay_common_project
|
||||||
|
UNION ALL
|
||||||
|
SELECT pwgs.id,pwg.working_group_project AS projectName FROM pay_working_group_subitem pwgs
|
||||||
|
LEFT JOIN pay_working_group pwg ON pwg.id = pwgs.working_group_id
|
||||||
|
WHERE pwg.working_group_project IS NOT NULL AND pwg.working_group_project != ''
|
||||||
|
UNION ALL
|
||||||
|
SELECT sit.id,meeting.meeting_name AS projectName FROM pay_meeting meeting
|
||||||
|
INNER JOIN pay_meeting_situation sit ON meeting.id = sit.meeting_id
|
||||||
|
WHERE meeting.meeting_name IS NOT NULL AND meeting.meeting_name != ''
|
||||||
|
UNION ALL
|
||||||
|
SELECT msub.id,pmp.project_name AS projectName FROM pay_member_project pmp
|
||||||
|
INNER JOIN pay_member_project_subitem msub ON pmp.id = msub.project_id
|
||||||
|
WHERE pmp.project_name IS NOT NULL AND pmp.project_name != ''
|
||||||
|
UNION ALL
|
||||||
|
SELECT tmsub.id,tmember.project_name AS projectName FROM tb_member_project tmember
|
||||||
|
INNER JOIN tb_member_project_subitem tmsub ON tmember.id=tmsub.project_id
|
||||||
|
where tmember.project_name IS NOT NULL AND tmember.project_name != ''
|
||||||
|
) project ON project.id = pica.project_id
|
||||||
<where> signed_contacts_id = #{payIncomeContract.signedContactsId}
|
<where> signed_contacts_id = #{payIncomeContract.signedContactsId}
|
||||||
<if test="payIncomeContract.contractName != null and payIncomeContract.contractName != ''">
|
<if test="payIncomeContract.contractName != null and payIncomeContract.contractName != ''">
|
||||||
AND (pic.contract_name LIKE concat('%',concat(#{payIncomeContract.contractName},'%'))
|
AND (pic.contract_name LIKE concat('%',concat(#{payIncomeContract.contractName},'%'))
|
||||||
|
|||||||
Reference in New Issue
Block a user