|
@@ -401,7 +401,7 @@ class Report extends Base
|
|
|
|
|
|
|
|
$list = Db::name('consult_bids')
|
|
$list = Db::name('consult_bids')
|
|
|
->alias('cb')
|
|
->alias('cb')
|
|
|
- ->field('DATE_FORMAT(cb.addtime,"%Y-%m-%d") addtime,du.itemid,cb.createrid,SUM(c.num) num,COUNT(cb.id) total,du.nickname,ci.name,s.name supplierName')
|
|
|
|
|
|
|
+ ->field('DATE_FORMAT(cb.addtime,"%Y-%m-%d") addtime,du.itemid,cb.createrid,SUM(c.num) num,COUNT(cb.id) total,IF(ISNULL(`du`.`nickname`),`s`.`name`,`du`.`nickname`) nickname,IF(ISNULL(`ci`.`name`),"供应商",`ci`.`name`) name,s.name supplierName')
|
|
|
->leftJoin('consult_info c', 'c.infoNo=cb.infoNo')
|
|
->leftJoin('consult_info c', 'c.infoNo=cb.infoNo')
|
|
|
->leftJoin('depart_user du', 'du.uid=cb.createrid AND du.is_del=0')
|
|
->leftJoin('depart_user du', 'du.uid=cb.createrid AND du.is_del=0')
|
|
|
->leftJoin('company_item ci', 'ci.id=du.itemid')
|
|
->leftJoin('company_item ci', 'ci.id=du.itemid')
|
