|
|
@@ -56,7 +56,7 @@
|
|
|
type.`name` as typeName,
|
|
|
c.contract_id,
|
|
|
input.contract_no,
|
|
|
- GROUP_CONCAT( DISTINCT date_format(arrive_date, '%Y-%m-%d' ) ) AS daozhangriqi,
|
|
|
+ GROUP_CONCAT(DISTINCT if( c.arrive_date = '0000-00-00 00:00:00.000000',null,date_format(c.arrive_date,'%Y-%m-%d'))) AS daozhangriqi,
|
|
|
SUM( detail.arrive_amount ) AS tishoukuanjine,
|
|
|
GROUP_CONCAT( DISTINCT u.nick_name ) AS shenqingren,
|
|
|
GROUP_CONCAT( DISTINCT c.project_name ) AS project_name,
|
|
|
@@ -212,7 +212,7 @@
|
|
|
t7.name as typeName,
|
|
|
t8.nick_name AS verifyName,
|
|
|
t1.actually_date,
|
|
|
- date_format( t1.arrive_date, '%Y-%m-%d') as receiptDate
|
|
|
+ if(t1.arrive_date='0000-00-00 00:00:00.000000',null,DATE_FORMAT(t1.arrive_date,'%Y-%m-%d')) as receiptDate
|
|
|
FROM
|
|
|
biz_collection t1 right join biz_collection_detail t2 ON t1.id = t2.collection_id
|
|
|
LEFT JOIN biz_company t3 ON t3.id = t1.company_id
|
ly