Merge remote-tracking branch 'origin/dev' into dev

src/main/java/org/rcisoft/sys/attendance/entity/Attendance.java

@@ -62,4 +62,9 @@ public class Attendance {
     private Integer pageSize;
     // 排序方式
     private Integer sort;
+
+    // 上班打卡设备
+    private String workDeviceName;
+    // 下班打卡设备
+    private String officeDeviceName;
 }

src/main/java/org/rcisoft/sys/attendance/schedule/AttendanceSyncSchedule.java

@@ -49,6 +49,8 @@ public class AttendanceSyncSchedule {
             attendanceSync.setPositionLabel(all.get(i).getPositionName());
             attendanceSync.setWorkHours(all.get(i).getWorkShift());
             attendanceSync.setOffHours(all.get(i).getClosingTime());
+            attendanceSync.setWorkDeviceName(all.get(i).getWorkDeviceName());
+            attendanceSync.setOffDeviceName(all.get(i).getOfficeDeviceName());
             attendanceSync.setDateOfAttendance(all.get(i).getKqDate());
             attendanceSync.setTimeOnJob(all.get(i).getDuration());
             attendanceSync.setNltBz(sysUser.getNltBz());

src/main/java/org/rcisoft/sys/attendance/service/impl/AttendanceServiceImpl.java

@@ -93,7 +93,9 @@ public class AttendanceServiceImpl implements AttendanceService {
             if (begin.compareTo(end) > 0)
                 return null;
             attendance.setWorkShift(sdf.format(work.getCrossTime()));
+            attendance.setWorkDeviceName(work.getDeviceName());
             attendance.setClosingTime(sdf.format(out.getCrossTime()));
+            attendance.setOfficeDeviceName(out.getDeviceName());
         } else
             return null;
         Date beginTime = null;

src/main/resources/mapper/AttendanceSyncMapper.xml

@@ -86,6 +86,8 @@
             <if test="entity.positionLabel != null">position_label ,</if>
             <if test="entity.workHours != null">work_hours ,</if>
             <if test="entity.offHours != null">off_hours ,</if>
+            <if test="entity.workDeviceName != null">work_device_name ,</if>
+            <if test="entity.offDeviceName != null">off_device_name ,</if>
             <if test="entity.dateOfAttendance != null">date_of_attendance ,</if>
             <if test="entity.timeOnJob != null">time_on_job ,</if>
             <if test="entity.nltBz != null">nlt_bz ,</if>
@@ -105,6 +107,8 @@
             <if test="entity.positionLabel != null">#{entity.positionLabel},</if>
             <if test="entity.workHours != null">#{entity.workHours},</if>
             <if test="entity.offHours != null">#{entity.offHours},</if>
+            <if test="entity.workDeviceName != null">#{entity.workDeviceName} ,</if>
+            <if test="entity.offDeviceName != null">#{entity.offDeviceName} ,</if>
             <if test="entity.dateOfAttendance != null">#{entity.dateOfAttendance},</if>
             <if test="entity.timeOnJob != null">#{entity.timeOnJob},</if>
             <if test="entity.nltBz != null">#{entity.nltBz},</if>