修改bug#40940
This commit is contained in:
+52
-52
@@ -5,35 +5,35 @@
|
|||||||
<select id="queryPageList" resultType="com.jero.contract.entity.PaySpendingContract">
|
<select id="queryPageList" resultType="com.jero.contract.entity.PaySpendingContract">
|
||||||
SELECT
|
SELECT
|
||||||
id,
|
id,
|
||||||
contract_num AS contractNum,
|
contract_num,
|
||||||
contract_name AS contractName,
|
contract_name,
|
||||||
signed_company_id AS signedCompanyId,
|
signed_company_id,
|
||||||
signed_company_temporary_id AS signedCompanyTemporaryId,
|
signed_company_temporary_id,
|
||||||
signed_company_temporary_name AS signedCompanyTemporaryName,
|
signed_company_temporary_name,
|
||||||
signed_contacts_id AS signedContactsId,
|
signed_contacts_id,
|
||||||
signed_contacts_temporary_id AS signedContactsTemporaryId,
|
signed_contacts_temporary_id,
|
||||||
signed_contacts_temporary_name AS signedContactsTemporaryName,
|
signed_contacts_temporary_name,
|
||||||
opening,
|
opening,
|
||||||
principal_id AS principaId,
|
principal_id,
|
||||||
principal_name AS principalName,
|
principal_name,
|
||||||
department_name AS departmentName,
|
department_name,
|
||||||
contract_amount AS contractAmount,
|
contract_amount,
|
||||||
rate,
|
rate,
|
||||||
no_tax_amount AS noTaxAmount,
|
no_tax_amount,
|
||||||
contract_date AS contractDate,
|
contract_date,
|
||||||
termination_date AS terminationDate,
|
termination_date,
|
||||||
contract_time_points AS contractTimPoints,
|
contract_time_points,
|
||||||
accounts_receivable_amount AS accountsReceivableAmount,
|
accounts_receivable_amount,
|
||||||
amount_received AS amountReceived,
|
amount_received,
|
||||||
outstanding_amount AS outstandingAmount,
|
outstanding_amount,
|
||||||
account_status AS accountStatus,
|
account_status,
|
||||||
contract_payment_times AS contractPaymentTimes,
|
contract_payment_times,
|
||||||
pack,
|
pack,
|
||||||
pack_year AS packYear,
|
pack_year,
|
||||||
create_by AS createBy,
|
create_by,
|
||||||
create_time AS createTime,
|
create_time,
|
||||||
update_by AS updateBy,
|
update_by,
|
||||||
update_time AS updateTime,
|
update_time,
|
||||||
(select if(count(*) > 0,1,0) from pay_spending_contract_installment
|
(select if(count(*) > 0,1,0) from pay_spending_contract_installment
|
||||||
where contract_id = psc.id AND accounts_receivable_time is not null AND accounts_receivable_time < DATE_FORMAT( NOW(), '%Y-%m-%d' )
|
where contract_id = psc.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)
|
AND accounts_receivable_amount != 0 AND accounts_receivable_amount > if(paid_amount is null or paid_amount = '',0,paid_amount)
|
||||||
@@ -59,35 +59,35 @@
|
|||||||
<select id="queryList" resultType="com.jero.contract.entity.PaySpendingContract">
|
<select id="queryList" resultType="com.jero.contract.entity.PaySpendingContract">
|
||||||
SELECT
|
SELECT
|
||||||
id,
|
id,
|
||||||
contract_num AS contractNum,
|
contract_num,
|
||||||
contract_name AS contractName,
|
contract_name,
|
||||||
signed_company_id AS signedCompanyId,
|
signed_company_id,
|
||||||
signed_company_temporary_id AS signedCompanyTemporaryId,
|
signed_company_temporary_id,
|
||||||
signed_company_temporary_name AS signedCompanyTemporaryName,
|
signed_company_temporary_name,
|
||||||
signed_contacts_id AS signedContactsId,
|
signed_contacts_id,
|
||||||
signed_contacts_temporary_id AS signedContactsTemporaryId,
|
signed_contacts_temporary_id,
|
||||||
signed_contacts_temporary_name AS signedContactsTemporaryName,
|
signed_contacts_temporary_name,
|
||||||
opening,
|
opening,
|
||||||
principal_id AS principaId,
|
principal_id,
|
||||||
principal_name AS principalName,
|
principal_name,
|
||||||
department_name AS departmentName,
|
department_name,
|
||||||
contract_amount AS contractAmount,
|
contract_amount,
|
||||||
rate,
|
rate,
|
||||||
no_tax_amount AS noTaxAmount,
|
no_tax_amount,
|
||||||
contract_date AS contractDate,
|
contract_date,
|
||||||
termination_date AS terminationDate,
|
termination_date,
|
||||||
contract_time_points AS contractTimPoints,
|
contract_time_points,
|
||||||
accounts_receivable_amount AS accountsReceivableAmount,
|
accounts_receivable_amount,
|
||||||
amount_received AS amountReceived,
|
amount_received,
|
||||||
outstanding_amount AS outstandingAmount,
|
outstanding_amount,
|
||||||
account_status AS accountStatus,
|
account_status,
|
||||||
contract_payment_times AS contractPaymentTimes,
|
contract_payment_times,
|
||||||
pack,
|
pack,
|
||||||
pack_year AS packYear,
|
pack_year,
|
||||||
create_by AS createBy,
|
create_by,
|
||||||
create_time AS createTime,
|
create_time,
|
||||||
update_by AS updateBy,
|
update_by,
|
||||||
update_time AS updateTime,
|
update_time,
|
||||||
(select if(count(*) > 0,1,0) from pay_spending_contract_installment
|
(select if(count(*) > 0,1,0) from pay_spending_contract_installment
|
||||||
where contract_id = psc.id AND accounts_receivable_time is not null AND accounts_receivable_time < DATE_FORMAT( NOW(), '%Y-%m-%d' )
|
where contract_id = psc.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)
|
AND accounts_receivable_amount != 0 AND accounts_receivable_amount > if(paid_amount is null or paid_amount = '',0,paid_amount)
|
||||||
|
|||||||
Reference in New Issue
Block a user