|
|
@@ -1000,8 +1000,9 @@ class Synchronization extends Api
|
|
|
//获取员工资料
|
|
|
$employeeData = \db('人事_基本资料')
|
|
|
->where('mn_员工编号','<>','')
|
|
|
- ->field('rtrim(员工编号) as 员工编号,rtrim(mn_员工编号) as 美浓员工编号')
|
|
|
+ ->field('rtrim(mn_员工编号) as 美浓员工编号')
|
|
|
->select();
|
|
|
+ $employee = array_column($employeeData,'美浓员工编号');
|
|
|
//循环判断机台、员工编号
|
|
|
$j = 0;
|
|
|
$data = [];
|
|
|
@@ -1021,13 +1022,15 @@ class Synchronization extends Api
|
|
|
$name = [];
|
|
|
//判断员工编号,如果不存在写入日志文件
|
|
|
for($i=1;$i<=10;$i++){
|
|
|
- foreach ($employeeData as $vv){
|
|
|
- if ($value['sczl_bh'.$i] === $vv['美浓员工编号']){
|
|
|
- $data[$key]['sczl_bh'.$i] = $vv['员工编号'];
|
|
|
- }else{
|
|
|
- array_push($name,$value['sczl_bh'.$i]);
|
|
|
- }
|
|
|
+ if (in_array($data[$key]['sczl_bh'.$i],$employee)){
|
|
|
+ $data[$key]['sczl_bh'.$i] = \db('人事_基本资料')
|
|
|
+ ->where('mn_员工编号',$data[$key]['sczl_bh'.$i])
|
|
|
+ ->value('员工编号');
|
|
|
+ }else{
|
|
|
+ array_push($name,$value['sczl_bh'.$i]);
|
|
|
+ $data[$key]['sczl_bh'.$i] = '';
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
$name = array_unique($name);
|
|
|
$filename = ROOT_PATH.'public/'.date('Y-m-d',time()).'/'.$value['sczl_jtbh'].'日志文件.txt';
|