...
|
...
|
@@ -511,6 +511,50 @@ class CommonController extends RestBaseController |
|
|
return $result;
|
|
|
}
|
|
|
|
|
|
//获取月检年检巡检点详情
|
|
|
public function getCheckPoint($where,$project_id){
|
|
|
//查询项目的月检点
|
|
|
$res_check = Db::name('check_point')
|
|
|
->where('p_id',$project_id)
|
|
|
->field('id,point_name')
|
|
|
->select()
|
|
|
->toArray();
|
|
|
if($res_check){
|
|
|
$checkIns = $this->getInsCheck($where,'status,point_id,images,uid');
|
|
|
foreach ($res_check as &$value){
|
|
|
$value['status'] = 2;
|
|
|
foreach ($checkIns as $ins_value){
|
|
|
if($value['id'] == $ins_value['point_id']){
|
|
|
$value['status'] = $ins_value['status'];
|
|
|
$user = $this->getUserById(['id'=>$ins_value['uid']]);
|
|
|
if($user){
|
|
|
$value['user_login'] = $user['user_login'];
|
|
|
}else{
|
|
|
$value['user_login'] = '';
|
|
|
}
|
|
|
$images = $this->absolutionUrl($ins_value['images']);
|
|
|
$images = $this->getDayImages($images);
|
|
|
if($images){
|
|
|
$value['images'] = $images;
|
|
|
}else{
|
|
|
$value['images'] = [];
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if(!isset($value['user_login'])){
|
|
|
$value['user_login'] = '';
|
|
|
}
|
|
|
if(!isset($value['images'])){
|
|
|
$value['images'] = [];
|
|
|
}
|
|
|
}
|
|
|
$result = $res_check;
|
|
|
}else{
|
|
|
$result = [];
|
|
|
}
|
|
|
return $result;
|
|
|
}
|
|
|
|
|
|
//获取月检的巡检信息
|
|
|
public function getInsCheck($where,$field){
|
|
|
$res = Db::name('ins_check')
|
...
|
...
|
@@ -571,6 +615,17 @@ class CommonController extends RestBaseController |
|
|
return $res;
|
|
|
}
|
|
|
|
|
|
//根据多个uid查询用户
|
|
|
public function getUserByIds($b_sid){
|
|
|
$user_login = Db::name('user')
|
|
|
->whereIn('id',$b_sid)
|
|
|
->where('user_status',1)
|
|
|
->field('id,user_login')
|
|
|
->select()
|
|
|
->toArray();
|
|
|
return $user_login;
|
|
|
}
|
|
|
|
|
|
//查看用户是甲方乙方(party 0:甲方,1:乙方)用户信息,企业信息,项目信息
|
|
|
public function getUserIdentity($user_identity='',$u_id=''){
|
|
|
if($user_identity == '' && $u_id == ''){
|
...
|
...
|
@@ -1134,17 +1189,6 @@ class CommonController extends RestBaseController |
|
|
return ceil($count/$limit);
|
|
|
}
|
|
|
|
|
|
//获取项目状态
|
|
|
public function getProjectStatus(){
|
|
|
$status = [
|
|
|
['id'=> -1,'status'=> '全部'],
|
|
|
['id'=> 1,'status'=> '待确认'],
|
|
|
['id'=> 2,'status'=> '进行中'],
|
|
|
['id'=> 3,'status'=> '已完成'],
|
|
|
];
|
|
|
return $status;
|
|
|
}
|
|
|
|
|
|
//获取报修列表详情
|
|
|
public function getRepairDetail($id,$table){
|
|
|
$res = Db::name($table)
|
...
|
...
|
@@ -1239,22 +1283,25 @@ class CommonController extends RestBaseController |
|
|
return $pIds;
|
|
|
}
|
|
|
|
|
|
//获取月检报表列表
|
|
|
public function getCheckReportList($pids,$data){
|
|
|
//获取月检年检报表列表
|
|
|
public function getCheckReportList($table,$pids,$data){
|
|
|
$limit = config('site.limit');
|
|
|
$res = Db::name('check')
|
|
|
if($table == 'check'){
|
|
|
$ins_m_time = 'c.ins_m_time';
|
|
|
$field = 'c.id,c.status,c.title,p.id project_id,p.name project_name,c.ins_m_time';
|
|
|
}else{
|
|
|
$ins_m_time = 'c.year_m_time';
|
|
|
$field = 'c.id,c.status,c.title,p.id project_id,p.name project_name,c.year_m_time';
|
|
|
}
|
|
|
$res = Db::name($table)
|
|
|
->alias('c')
|
|
|
->join('project p','c.project_id = p.id','LEFT')
|
|
|
->whereIn('c.project_id',$pids)
|
|
|
->where(function ($query) use ($data) {
|
|
|
->where(function ($query) use ($ins_m_time,$data) {
|
|
|
//状态
|
|
|
$status = !empty($data['status'])&&isset($data['status'])?$data['status']:'';
|
|
|
if (!empty($status)) {
|
|
|
if($status == 1){
|
|
|
//待确认
|
|
|
$query->where('c.status',0);
|
|
|
}else if($status == 2 || $status == 3){
|
|
|
//进行中
|
|
|
if (isset($data['status'])) {
|
|
|
$status = $data['status'];
|
|
|
if($status != -1){
|
|
|
$query->where('c.status',$status);
|
|
|
}
|
|
|
}
|
...
|
...
|
@@ -1268,37 +1315,32 @@ class CommonController extends RestBaseController |
|
|
$endTime = isset($data['end_time'])&&!empty($data['end_time'])?$data['end_time']:'';
|
|
|
if (!empty($startTime)) {
|
|
|
$startTime = strtotime(date('Y-m-d',$startTime));
|
|
|
$query->where('c.ins_m_time', '>=', $startTime);
|
|
|
$query->where($ins_m_time, '>=', $startTime);
|
|
|
}
|
|
|
if (!empty($endTime)) {
|
|
|
$endTime = strtotime(date('Y-m-d',$endTime))+86400;
|
|
|
$query->where('c.ins_m_time', '<=', $endTime);
|
|
|
$query->where($ins_m_time, '<=', $endTime);
|
|
|
}
|
|
|
})
|
|
|
->page($data['page'],$limit)
|
|
|
->field('c.id,c.status,p.id project_id,p.name project_name,c.ins_m_time')
|
|
|
->field($field)
|
|
|
->order('c.id desc')
|
|
|
->select()
|
|
|
->toArray();
|
|
|
return $res;
|
|
|
}
|
|
|
|
|
|
//获取月检报表列表总页数
|
|
|
public function checkReportCount($pids,$data){
|
|
|
$count = Db::name('check')
|
|
|
//获取月检年检报表列表总页数
|
|
|
public function checkReportCount($table,$pids,$data){
|
|
|
$count = $res = Db::name($table)
|
|
|
->alias('c')
|
|
|
->join('project p','c.project_id = p.id','LEFT')
|
|
|
->whereIn('c.project_id',$pids)
|
|
|
->whereIn('c.project_id',$pids)
|
|
|
->where(function ($query) use ($data) {
|
|
|
->where(function ($query) use ($table,$data) {
|
|
|
//状态
|
|
|
$status = !empty($data['status'])&&isset($data['status'])?$data['status']:'';
|
|
|
if (!empty($status)) {
|
|
|
if($status == 1){
|
|
|
//待确认
|
|
|
$query->where('c.status',0);
|
|
|
}else if($status == 2 || $status == 3){
|
|
|
//进行中
|
|
|
if (isset($data['status'])) {
|
|
|
$status = $data['status'];
|
|
|
if($status != -1){
|
|
|
$query->where('c.status',$status);
|
|
|
}
|
|
|
}
|
...
|
...
|
@@ -1312,11 +1354,21 @@ class CommonController extends RestBaseController |
|
|
$endTime = isset($data['end_time'])&&!empty($data['end_time'])?$data['end_time']:'';
|
|
|
if (!empty($startTime)) {
|
|
|
$startTime = strtotime(date('Y-m-d',$startTime));
|
|
|
$query->where('c.ins_m_time', '>=', $startTime);
|
|
|
if($table == 'check'){
|
|
|
//月检
|
|
|
$query->where('c.ins_m_time', '>=', $startTime);
|
|
|
}else{
|
|
|
//年检
|
|
|
$query->where('c.year_m_time', '>=', $startTime);
|
|
|
}
|
|
|
}
|
|
|
if (!empty($endTime)) {
|
|
|
$endTime = strtotime(date('Y-m-d',$endTime))+86400;
|
|
|
$query->where('c.ins_m_time', '<=', $endTime);
|
|
|
if($table == 'check'){
|
|
|
$query->where('c.ins_m_time', '<=', $endTime);
|
|
|
}else{
|
|
|
$query->where('c.year_m_time', '<=', $endTime);
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
->count();
|
...
|
...
|
@@ -1324,8 +1376,8 @@ class CommonController extends RestBaseController |
|
|
return ceil($count/$limit);
|
|
|
}
|
|
|
|
|
|
//获取改造(报修)报表列表
|
|
|
public function getReformReportList($pids,$data,$table){
|
|
|
//获取报修改造报表列表
|
|
|
public function getRepairReportList($table,$pids,$data){
|
|
|
$limit = config('site.limit');
|
|
|
$res = Db::name($table)
|
|
|
->alias('r')
|
...
|
...
|
@@ -1333,17 +1385,10 @@ class CommonController extends RestBaseController |
|
|
->whereIn('r.project_id',$pids)
|
|
|
->where(function ($query) use ($data) {
|
|
|
//状态
|
|
|
$status = !empty($data['status'])&&isset($data['status'])?$data['status']:'';
|
|
|
if (!empty($status)) {
|
|
|
if($status == 1){
|
|
|
//待确认
|
|
|
$query->where('r.status',0);
|
|
|
}else if($status == 2){
|
|
|
//进行中
|
|
|
$query->where('r.status',1);
|
|
|
}else if($status == 3){
|
|
|
//已完成
|
|
|
$query->where('r.status',2);
|
|
|
if (isset($data['status'])) {
|
|
|
$status = $data['status'];
|
|
|
if($status != -1){
|
|
|
$query->where('r.status',$status);
|
|
|
}
|
|
|
}
|
|
|
//项目id
|
...
|
...
|
@@ -1364,15 +1409,15 @@ class CommonController extends RestBaseController |
|
|
}
|
|
|
})
|
|
|
->page($data['page'],$limit)
|
|
|
->field('r.id,r.status,p.id project_id,p.name project_name,r.create_time')
|
|
|
->field('r.id,r.status,r.title,p.id project_id,p.name project_name,r.create_time')
|
|
|
->order('r.id desc')
|
|
|
->select()
|
|
|
->toArray();
|
|
|
return $res;
|
|
|
}
|
|
|
|
|
|
//获取改造(报修)报表列表
|
|
|
public function reformReportCount($pids,$data,$table){
|
|
|
//获取报修改造报表列表
|
|
|
public function repairReportCount($table,$pids,$data){
|
|
|
$limit = config('site.limit');
|
|
|
$count = Db::name($table)
|
|
|
->alias('r')
|
...
|
...
|
@@ -1380,17 +1425,10 @@ class CommonController extends RestBaseController |
|
|
->whereIn('r.project_id',$pids)
|
|
|
->where(function ($query) use ($data) {
|
|
|
//状态
|
|
|
$status = !empty($data['status'])&&isset($data['status'])?$data['status']:'';
|
|
|
if (!empty($status)) {
|
|
|
if($status == 1){
|
|
|
//待确认
|
|
|
$query->where('r.status',0);
|
|
|
}else if($status == 2){
|
|
|
//进行中
|
|
|
$query->where('r.status',1);
|
|
|
}else if($status == 3){
|
|
|
//已完成
|
|
|
$query->where('r.status',2);
|
|
|
if (isset($data['status'])) {
|
|
|
$status = $data['status'];
|
|
|
if($status != -1){
|
|
|
$query->where('r.status',$status);
|
|
|
}
|
|
|
}
|
|
|
//项目id
|
...
|
...
|
@@ -1415,14 +1453,14 @@ class CommonController extends RestBaseController |
|
|
}
|
|
|
|
|
|
//获取培训(演习)报表列表
|
|
|
public function getTrainReportList($pids,$data,$table){
|
|
|
public function getTrainReportList($table,$pids,$data){
|
|
|
$limit = config('site.limit');
|
|
|
if($table == 'train'){
|
|
|
$train_time = 'r.train_time';
|
|
|
$field = 'r.id,r.status,p.id project_id,p.name project_name,r.train_time';
|
|
|
$field = 'r.id,r.status,r.title,p.id project_id,p.name project_name,r.train_time';
|
|
|
}else{
|
|
|
$train_time = 'r.exercise_time';
|
|
|
$field = 'r.id,r.status,p.id project_id,p.name project_name,r.exercise_time';
|
|
|
$field = 'r.id,r.status,r.title,p.id project_id,p.name project_name,r.exercise_time';
|
|
|
}
|
|
|
$res = Db::name($table)
|
|
|
->alias('r')
|
...
|
...
|
@@ -1430,13 +1468,9 @@ class CommonController extends RestBaseController |
|
|
->whereIn('r.project_id',$pids)
|
|
|
->where(function ($query) use ($data,$train_time) {
|
|
|
//状态
|
|
|
$status = !empty($data['status'])&&isset($data['status'])?$data['status']:'';
|
|
|
if (!empty($status)) {
|
|
|
if($status == 1){
|
|
|
//待确认
|
|
|
$query->where('r.status',0);
|
|
|
}else if($status == 2 || $status == 3){
|
|
|
//进行中,已完成
|
|
|
if (isset($data['status'])) {
|
|
|
$status = $data['status'];
|
|
|
if($status != -1){
|
|
|
$query->where('r.status',$status);
|
|
|
}
|
|
|
}
|
...
|
...
|
@@ -1466,7 +1500,7 @@ class CommonController extends RestBaseController |
|
|
}
|
|
|
|
|
|
//获取培训(演习)报表列表
|
|
|
public function trainReportCount($pids,$data,$table){
|
|
|
public function trainReportCount($table,$pids,$data){
|
|
|
$limit = config('site.limit');
|
|
|
if($table == 'train'){
|
|
|
$train_time = 'r.train_time';
|
...
|
...
|
@@ -1479,13 +1513,9 @@ class CommonController extends RestBaseController |
|
|
->whereIn('r.project_id',$pids)
|
|
|
->where(function ($query) use ($data,$train_time) {
|
|
|
//状态
|
|
|
$status = !empty($data['status'])&&isset($data['status'])?$data['status']:'';
|
|
|
if (!empty($status)) {
|
|
|
if($status == 1){
|
|
|
//待确认
|
|
|
$query->where('r.status',0);
|
|
|
}else if($status == 2 || $status == 3){
|
|
|
//进行中,已完成
|
|
|
if (isset($data['status'])) {
|
|
|
$status = $data['status'];
|
|
|
if($status != -1){
|
|
|
$query->where('r.status',$status);
|
|
|
}
|
|
|
}
|
...
|
...
|
@@ -1673,13 +1703,13 @@ class CommonController extends RestBaseController |
|
|
$arr['reform_period'] = '';
|
|
|
}
|
|
|
}
|
|
|
//维修人员
|
|
|
//参与人员
|
|
|
if($flag == 'repair'){
|
|
|
//报修
|
|
|
$arr['repair_name'] = $this->getUserByProjectId($res['project_id'],'id,b_sid',1);
|
|
|
$arr['repair_name'] = $this->getUserNameByServiceId($res['id'],3);
|
|
|
}else{
|
|
|
//改造
|
|
|
$arr['reform_name'] = $this->getUserByProjectId($res['project_id'],'id,b_sid',1);
|
|
|
$arr['reform_name'] = $this->getUserNameByServiceId($res['id'],4);
|
|
|
}
|
|
|
|
|
|
//报修图片
|
...
|
...
|
@@ -1792,21 +1822,45 @@ class CommonController extends RestBaseController |
|
|
$arr['user_login'] = $user['user_login'];
|
|
|
}
|
|
|
|
|
|
//乙方领导确认人
|
|
|
$leader_user = $this->getUserById(['id'=>$res['b_leader']]);
|
|
|
//乙方员工确认人
|
|
|
$leader_user = $this->getUserById(['id'=>$res['h_uid']]);
|
|
|
if($leader_user){
|
|
|
$arr['b_leader_user'] = $leader_user['user_login'];
|
|
|
$arr['b_staff_user'] = $leader_user['user_login'];
|
|
|
}else{
|
|
|
$arr['b_leader_user'] = '';
|
|
|
$arr['b_staff_user'] = '';
|
|
|
}
|
|
|
|
|
|
//甲方验收人
|
|
|
//乙方确认完成人
|
|
|
$confirm_user = $this->getUserById(['id'=>$res['confirm_uid']]);
|
|
|
if($confirm_user){
|
|
|
$arr['confirm_user'] = $confirm_user['user_login'];
|
|
|
$arr['confirm_user_b'] = $confirm_user['user_login'];
|
|
|
}else{
|
|
|
$arr['confirm_user'] = '';
|
|
|
$arr['confirm_user_b'] = '';
|
|
|
}
|
|
|
|
|
|
//甲方确认完成人
|
|
|
if($flag == 'train'){
|
|
|
//培训
|
|
|
$res1 = $this->getUnFinishUid(['type'=>0,'c_id'=>$res['id'],'is_image'=>1]);
|
|
|
|
|
|
}else{
|
|
|
//演习
|
|
|
$res1 = $this->getUnFinishUid(['type'=>1,'c_id'=>$res['id'],'is_image'=>1]);
|
|
|
}
|
|
|
foreach($res1 as &$value){
|
|
|
$user = $this->getUserById(['id'=>$value['uid']]);
|
|
|
if($user){
|
|
|
$value['user_login'] = $user['user_login'];
|
|
|
}else{
|
|
|
$value['user_login'] = '';
|
|
|
}
|
|
|
//图片
|
|
|
$images = $this->absolutionUrl($value['confirm_images']);
|
|
|
$value['a_images'] = $this->getDayImages($images);
|
|
|
unset($value['confirm_images']);
|
|
|
unset($value['uid']);
|
|
|
}
|
|
|
$arr['confirm_images_a'] = $res1;
|
|
|
|
|
|
//培训演习工期及验收完成时间
|
|
|
if($res['finish_time']){
|
...
|
...
|
@@ -1833,13 +1887,13 @@ class CommonController extends RestBaseController |
|
|
$arr['exercise_period'] = '';
|
|
|
}
|
|
|
}
|
|
|
//培训演习人员
|
|
|
//培训演习参与人员
|
|
|
if($flag == 'train'){
|
|
|
//培训
|
|
|
$arr['train_name'] = $this->getUserByProjectId($res['project_id'],'id,b_sid',1);
|
|
|
$arr['train_name'] = $this->getUserNameByServiceId($res['id'],5);
|
|
|
}else{
|
|
|
//演习
|
|
|
$arr['exercise_name'] = $this->getUserByProjectId($res['project_id'],'id,b_sid',1);
|
|
|
$arr['exercise_name'] = $this->getUserNameByServiceId($res['id'],6);
|
|
|
}
|
|
|
|
|
|
//培训演习图片
|
...
|
...
|
@@ -1889,18 +1943,32 @@ class CommonController extends RestBaseController |
|
|
return $arr;
|
|
|
}
|
|
|
|
|
|
//获取月检报表详情
|
|
|
public function getCheckReportDetail($res,$data){
|
|
|
//获取月检年检报表详情
|
|
|
public function getCheckReportDetail($table,$res,$data){
|
|
|
$arr = [];
|
|
|
$company = $this->getCompanyName($res['project_id'],'月检');
|
|
|
if($table == 'check'){
|
|
|
$company = $this->getCompanyName($res['project_id'],'月检');
|
|
|
}else{
|
|
|
$company = $this->getCompanyName($res['project_id'],'年检');
|
|
|
}
|
|
|
|
|
|
if($company){
|
|
|
$arr['a_company'] = $company['a_company'];
|
|
|
$arr['b_company'] = $company['b_company'];
|
|
|
$arr['title'] = $company['title'];
|
|
|
}
|
|
|
|
|
|
//月检时间
|
|
|
$arr['ins_m_time'] = $res['ins_m_time'];
|
|
|
if($table == 'check'){
|
|
|
//月检时间
|
|
|
$arr['ins_m_time'] = $res['ins_m_time'];
|
|
|
//月检点
|
|
|
$arr['check_point'] = $this->getCheckPoint(['c_id'=>$res['id'],'type'=>0],$res['project_id']);
|
|
|
}else{
|
|
|
//年时间
|
|
|
$arr['year_m_time'] = $res['year_m_time'];
|
|
|
//年检点
|
|
|
$arr['year_point'] = $this->getCheckPoint(['c_id'=>$res['id'],'type'=>1],$res['project_id']);
|
|
|
}
|
|
|
|
|
|
//月检地点
|
|
|
$arr['address'] = $res['address'];
|
...
|
...
|
@@ -1945,19 +2013,14 @@ class CommonController extends RestBaseController |
|
|
$arr['check_period'] = '';
|
|
|
}
|
|
|
|
|
|
//月检人员(参与人员)
|
|
|
$arr['check_name'] = $this->getUserByProjectId($res['project_id'],'id,b_sid',1);
|
|
|
|
|
|
//月检图片
|
|
|
if($res['images']){
|
|
|
$images = $this->absolutionUrl($res['images']);
|
|
|
$arr1 = $this->getDayImages($images);
|
|
|
$arr['images']['i_images'] = $arr1;
|
|
|
//参与人员
|
|
|
if($table == 'check'){
|
|
|
//月检
|
|
|
$arr['check_name'] = $this->getUserNameByServiceId($res['id'],1);
|
|
|
}else{
|
|
|
$arr['images']['i_images'] = [];
|
|
|
//年检
|
|
|
$arr['year_name'] = $this->getUserNameByServiceId($res['id'],2);
|
|
|
}
|
|
|
//月检图片标题
|
|
|
$arr['images']['title'] = '月检图片';
|
|
|
|
|
|
//确认图片
|
|
|
if($res['confirm_images']){
|
...
|
...
|
@@ -1985,16 +2048,10 @@ class CommonController extends RestBaseController |
|
|
return $arr;
|
|
|
}
|
|
|
|
|
|
//获取日检年检报表详情
|
|
|
public function getInspectReportDetail($res,$data,$flag){
|
|
|
//获取日检报表详情
|
|
|
public function getInspectReportDetail($res,$data){
|
|
|
$arr = [];
|
|
|
if($flag == 'inspect'){
|
|
|
//日检
|
|
|
$company = $this->getCompanyName($res['project_id'],'消防日检');
|
|
|
}else{
|
|
|
//年检
|
|
|
$company = $this->getCompanyName($res['project_id'],'年检');
|
|
|
}
|
|
|
$company = $this->getCompanyName($res['project_id'],'消防日检');
|
|
|
if($company){
|
|
|
$arr['a_company'] = $company['a_company'];
|
|
|
$arr['b_company'] = $company['b_company'];
|
...
|
...
|
@@ -2002,46 +2059,23 @@ class CommonController extends RestBaseController |
|
|
}
|
|
|
|
|
|
//查询已经巡检列表
|
|
|
if($flag == 'inspect'){
|
|
|
//日检
|
|
|
$where = ['party'=>$res['party'],'project_id'=>$res['project_id']];
|
|
|
$field = 'id,status,uid,point_id,images,create_time';
|
|
|
$arr['inspect'] = $this->getInspectList($where,$field,$res['project_id'],'inspect',$res['create_time']);
|
|
|
|
|
|
//日检时间
|
|
|
$arr['inspect_time'] = $res['create_time'];
|
|
|
}else{
|
|
|
//年检检测
|
|
|
$where = ['project_id'=>$res['project_id'],'test_id'=>$res['id']];
|
|
|
$field = 'id,status,uid,spot_id,images,create_time';
|
|
|
$arr['years'] = $this->getTestYearsList($where,$field,'years');
|
|
|
//检测单号
|
|
|
$arr['number'] = $res['number'];
|
|
|
//检测时间
|
|
|
$arr['test_time'] = $res['test_time'];
|
|
|
}
|
|
|
|
|
|
if($flag == 'inspect'){
|
|
|
//显示拍照的日检人员
|
|
|
$ins_data = [
|
|
|
'project_id'=>$res['project_id'],
|
|
|
'create_time'=>$res['create_time']
|
|
|
];
|
|
|
$arr['inspect_name'] = $this->getUserNameByProjectId($ins_data);
|
|
|
}else{
|
|
|
//乙方项目组
|
|
|
$arr['inspect_name'] = $this->getUserByProjectId($res['project_id'],'id,b_sid',1);
|
|
|
}
|
|
|
$where = ['party'=>$res['party'],'project_id'=>$res['project_id']];
|
|
|
$field = 'id,status,uid,point_id,images,create_time';
|
|
|
$arr['inspect'] = $this->getInspectList($where,$field,$res['project_id'],'inspect',$res['create_time']);
|
|
|
//日检时间
|
|
|
$arr['inspect_time'] = $res['create_time'];
|
|
|
|
|
|
//显示拍照的参与人员
|
|
|
$ins_data = [
|
|
|
'project_id'=>$res['project_id'],
|
|
|
'create_time'=>$res['create_time']
|
|
|
];
|
|
|
$arr['inspect_name'] = $this->getUserNameByProjectId($ins_data);
|
|
|
|
|
|
//评价内容
|
|
|
$discussModel = new DiscussModel();
|
|
|
if($flag == 'inspect'){
|
|
|
//日检
|
|
|
$service = config('site.service_inspect');
|
|
|
}else{
|
|
|
//年检
|
|
|
$service = config('site.service_years');
|
|
|
}
|
|
|
|
|
|
$service = config('site.service_inspect');
|
|
|
|
|
|
$discuss = $discussModel->where(['type'=>$service,'type_id'=>$data['id']])->find();
|
|
|
if($discuss){
|
...
|
...
|
@@ -2423,6 +2457,9 @@ class CommonController extends RestBaseController |
|
|
//记录拍照人员(添加或编辑)0:日检,1:月检,2:年检,3:维修,4:改造,5:培训,6:演习
|
|
|
public function createInsUid($data,$type=0){
|
|
|
$recordData['type'] = $type;
|
|
|
if($type != 0){
|
|
|
$recordData['service_id'] = $data['service_id'];
|
|
|
}
|
|
|
$recordData['uid'] = $this->userId;
|
|
|
$recordData['project_id'] = $data['project_id'];
|
|
|
$recordData['create_time'] = $data['create_time'];
|
...
|
...
|
@@ -2430,7 +2467,7 @@ class CommonController extends RestBaseController |
|
|
$insUidModel->create($recordData);
|
|
|
}
|
|
|
|
|
|
//根据项目id获取日检人员
|
|
|
//根据项目id获取日检参与人员
|
|
|
public function getUserNameByProjectId($data){
|
|
|
$time = date('Y-m-d',$data['create_time']);
|
|
|
$startTime = strtotime($time);
|
...
|
...
|
@@ -2452,6 +2489,24 @@ class CommonController extends RestBaseController |
|
|
return $user_login;
|
|
|
}
|
|
|
|
|
|
//根据服务id获取1:月检,2:年检,3:报修,4:改造,5:培训,6:演习 参与人员
|
|
|
public function getUserNameByServiceId($service_id,$type){
|
|
|
$res = Db::name('ins_record_uid')
|
|
|
->where(['service_id'=>$service_id,'type'=>$type])
|
|
|
->field('uid')
|
|
|
->select()
|
|
|
->toArray();
|
|
|
$u_ids = array_unique(array_values(array_column($res,'uid')));
|
|
|
$users = Db::name('user')
|
|
|
->whereIn('id',$u_ids)
|
|
|
->where('user_status',1)
|
|
|
->field('id,user_login')
|
|
|
->select()
|
|
|
->toArray();
|
|
|
$user_login = trim(implode(array_column($users,'user_login'),'/'),'/');
|
|
|
return $user_login;
|
|
|
}
|
|
|
|
|
|
//获取培训演习指派甲方员工完成图片数量
|
|
|
public function getFinishCount($where){
|
|
|
$count = Db::name('confirm_image')
|
...
|
...
|
@@ -2464,11 +2519,10 @@ class CommonController extends RestBaseController |
|
|
public function getUnFinishUid($where){
|
|
|
$res = Db::name('confirm_image')
|
|
|
->where($where)
|
|
|
->field('uid')
|
|
|
->field('uid,confirm_images')
|
|
|
->select()
|
|
|
->toArray();
|
|
|
$u_ids = array_values(array_column($res,'uid'));
|
|
|
return $u_ids;
|
|
|
return $res;
|
|
|
}
|
|
|
|
|
|
} |
...
|
...
|
|