更新

src/main/java/com/template/controller/SmartAttendanceController.java

@@ -687,7 +687,7 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
         LocalDateTime endTime = startTime.plusDays(1);
 
 //        获取单人单日的请假数据
-        List<SmartAttendance> ackVos= smartAttendanceService.ackDetail(userId,startTime,endTime);
+        List<AckDetailVo> ackVos= smartAttendanceService.ackDetail(userId,startTime,endTime);
 
         return CommonResult.ok(ackVos);
     }

src/main/java/com/template/mapper/SmartAttendanceMapper.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.SmartAttendance;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.template.model.vo.AskForLeaveScreenVo;
-import com.template.model.vo.AskForLeaveVo;
-import com.template.model.vo.ClasAttendanceVo;
-import com.template.model.vo.SmartAttendanceVo;
+import com.template.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -38,6 +35,6 @@ public interface SmartAttendanceMapper extends BaseMapper<SmartAttendance> {
 
     List<ClasAttendanceVo> getClassHistoricalAttendance(@Param("startTime") Date startTime,@Param("endTime") Date endTime,@Param("id") Integer id);
 
-    List<SmartAttendance> ackDetail(@Param("userId")  Integer userId,@Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime);
+    List<AckDetailVo> ackDetail(@Param("userId")  Integer userId, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
 }
 

src/main/java/com/template/model/vo/AckDetailVo.java

@@ -0,0 +1,29 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AckDetailVo {
+    private String name;
+
+    private String cardNo;
+
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(value = "请假原因")
+    private String reason;
+
+
+
+
+    @ApiModelProperty(value = "希沃发起时间")
+    private Date initiateTime;
+
+}

src/main/java/com/template/services/SmartAttendanceService.java

@@ -4,10 +4,7 @@ import com.template.model.pojo.SmartAttendance;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.pojo.SmartVisitor;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.AskForLeaveScreenVo;
-import com.template.model.vo.AskForLeaveVo;
-import com.template.model.vo.ClasAttendanceVo;
-import com.template.model.vo.SmartAttendanceVo;
+import com.template.model.vo.*;
 
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -52,5 +49,5 @@ public interface SmartAttendanceService extends IService<SmartAttendance> {
 
     Integer getClassAckHistoricalAttendance(int i, Date startTime, Date endTime, Integer id);
 
-    List<SmartAttendance> ackDetail(Integer userId, LocalDateTime startTime, LocalDateTime endTime);
+    List<AckDetailVo> ackDetail(Integer userId, LocalDateTime startTime, LocalDateTime endTime);
 }

src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java

@@ -9,10 +9,7 @@ import com.template.model.pojo.SmartAttendance;
 import com.template.mapper.SmartAttendanceMapper;
 import com.template.model.pojo.SmartVisitor;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.AskForLeaveScreenVo;
-import com.template.model.vo.AskForLeaveVo;
-import com.template.model.vo.ClasAttendanceVo;
-import com.template.model.vo.SmartAttendanceVo;
+import com.template.model.vo.*;
 import com.template.services.SmartAttendanceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -175,7 +172,7 @@ public class SmartAttendanceServiceImpl extends ServiceImpl<SmartAttendanceMappe
     }
 
     @Override
-    public List<SmartAttendance> ackDetail(Integer userId, LocalDateTime startTime, LocalDateTime endTime) {
+    public List<AckDetailVo> ackDetail(Integer userId, LocalDateTime startTime, LocalDateTime endTime) {
         return smartAttendanceMapper.ackDetail(userId,startTime,endTime);
     }
 }

src/main/resources/mapper/template/SmartAttendanceMapper.xml

@@ -159,12 +159,19 @@
         GROUP BY
             `status`
     </select>
-    <select id="ackDetail" resultType="com.template.model.pojo.SmartAttendance">
-        SELECT sat.*
+    <select id="ackDetail" resultType="com.template.model.vo.AckDetailVo">
+        SELECT sat.xw_user_name  as name,
+               su.card_no        as cardNo,
+               sat.initiate_time as initiateTime,
+               sat.start_time    as startTime,
+               sat.end_time      as endTime,
+               sat.reason        as reason
         FROM `smart_attendance` sat
+                 left join smart_user su
+                           on sat.user_id = su.id
         where sat.`status` = 6
           AND sat.deleted = 0
-          AND sat.user_id= #{userId}
+          AND sat.user_id = #{userId}
           AND sat.initiate_time >= #{startTime}
           AND #{endTime} >= sat.initiate_time
     </select>