|
@@ -21,6 +21,25 @@ class ApiService{
|
|
|
|
|
|
}
|
|
|
|
|
|
+ //网格化整改
|
|
|
+ public static function editConition($params)
|
|
|
+ {
|
|
|
+ $result['status'] = true;
|
|
|
+ $result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
|
+ $result['data'] = [];
|
|
|
+
|
|
|
+ $update = [
|
|
|
+ 'zgzp' => $params['zgpz'],
|
|
|
+ 'jcwt' => '无'
|
|
|
+ ];
|
|
|
+
|
|
|
+ DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')->where('id',$params['id'])->update($update);
|
|
|
+
|
|
|
+ DB::connection('mysql_fwe10')->table('uf_zhxx_qlctzgg')->where('gglx_obj',$params['id'])->update(['IS_DELETE'=>1]);
|
|
|
+
|
|
|
+ return $result;
|
|
|
+ }
|
|
|
+
|
|
|
//网格化录入
|
|
|
public static function addConition($params)
|
|
|
{
|
|
@@ -28,19 +47,96 @@ class ApiService{
|
|
|
$result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
|
$result['data'] = [];
|
|
|
|
|
|
+ //区域字典录入
|
|
|
+ $area = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')->where('szxmc',$params['xjdw'])->orderBy('areaid','desc')->get();
|
|
|
+
|
|
|
+ $is_insert = true;
|
|
|
+
|
|
|
+ if(count($area) > 0){
|
|
|
+ for($i=0;$i<count($area);$i++){
|
|
|
+ if($params['jcqy'] == $area[$i]->qymc){
|
|
|
+ $is_insert = false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if($is_insert){
|
|
|
+ $data['ID'] = mt_rand(pow(10, 18), pow(10, 18) + 999999999);
|
|
|
+ $data['FORM_DATA_ID'] = $data['ID'];
|
|
|
+ $data['DATA_INDEX'] = 0.0;
|
|
|
+ $data['CREATE_TIME'] = date('Y-m-d H:i:s');
|
|
|
+ $data['TENANT_KEY'] = 't1zz9w8165';
|
|
|
+ $data['IS_DELETE'] = 0;
|
|
|
+ $data['DELETE_TYPE'] = 0;
|
|
|
+ $data['FT_STATUS'] = 0;
|
|
|
+
|
|
|
+ if(count($area) > 0){
|
|
|
+ preg_match_all('/[0-9]+/', $area[0]->areaid, $matches);
|
|
|
+ $data['areaid'] = $params['xjdw'].($matches[0] + 1);
|
|
|
+ }else{
|
|
|
+ $data['areaid'] = $params['xjdw'].'1';
|
|
|
+ }
|
|
|
+ $data['qymc'] = $params['jcqy'];
|
|
|
+
|
|
|
+ $data['szxmc'] = $params['xjdw'];
|
|
|
+
|
|
|
+ DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')->insert($data);
|
|
|
+ }
|
|
|
+
|
|
|
+ //巡检记录录入
|
|
|
+ $id = mt_rand(pow(10, 18), pow(10, 18) + 999999999);
|
|
|
$insert = [
|
|
|
- 'lrr' => $params['lrr'],
|
|
|
- 'dwmc' => $params['dwmc'],
|
|
|
- 'xjdw' => $params['xjdw'],
|
|
|
- 'jcqy' => $params['jcqy'],
|
|
|
+ 'ID' => $id,
|
|
|
+ 'FORM_DATA_ID' => $id,
|
|
|
+ 'DATA_INDEX' => 0.0,
|
|
|
+ 'CREATE_TIME' => date('Y-m-d H:i:s'),
|
|
|
+ 'TENANT_KEY' => 't1zz9w8165',
|
|
|
+ 'IS_DELETE' => 0,
|
|
|
+ 'DELETE_TYPE' => 0,
|
|
|
+ 'FT_STATUS' => 0,
|
|
|
+
|
|
|
+ 'xjqy' => $params['jcqy'],
|
|
|
+ 'dkpz' => $params['dkpz'],
|
|
|
+ 'lrr' => $params['lrmc'].'|'.$params['lrr'],
|
|
|
'jclx' => $params['jclx'],
|
|
|
'lrsj' => $params['lrsj'],
|
|
|
+ 'dwmc' => $params['dwmc'],
|
|
|
'jcwt' => $params['jcwt'],
|
|
|
+ 'xjdw' => $params['xjdw'],
|
|
|
'wtms' => $params['wtms'],
|
|
|
- 'dkpz' => $params['dkpz'],
|
|
|
+ 'sjr' => $params['sjr']
|
|
|
];
|
|
|
|
|
|
- $res = DB::connection('mysql_fwview')->table('uf_wghgl_new')->insert($insert);
|
|
|
+ if($params['jcwt'] == '有'){
|
|
|
+ $insert['zgr'] = $params['zgr'];
|
|
|
+ }
|
|
|
+
|
|
|
+ DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')->insert($insert);
|
|
|
+
|
|
|
+ //发通知
|
|
|
+ if($params['jcwt'] == '有'){
|
|
|
+ $tzgg_first = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')->orderBy('CREATE_TIME','desc')->limit(1)->get();
|
|
|
+ $id = mt_rand(pow(10, 18), pow(10, 18) + 999999999);
|
|
|
+ $zgr_name = explode('|',$params['zgr'])[0];
|
|
|
+ $tzgg = [
|
|
|
+ 'ID' => $id,
|
|
|
+ 'FORM_DATA_ID' => $id,
|
|
|
+ 'DATA_INDEX' => 0.0,
|
|
|
+ 'CREATE_TIME' => date('Y-m-d H:i:s'),
|
|
|
+ 'TENANT_KEY' => 't1zz9w8165',
|
|
|
+ 'IS_DELETE' => 0,
|
|
|
+ 'DELETE_TYPE' => 0,
|
|
|
+ 'FT_STATUS' => 0,
|
|
|
+
|
|
|
+ 'gglx' => 3,
|
|
|
+ 'gglx_obj' => $tzgg_first[0]->ID,
|
|
|
+ 'ggrq' => date('Y-m-d H:i:s'),
|
|
|
+ 'ggnr' => $zgr_name.',你有一条巡检记录需要整改,请及时'
|
|
|
+
|
|
|
+ ];
|
|
|
+
|
|
|
+ DB::connection('mysql_fwe10')->table('uf_zhxx_qlctzgg')->insert($tzgg);
|
|
|
+ }
|
|
|
|
|
|
return $result;
|
|
|
}
|
|
@@ -56,28 +152,37 @@ class ApiService{
|
|
|
$date = date('Y-m-d', time());
|
|
|
}
|
|
|
|
|
|
- $depart = DB::connection('mysql_fwview')->table('hrmdepartment')
|
|
|
- ->where('subcompanyid1', 49)
|
|
|
- ->where('departmentname', 'like', '%' . '洗煤厂')
|
|
|
- ->where('id', '!=', 1602)->get();
|
|
|
+ $depart = DB::connection('mysql_fwe10_eteams')->table('department')
|
|
|
+ ->where('parent', '100001980000000049')
|
|
|
+ ->where('name', 'like', '%' . '洗煤厂')
|
|
|
+ ->where('id','!=','100001590000001602')
|
|
|
+ ->get();
|
|
|
|
|
|
$depart_arr = [];
|
|
|
foreach ($depart as $key => $val) {
|
|
|
- $depart_name = str_replace('洗选中心', '', $val->DEPARTMENTNAME);
|
|
|
+ $depart_name = str_replace('洗选中心', '', $val->fullname);
|
|
|
$depart_arr[$key] = [
|
|
|
'name' => $depart_name,
|
|
|
|
|
|
];
|
|
|
- $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
|
- ->join('hrmresource', 'uf_wghgl_new.lrr', '=', 'hrmresource.id')
|
|
|
- ->where('xjdw', $depart_name)
|
|
|
- ->where('lrsj', 'like', '%' . $date . '%')
|
|
|
- ->groupBy('lrr')->select(
|
|
|
- [
|
|
|
- 'hrmresource.lastname as person_name',
|
|
|
- 'uf_wghgl_new.lrr as person_id'
|
|
|
- ]
|
|
|
- )->get();
|
|
|
+
|
|
|
+ $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')
|
|
|
+ ->where('xjdw', $depart_name)
|
|
|
+ ->where('lrsj', 'like', '%' . $date . '%')
|
|
|
+ ->groupBy('lrr')->select(
|
|
|
+ [
|
|
|
+ 'lrr'
|
|
|
+ ]
|
|
|
+ )->get();
|
|
|
+
|
|
|
+ if(count($query) > 0){
|
|
|
+ for($i=0;$i<count($query);$i++){
|
|
|
+ $lrr = explode('|',$query[$i]->lrr);
|
|
|
+ $query[$i]->person_name = $lrr[0];
|
|
|
+ $query[$i]->person_id = $lrr[1];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
$query = json_decode($query);
|
|
|
$depart_arr[$key]['person_list'] = $query;
|
|
|
}
|
|
@@ -101,25 +206,28 @@ class ApiService{
|
|
|
$res = [];
|
|
|
$area_arr = [];
|
|
|
|
|
|
- $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
|
- ->where('lrr', $person_id)
|
|
|
- ->where('lrsj', 'like', '%' . $date . '%')
|
|
|
- ->where('xjdw', $depart)
|
|
|
- ->orderBy('lrsj', 'asc')->get();
|
|
|
+ $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')
|
|
|
+ ->where('lrr', $person_id)
|
|
|
+ ->where('lrsj', 'like', '%' . $date . '%')
|
|
|
+ ->where('xjdw', $depart)
|
|
|
+ ->orderBy('lrsj', 'asc')->get();
|
|
|
$query = json_decode($query);
|
|
|
+
|
|
|
if ($query) {
|
|
|
foreach ($query as $key => $val) {
|
|
|
- $area_arr[] = $val->jcqy;
|
|
|
+ // dd($val);
|
|
|
+ $area_arr[] = $val->xjqy;
|
|
|
$res[] = [
|
|
|
- 'area' => $val->jcqy,
|
|
|
+ 'area' => $val->xjqy,
|
|
|
'date' => $val->lrsj,
|
|
|
- 'data_id' => $val->id,
|
|
|
- 'url' => '/mobilemode/formbasebrowserview.jsp?billid=' . $val->id . '&modeId=580&formId=-976',
|
|
|
+ 'data_id' => $val->ID,
|
|
|
+ 'url' => 'http://anstatic.nxmy.com:8011/assets/html/xixuan/pages/detail.html?id='.$val->ID,
|
|
|
];
|
|
|
}
|
|
|
- $area_list = DB::connection('mysql_fwview')->table('formtable_main_974')
|
|
|
- ->whereNotIn('qymc', $area_arr)
|
|
|
- ->where('szxmc', $depart)->orderBy('areaid', 'asc')->get();
|
|
|
+
|
|
|
+ $area_list = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')
|
|
|
+ ->whereNotIn('qymc', $area_arr)
|
|
|
+ ->where('szxmc', $depart)->orderBy('areaid', 'asc')->get();
|
|
|
foreach ($area_list as $area) {
|
|
|
$res[] = [
|
|
|
'area' => $area->qymc,
|
|
@@ -142,14 +250,15 @@ class ApiService{
|
|
|
$result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
|
$result['data'] = [];
|
|
|
|
|
|
- $depart = DB::connection('mysql_fwview')->table('hrmdepartment')
|
|
|
- ->where('subcompanyid1', 49)
|
|
|
- ->where('departmentname', 'like', '%' . '洗煤厂')
|
|
|
- ->where('id', '!=', 1602)->get();
|
|
|
+ $depart = DB::connection('mysql_fwe10_eteams')->table('department')
|
|
|
+ ->where('parent', '100001980000000049')
|
|
|
+ ->where('name', 'like', '%' . '洗煤厂')
|
|
|
+ ->where('id','!=','100001590000001602')
|
|
|
+ ->get();
|
|
|
|
|
|
$depart_arr = [];
|
|
|
foreach ($depart as $key => $val) {
|
|
|
- $depart_name = str_replace('洗选中心', '', $val->DEPARTMENTNAME);
|
|
|
+ $depart_name = str_replace('洗选中心', '', $val->fullname);
|
|
|
$depart_arr[$key] = $depart_name;
|
|
|
}
|
|
|
|
|
@@ -165,12 +274,10 @@ class ApiService{
|
|
|
$result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
|
$result['data'] = [];
|
|
|
|
|
|
- $query = DB::connection('mysql_fwview')->table('uf_wghgl_new');
|
|
|
-
|
|
|
+ $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl');
|
|
|
if ($depart != 'all') {
|
|
|
$query = $query->where('xjdw', $depart);
|
|
|
}
|
|
|
-
|
|
|
if ($date_type == 'month') {
|
|
|
$query = $query->where(DB::raw('MONTH(lrsj)'), DB::raw('MONTH(CURDATE())'));
|
|
|
} else if ($date_type == 'quarter') {
|
|
@@ -178,59 +285,41 @@ class ApiService{
|
|
|
} else {
|
|
|
$query = $query->where(DB::raw('WEEK(lrsj)'), DB::raw('WEEK(CURDATE())'));
|
|
|
}
|
|
|
-
|
|
|
- $query = $query->groupBy('lrdate', 'xjdw', 'lrr', 'dwmc')
|
|
|
- ->select(
|
|
|
- [
|
|
|
- DB::raw('DATE(lrsj) as lrdate'),
|
|
|
- 'xjdw',
|
|
|
- 'lrr',
|
|
|
- 'dwmc'
|
|
|
- ]
|
|
|
- )
|
|
|
- ->get();
|
|
|
-
|
|
|
- $data = [];
|
|
|
- $pie = [];
|
|
|
- foreach ($query as $key => $val) {
|
|
|
- $lastname = DB::connection('mysql_fwview')->table('hrmresource')
|
|
|
- ->where('id', $val->lrr)->value('lastname');
|
|
|
- $allcount = DB::connection('mysql_fwview')->table('formtable_main_974')
|
|
|
- ->where('szxmc', $val->xjdw)->count();
|
|
|
-
|
|
|
- $detail = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
|
- ->where('xjdw', $val->xjdw)
|
|
|
- ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
|
|
|
- ->where('lrr', $val->lrr)->count();
|
|
|
-
|
|
|
- if ($allcount <= 0) {
|
|
|
- continue;
|
|
|
+ $query = $query->get();
|
|
|
+
|
|
|
+ $people_list = [];
|
|
|
+ if(count($query) > 0){
|
|
|
+ for($i=0;$i<count($query);$i++){
|
|
|
+ if(!in_array($query[$i]->lrr,$people_list)){
|
|
|
+ $people_list[] = $query[$i]->lrr;
|
|
|
+ }
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
- if ($detail >= $allcount) {
|
|
|
- $data[$val->lrr] = [
|
|
|
- 'department' => $val->dwmc,
|
|
|
- 'lastname' => $lastname,
|
|
|
- 'person_id' => $val->lrr,
|
|
|
- 'count' => isset($data[$val->lrr]['count']) ? $data[$val->lrr]['count'] + 1 : 1,
|
|
|
- ];
|
|
|
- $pie[$val->lrr] = [
|
|
|
- 'name' => $lastname,
|
|
|
- 'value' => isset($data[$val->lrr]['value']) ? $data[$val->lrr]['value'] + 1 : 1,
|
|
|
- ];
|
|
|
- } else {
|
|
|
- continue;
|
|
|
+ $list = [];
|
|
|
+ $pie = [];
|
|
|
+
|
|
|
+ if(count($people_list) > 0){
|
|
|
+ for($i=0;$i<count($people_list);$i++){
|
|
|
+ $count = 0;
|
|
|
+ for($j=0;$j<count($query);$j++){
|
|
|
+ if($people_list[$i] == $query[$j]->lrr){
|
|
|
+ $list[$i]['department'] = $query[$j]->dwmc;
|
|
|
+ $count++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $lrr = explode('|',$people_list[$i]);
|
|
|
+ $list[$i]['lastname'] = $lrr[0];
|
|
|
+ $list[$i]['person_id'] = $lrr[1];
|
|
|
+ $list[$i]['count'] = $count;
|
|
|
+
|
|
|
+ $pie[$i]['name'] = $lrr[0];
|
|
|
+ $pie[$i]['value'] = $count;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $data_arr = array_column($data, 'count');
|
|
|
- array_multisort($data_arr, SORT_DESC, $data);
|
|
|
-
|
|
|
- $pie_arr = array_column($pie, 'value');
|
|
|
- array_multisort($pie_arr, SORT_DESC, $pie);
|
|
|
-
|
|
|
- $result['data']['list'] = $data;
|
|
|
- $result['data']['pie'] = $pie;
|
|
|
+ $result['data']['list'] = $list;
|
|
|
+ $result['data']['pie'] = $pie;
|
|
|
|
|
|
return $result;
|
|
|
}
|
|
@@ -242,7 +331,7 @@ class ApiService{
|
|
|
$result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
|
$result['data'] = [];
|
|
|
|
|
|
- $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')->where('lrr', $person_id);
|
|
|
+ $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')->where('lrr', 'like' ,'%'.$person_id.'%');
|
|
|
|
|
|
if ($depart != 'all') {
|
|
|
$query = $query->where('xjdw', $depart);
|
|
@@ -256,42 +345,26 @@ class ApiService{
|
|
|
$query = $query->where(DB::raw('WEEK(lrsj)'), DB::raw('WEEK(CURDATE())'));
|
|
|
}
|
|
|
|
|
|
- $query = $query->groupBy('lrdate', 'xjdw')
|
|
|
- ->select(
|
|
|
- [
|
|
|
- 'xjdw',
|
|
|
- DB::raw('DATE(lrsj) as lrdate'),
|
|
|
- ]
|
|
|
- )
|
|
|
- ->get();
|
|
|
+ $query = $query->select(
|
|
|
+ [
|
|
|
+ 'xjqy',
|
|
|
+ DB::raw('DATE(lrsj) as lrdate'),
|
|
|
+ 'lrr',
|
|
|
+ 'xjdw'
|
|
|
+ ]
|
|
|
+ )->get();
|
|
|
|
|
|
$data = [];
|
|
|
foreach ($query as $key => $val) {
|
|
|
- $lastname = DB::connection('mysql_fwview')->table('hrmresource')
|
|
|
- ->where('id', $person_id)->value('lastname');
|
|
|
-
|
|
|
- $allcount = DB::connection('mysql_fwview')->table('formtable_main_974')
|
|
|
- ->where('szxmc', $val->xjdw)->count();
|
|
|
-
|
|
|
- $detail = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
|
- ->where('xjdw', $val->xjdw)
|
|
|
- ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
|
|
|
- ->where('lrr', $person_id)->count();
|
|
|
-
|
|
|
- if ($allcount <= 0) {
|
|
|
- continue;
|
|
|
- }
|
|
|
-
|
|
|
- if ($detail >= $allcount) {
|
|
|
- $data[] = [
|
|
|
- 'lastname' => $lastname,
|
|
|
- 'person_id' => $person_id,
|
|
|
- 'depart' => $val->xjdw,
|
|
|
- 'date' => $val->lrdate
|
|
|
- ];
|
|
|
- } else {
|
|
|
- continue;
|
|
|
- }
|
|
|
+ $lrr = explode('|',$val->lrr);
|
|
|
+
|
|
|
+ $data[] = [
|
|
|
+ 'lastname' => $lrr[0],
|
|
|
+ 'person_id' => $val->lrr,
|
|
|
+ 'depart' => $val->xjdw,
|
|
|
+ 'date' => $val->lrdate,
|
|
|
+ 'xjqy' => $val->xjqy
|
|
|
+ ];
|
|
|
}
|
|
|
|
|
|
$data_arr = array_column($data, 'date');
|
|
@@ -310,20 +383,24 @@ class ApiService{
|
|
|
$result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
|
$result['data'] = [];
|
|
|
|
|
|
- $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
|
- ->join('hrmresource', 'uf_wghgl_new.lrr', '=', 'hrmresource.id')
|
|
|
- ->where('lrr', $person_id)
|
|
|
- ->where('xjdw', $depart)
|
|
|
- ->where('lrsj', 'like', $date . '%')
|
|
|
- ->orderBy('lrsj', 'desc')
|
|
|
- ->select(
|
|
|
- [
|
|
|
- 'uf_wghgl_new.id',
|
|
|
- 'lastname',
|
|
|
- 'jcqy',
|
|
|
- 'lrsj',
|
|
|
- ]
|
|
|
- )->get();
|
|
|
+ $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')
|
|
|
+ ->where('lrr', $person_id)
|
|
|
+ ->where('xjdw', $depart)
|
|
|
+ ->where('lrsj', 'like', $date . '%')
|
|
|
+ ->orderBy('lrsj', 'desc')
|
|
|
+ ->select([
|
|
|
+ 'ID',
|
|
|
+ 'lrr',
|
|
|
+ 'xjqy',
|
|
|
+ 'lrsj',
|
|
|
+ ])->get();
|
|
|
+
|
|
|
+ if(count($query) > 0){
|
|
|
+ for($i=0;$i<count($query);$i++){
|
|
|
+ $lrr = explode('|',$query[$i]->lrr);
|
|
|
+ $query[$i]->lrr_name = $lrr[0];
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
$query = json_decode($query);
|
|
|
|
|
@@ -339,22 +416,30 @@ class ApiService{
|
|
|
$result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
|
$result['data'] = [];
|
|
|
|
|
|
- $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
|
- ->join('hrmresource', 'uf_wghgl_new.lrr', '=', 'hrmresource.id')
|
|
|
- ->where('uf_wghgl_new.id', $id)
|
|
|
- ->select(
|
|
|
- [
|
|
|
- 'lastname',
|
|
|
- 'dwmc',
|
|
|
- 'xjdw',
|
|
|
- 'jcqy',
|
|
|
- 'jclx',
|
|
|
- 'lrsj',
|
|
|
- 'jcwt',
|
|
|
- 'wtms',
|
|
|
- 'dkpz'
|
|
|
- ]
|
|
|
- )->get();
|
|
|
+ $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')
|
|
|
+ ->where('id', $id)
|
|
|
+ ->select(
|
|
|
+ [
|
|
|
+ 'lrr',
|
|
|
+ 'dwmc',
|
|
|
+ 'xjdw',
|
|
|
+ 'xjqy',
|
|
|
+ 'jclx',
|
|
|
+ 'lrsj',
|
|
|
+ 'jcwt',
|
|
|
+ 'wtms',
|
|
|
+ 'dkpz',
|
|
|
+ 'zgzp',
|
|
|
+ 'zgr'
|
|
|
+ ]
|
|
|
+ )->get();
|
|
|
+
|
|
|
+ if(count($query) > 0){
|
|
|
+ for($i=0;$i<count($query);$i++){
|
|
|
+ $lrr = explode('|',$query[$i]->lrr);
|
|
|
+ $query[$i]->lrr_name = $lrr[0];
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
$query = json_decode($query);
|
|
|
|
|
@@ -370,7 +455,7 @@ class ApiService{
|
|
|
$result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
|
$result['data'] = [];
|
|
|
|
|
|
- $query = DB::connection('mysql_fwview')->table('uf_wghgl_new');
|
|
|
+ $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl');
|
|
|
|
|
|
if ($start_date == $end_date) {
|
|
|
$query = $query->where('lrsj', 'like', $start_date . '%');
|
|
@@ -383,54 +468,48 @@ class ApiService{
|
|
|
}
|
|
|
|
|
|
if ($person) {
|
|
|
- $person_id = DB::connection('mysql_fwview')->table('hrmresource')
|
|
|
- ->where('lastname', 'like', '%' . $person . '%')->pluck('id')->all();
|
|
|
- $query = $query->whereIn('lrr', $person_id);
|
|
|
+ // $person_id = DB::connection('mysql_fwview')->table('hrmresource')
|
|
|
+ // ->where('lastname', 'like', '%' . $person . '%')->pluck('id')->all();1
|
|
|
+ $query = $query->whereIn('lrr', 'like','%'.$person_id.'%');
|
|
|
}
|
|
|
|
|
|
- $query = $query->orderBy('lrdate', 'desc')->groupBy('lrdate', 'xjdw', 'lrr')
|
|
|
- ->select(
|
|
|
- [
|
|
|
- DB::raw('DATE(lrsj) as lrdate'),
|
|
|
- 'xjdw',
|
|
|
- 'lrr'
|
|
|
- ]
|
|
|
- )
|
|
|
- ->get();
|
|
|
+ $query = $query->orderBy('lrdate', 'desc')->groupBy('lrsj', 'xjdw', 'lrr','jcwt','id','zgr')
|
|
|
+ ->select(
|
|
|
+ [
|
|
|
+ DB::raw('DATE(lrsj) as lrdate'),
|
|
|
+ 'xjdw',
|
|
|
+ 'lrr',
|
|
|
+ 'jcwt',
|
|
|
+ 'id',
|
|
|
+ 'zgr'
|
|
|
+ ]
|
|
|
+ )
|
|
|
+ ->get();
|
|
|
|
|
|
$data = [];
|
|
|
foreach ($query as $key => $val) {
|
|
|
- $lastname = DB::connection('mysql_fwview')->table('hrmresource')
|
|
|
- ->where('id', $val->lrr)->value('lastname');
|
|
|
- $allcount = DB::connection('mysql_fwview')->table('formtable_main_974')
|
|
|
- ->where('szxmc', $val->xjdw)->count();
|
|
|
-
|
|
|
- $detail = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
|
- ->where('xjdw', $val->xjdw)
|
|
|
- ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
|
|
|
- ->where('lrr', $val->lrr)->count();
|
|
|
-
|
|
|
- if ($allcount <= 0) {
|
|
|
- continue;
|
|
|
+ $lastname = explode('|',$val->lrr)[0];
|
|
|
+ if($val->jcwt == '有'){
|
|
|
+ $is_complete = 0;
|
|
|
+ }else{
|
|
|
+ $is_complete = 1;
|
|
|
}
|
|
|
|
|
|
- if ($detail >= $allcount) {
|
|
|
- $data[] = [
|
|
|
- 'depart' => $val->xjdw,
|
|
|
- 'lastname' => $lastname,
|
|
|
- 'person_id' => $val->lrr,
|
|
|
- 'date' => $val->lrdate,
|
|
|
- 'is_complete' => 1
|
|
|
- ];
|
|
|
- } else {
|
|
|
- $data[] = [
|
|
|
- 'depart' => $val->xjdw,
|
|
|
- 'lastname' => $lastname,
|
|
|
- 'person_id' => $val->lrr,
|
|
|
- 'date' => $val->lrdate,
|
|
|
- 'is_complete' => 0
|
|
|
- ];
|
|
|
+ $zgr = explode('|',$val->zgr);
|
|
|
+ $zgr_id = '';
|
|
|
+ if(count($zgr) > 1){
|
|
|
+ $zgr_id = $zgr[1];
|
|
|
}
|
|
|
+ $data[] = [
|
|
|
+ 'depart' => $val->xjdw,
|
|
|
+ 'lastname' => $lastname,
|
|
|
+ 'person_id' => $val->lrr,
|
|
|
+ 'date' => $val->lrdate,
|
|
|
+ 'is_complete' => $is_complete,
|
|
|
+ 'id' => $val->id,
|
|
|
+ 'zgr_id' => $zgr_id
|
|
|
+ ];
|
|
|
+
|
|
|
}
|
|
|
|
|
|
$result['data'] = $data;
|