|
@@ -1182,7 +1182,7 @@ class Report extends Base
|
|
|
|
|
|
$list = Db::name('good_platform')
|
|
|
->alias('gp')
|
|
|
- ->field('gb.createrid,gb.creater,"" name,gp.skuCode,gp.spuCode,gb.good_name,b.brand_name,"" good_model,s.name,gb.tax,gb.nake_price,gp.online_time')
|
|
|
+ ->field('gb.createrid,gb.creater,"" company_name,gp.skuCode,gp.spuCode,gb.good_name,b.brand_name,"" good_model,s.name,gb.tax,gb.nake_price,gp.online_time')
|
|
|
->where($where)
|
|
|
->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode')
|
|
|
->leftJoin('brand b', 'b.id=gb.brand_id')
|
|
@@ -1192,7 +1192,7 @@ class Report extends Base
|
|
|
|
|
|
$data = [];
|
|
|
foreach ($list as $value) {
|
|
|
- $value['name'] = get_company_name_by_uid($value['createrid']);;
|
|
|
+ $value['company_name'] = get_company_name_by_uid($value['createrid']);;
|
|
|
$value['good_model'] = Db::name('good_spec')
|
|
|
->alias('gp')
|
|
|
->field('')
|
|
@@ -1302,11 +1302,11 @@ class Report extends Base
|
|
|
|
|
|
$list = Db::name('good_platform')
|
|
|
->alias('gp')
|
|
|
- ->field('gp.updatetime,gb.createrid,gb.creater,"" name,gb.creater,gp.skuCode,gp.spuCode,gb.good_name,s.name')
|
|
|
+ ->field('gp.updatetime,gb.createrid,gb.creater,"" company_name,gb.creater,gp.skuCode,gp.spuCode,gb.good_name,s.name')
|
|
|
->where($where)
|
|
|
->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode')
|
|
|
->leftJoin('supplier s', 's.code=gb.supplierNo')
|
|
|
- ->withAttr('name', function ($val, $data) {
|
|
|
+ ->withAttr('company_name', function ($val, $data) {
|
|
|
return get_company_name_by_uid($data['createrid']);
|
|
|
})
|
|
|
->page($param['page'], $param['size'])
|