|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
namespace app\abutment\controller;
|
|
namespace app\abutment\controller;
|
|
|
|
|
|
|
|
+use app\admin\common\User;
|
|
use app\admin\model\ActionLog;
|
|
use app\admin\model\ActionLog;
|
|
use app\admin\model\ProcessOrder;
|
|
use app\admin\model\ProcessOrder;
|
|
use think\facade\Db;
|
|
use think\facade\Db;
|
|
@@ -162,7 +163,9 @@ class Consult extends HomeBaseController
|
|
$zxinfo['pgNo'] = isset($projectinfo['pgNo']) ? $projectinfo['pgNo'] : "";
|
|
$zxinfo['pgNo'] = isset($projectinfo['pgNo']) ? $projectinfo['pgNo'] : "";
|
|
}
|
|
}
|
|
if ($zxorder['depart'] > 0) {
|
|
if ($zxorder['depart'] > 0) {
|
|
- $zxinfo['departinfo'] = GetPart($zxorder['depart']);
|
|
|
|
|
|
+ $userCommon = new User();
|
|
|
|
+ $rs = $userCommon->handle('ciinfo', ['id' => $zxorder['depart']]);
|
|
|
|
+ $zxinfo['departinfo'] = $rs['data'] ?? [];
|
|
}
|
|
}
|
|
if ($zxorder['platform_code'] > 0) {
|
|
if ($zxorder['platform_code'] > 0) {
|
|
$palt = Db::name("platform")->where(["id" => $zxorder['platform_code']])->find();
|
|
$palt = Db::name("platform")->where(["id" => $zxorder['platform_code']])->find();
|
|
@@ -549,13 +552,17 @@ class Consult extends HomeBaseController
|
|
$page = $page >= $total ? $total : $page;
|
|
$page = $page >= $total ? $total : $page;
|
|
$list = Db::name('consult_bids')
|
|
$list = Db::name('consult_bids')
|
|
->alias('cb')
|
|
->alias('cb')
|
|
- ->field('cb.*,u.itemid')
|
|
|
|
- ->leftJoin("depart_user u", "u.uid=cb.createrid AND u.is_del=0")
|
|
|
|
|
|
+ ->field('cb.*')
|
|
->leftJoin("consult_info c", "c.infoNo=cb.infoNo")
|
|
->leftJoin("consult_info c", "c.infoNo=cb.infoNo")
|
|
->where($where)
|
|
->where($where)
|
|
->page($page, $size)
|
|
->page($page, $size)
|
|
->order('cb.addtime', 'desc')
|
|
->order('cb.addtime', 'desc')
|
|
- ->cursor();
|
|
|
|
|
|
+ ->select()
|
|
|
|
+ ->toArray();
|
|
|
|
+
|
|
|
|
+ $all_createrid = array_column($list,'createrid');
|
|
|
|
+ $item = get_company_name_by_uid($all_createrid);
|
|
|
|
+
|
|
$data = [];
|
|
$data = [];
|
|
foreach ($list as $value) {
|
|
foreach ($list as $value) {
|
|
$catinfo = Db::name("cat")->where(["id" => $value['cat_id']])->find();
|
|
$catinfo = Db::name("cat")->where(["id" => $value['cat_id']])->find();
|
|
@@ -624,7 +631,7 @@ class Consult extends HomeBaseController
|
|
// $addr= GetAddr(json_encode($temp));
|
|
// $addr= GetAddr(json_encode($temp));
|
|
// $value['origin_addr'] = $addr;
|
|
// $value['origin_addr'] = $addr;
|
|
// }
|
|
// }
|
|
- $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
|
|
|
|
|
|
+ $value['company_name'] = $item[$value['createrid']] ?? '';
|
|
$data[] = $value;
|
|
$data[] = $value;
|
|
}
|
|
}
|
|
return json_show(0, "获取成功", ['count' => $count, 'list' => $data]);
|
|
return json_show(0, "获取成功", ['count' => $count, 'list' => $data]);
|