|
@@ -2118,19 +2118,19 @@ class CommonController extends RestBaseController |
|
@@ -2118,19 +2118,19 @@ class CommonController extends RestBaseController |
2118
|
if($company){
|
2118
|
if($company){
|
2119
|
$arr['a_company'] = $company['a_company'];
|
2119
|
$arr['a_company'] = $company['a_company'];
|
2120
|
$arr['b_company'] = $company['b_company'];
|
2120
|
$arr['b_company'] = $company['b_company'];
|
2121
|
- $arr['title'] = $company['title'];
|
|
|
2122
|
}
|
2121
|
}
|
2123
|
|
2122
|
|
2124
|
if($table == 'check'){
|
2123
|
if($table == 'check'){
|
2125
|
$project = $this->getProjectName($res['project_id']);
|
2124
|
$project = $this->getProjectName($res['project_id']);
|
2126
|
|
2125
|
|
2127
|
- $arr['title'] = $project['project_name'] . '月检' . date('Y-m-d', $res['ins_m_time']);
|
2126
|
+ $arr['title'] = $project['project_name'] . '月检' . date('Y-m-d', $res['ins_m_time']).'报表';
|
2128
|
//月检时间
|
2127
|
//月检时间
|
2129
|
$arr['ins_m_time'] = $res['ins_m_time'];
|
2128
|
$arr['ins_m_time'] = $res['ins_m_time'];
|
2130
|
//月检点
|
2129
|
//月检点
|
2131
|
$arr['check_point'] = $this->getCheckPoint(['c_id'=>$res['id'],'type'=>0],$res['project_id']);
|
2130
|
$arr['check_point'] = $this->getCheckPoint(['c_id'=>$res['id'],'type'=>0],$res['project_id']);
|
2132
|
}else{
|
2131
|
}else{
|
2133
|
//年时间
|
2132
|
//年时间
|
|
|
2133
|
+ $arr['title'] = $res['title'].'年检报表';
|
2134
|
$arr['year_m_time'] = $res['year_m_time'];
|
2134
|
$arr['year_m_time'] = $res['year_m_time'];
|
2135
|
//年检点
|
2135
|
//年检点
|
2136
|
$arr['year_point'] = $this->getCheckPoint(['c_id'=>$res['id'],'type'=>1],$res['project_id']);
|
2136
|
$arr['year_point'] = $this->getCheckPoint(['c_id'=>$res['id'],'type'=>1],$res['project_id']);
|