|
@@ -133,7 +133,7 @@ class LargeWasteRewardPunish extends Api
|
|
|
$total = db()->table('db_大废品')->where($where)->count();
|
|
$total = db()->table('db_大废品')->where($where)->count();
|
|
|
}
|
|
}
|
|
|
$gd = db()->table('工单_印件资料')->column('Yj_Gdbh, yj_yjmc');
|
|
$gd = db()->table('工单_印件资料')->column('Yj_Gdbh, yj_yjmc');
|
|
|
- $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名');
|
|
|
|
|
|
|
+ $rs = db()->table('人事_基本资料')->where('员工姓名','<>','通用编号')->column('员工编号, 员工姓名');
|
|
|
foreach ($rows as $key=>$value) {
|
|
foreach ($rows as $key=>$value) {
|
|
|
$rows[$key]['yj_yjmc'] = array_key_exists($value['sczl_gdbh'],$gd) ? sprintf("%02d", $value['sczl_yjno']).'-'.trim($gd[$value['sczl_gdbh']]) : '';
|
|
$rows[$key]['yj_yjmc'] = array_key_exists($value['sczl_gdbh'],$gd) ? sprintf("%02d", $value['sczl_yjno']).'-'.trim($gd[$value['sczl_gdbh']]) : '';
|
|
|
$rows[$key]['JL_bh1'] = array_key_exists($value['JL_bh1'],$rs) ? trim($rs[$value['JL_bh1']]) : '';
|
|
$rows[$key]['JL_bh1'] = array_key_exists($value['JL_bh1'],$rs) ? trim($rs[$value['JL_bh1']]) : '';
|