OA打卡时间bug及导出地址

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/service/AttendanceService.java

@@ -21,8 +21,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 import java.io.FileNotFoundException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -117,7 +115,7 @@ public class AttendanceService extends ServiceImpl<AttendanceMapper, Attendance>
             int type = ValuePool.nullable(attendance.getType(), 0);
             Long userId = attendance.getUserId();
             int dayOfMonth = attendance.getCreateDate().getDayOfMonth();
-            String attendanceTime = String.format("%tT", attendance.getCreateDate()) + " " + attendance.getStatusDesc();
+            String attendanceTime = String.format("%tT", attendance.getCreateDate()) + " " + attendance.getStatusDesc()+" "+attendance.getAddress();
             switch (type) {
                 case 1:
                 case 11:

lift-enterprise-service/src/main/resources/mapper/oa/AttendanceMapper.xml

@@ -17,11 +17,11 @@
 
         <result column="username" property="username" jdbcType="VARCHAR" />
 		<result column="top_time" property="topTime" jdbcType="TIMESTAMP" />
-		<result column="down_time" property="updateDate" jdbcType="TIMESTAMP" />
-		<result column="top_time_pm" property="updateDate" jdbcType="TIMESTAMP" />
-		<result column="down_time_pm" property="updateDate" jdbcType="TIMESTAMP" />
-		<result column="top_time_ot" property="updateDate" jdbcType="TIMESTAMP" />
-		<result column="down_time_ot" property="updateDate" jdbcType="TIMESTAMP" />
+		<result column="down_time" property="downTime" jdbcType="TIMESTAMP" />
+		<result column="top_time_pm" property="topTimePm" jdbcType="TIMESTAMP" />
+		<result column="down_time_pm" property="downTimePm" jdbcType="TIMESTAMP" />
+		<result column="top_time_ot" property="topTimeOt" jdbcType="TIMESTAMP" />
+		<result column="down_time_ot" property="downTimeOt" jdbcType="TIMESTAMP" />
 	</resultMap>
 
 	<!--根据条件分页查询-->