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

修改bug#46769

Browse Source
This commit is contained in:
liangqitao
2022-01-04 11:59:19 +08:00
parent 8563fcf504
commit 65bb28a602
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+5 -3
View File
@@ -43,9 +43,10 @@
where contract_id = pic.id AND accounts_receivable_time is not null AND accounts_receivable_time < DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND accounts_receivable_amount != 0 AND accounts_receivable_amount > if(paid_amount is null or paid_amount = '',0,paid_amount)
) AS chargeStatus,
GROUP_CONCAT(project.projectName ORDER BY project.id DESC) AS associatedProject
if(pic.status = 6,GROUP_CONCAT(picac.charge_project ORDER BY picac.id DESC),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_income_contract_associated_cancellation picac ON picac.contract_id = pic.id
LEFT JOIN
(
SELECT id,charge_project AS projectName FROM pay_common_project
@@ -204,10 +205,11 @@
select
pic.*,
pmc.post_status as postStatus,
GROUP_CONCAT(project.projectName ORDER BY project.id DESC) AS associatedProject
if(pic.status = 6,GROUP_CONCAT(picac.charge_project ORDER BY picac.id DESC),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_income_contract_associated_cancellation picac ON picac.contract_id = pic.id
LEFT JOIN
(
SELECT id,charge_project AS projectName FROM pay_common_project
@@ -329,4 +331,4 @@
</where>
ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc
</select>
</mapper>
</mapper>