|
|
@@ -419,21 +419,25 @@ class Project extends Base_Controller {
|
|
|
$join = [];
|
|
|
$join[] = ['table'=>'project as P','cond'=>'L.projectid = P.id','type'=>'inner'];
|
|
|
if ($type == 1) {
|
|
|
+ $join[] = ['table'=>'company as C','cond'=>'L.manu = C.id','type'=>'inner'];
|
|
|
$group = 'L.manu,L.projectid';
|
|
|
- $order = 'convert(L.manu using gbk) asc';
|
|
|
- $fields = 'L.manu as company,P.projectname,P.id';
|
|
|
+ $order = 'convert(C.name using gbk) asc';
|
|
|
+ $fields = 'C.name as company,P.projectname,P.id';
|
|
|
}elseif ($type == 2) {
|
|
|
+ $join[] = ['table'=>'company as C','cond'=>'L.supplier = C.id','type'=>'inner'];
|
|
|
$group = 'L.supplier,L.projectid';
|
|
|
- $order = 'convert(L.supplier using gbk) asc';
|
|
|
- $fields = 'L.supplier as company,P.projectname,P.id';
|
|
|
+ $order = 'convert(C.name using gbk) asc';
|
|
|
+ $fields = 'C.name as company,P.projectname,P.id';
|
|
|
}elseif ($type == 3) {
|
|
|
+ $join[] = ['table'=>'company as C','cond'=>'L.po = C.id','type'=>'inner'];
|
|
|
$group = 'L.po,L.projectid';
|
|
|
- $order = 'convert(L.po using gbk) asc';
|
|
|
- $fields = 'L.po as company,P.projectname,P.id';
|
|
|
+ $order = 'convert(C.name using gbk) asc';
|
|
|
+ $fields = 'C.name as company,P.projectname,P.id';
|
|
|
}else {
|
|
|
+ $join[] = ['table'=>'company as C','cond'=>'L.upazilla = C.id','type'=>'inner'];
|
|
|
$group = 'L.upazilla,L.projectid';
|
|
|
- $order = 'convert(L.upazilla using gbk) asc';
|
|
|
- $fields = 'L.upazilla as company,P.projectname,P.id';
|
|
|
+ $order = 'convert(C.name using gbk) asc';
|
|
|
+ $fields = 'C.name as company,P.projectname,P.id';
|
|
|
}
|
|
|
|
|
|
$data = $this->Lamp_model->get_list_by_join($where, $fields='*',NULL, NULL, $join, $order, $group, 'L');
|
