|
|
@@ -3,6 +3,7 @@ package com.yw.hr.attendance.service;
|
|
|
import java.sql.SQLException;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
@@ -10,11 +11,14 @@ import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import com.yw.core.framework.util.LogUtil;
|
|
|
import com.yw.core.framework.view.service.PagerService;
|
|
|
import com.yw.core.session.IAppSession;
|
|
|
import com.yw.core.utils.Constant;
|
|
|
import com.yw.core.utils.DateUtil;
|
|
|
import com.yw.core.utils.StringUtil;
|
|
|
+import com.yw.eu.base.user.dao.UserDao;
|
|
|
+import com.yw.eu.base.user.model.User;
|
|
|
import com.yw.hr.attendance.dao.AttendanceRecordDao;
|
|
|
import com.yw.hr.attendance.dao.AttendanceRecordResultDao;
|
|
|
import com.yw.hr.attendance.model.AttendanceRecord;
|
|
|
@@ -30,6 +34,8 @@ public class AttendanceRecordServiceImpl implements AttendanceRecordService {
|
|
|
@Autowired
|
|
|
private StaffDao StaffDao;
|
|
|
@Autowired
|
|
|
+ private UserDao userDao;
|
|
|
+ @Autowired
|
|
|
private HrDataDictionaryDao hrDataDictionaryDao;
|
|
|
@Autowired
|
|
|
private AttendanceRecordResultDao attendanceRecordResultDao;
|
|
|
@@ -175,7 +181,19 @@ public class AttendanceRecordServiceImpl implements AttendanceRecordService {
|
|
|
try {
|
|
|
String arr_user_id[]=sys_user_ids.split(",");
|
|
|
for (int i = 0; i < arr_user_id.length; i++) {
|
|
|
- Map<String, Object> map=StaffDao.getSingleStaff(arr_user_id[i]);
|
|
|
+ Map<String, Object> map= new HashMap<>();
|
|
|
+ try {
|
|
|
+ map=StaffDao.getSingleStaff(arr_user_id[i]);
|
|
|
+ }catch(Exception ex) {
|
|
|
+ LogUtil.error("²éÕÒÈËÊÂÐÅÏ¢Òì³££º" + ex.getMessage());
|
|
|
+ }
|
|
|
+ if(map == null) {
|
|
|
+ map= new HashMap<>();
|
|
|
+ }
|
|
|
+ if(map.size()== 0) {
|
|
|
+ User user = userDao.loadById(Long.parseLong(arr_user_id[i]));
|
|
|
+ map.put("staff_name", user.getName());
|
|
|
+ }
|
|
|
AttendanceRecord ar2=new AttendanceRecord();
|
|
|
ar2.setRecord_id(StringUtil.getSeq());
|
|
|
if(map.get("att_user_id") !=null && !"".equals(map.get("att_user_id").toString())){
|
wu98hay