liu 2 лет назад
Родитель
Сommit
2517c62f9e

+ 5 - 0
src/main/java/com/template/api/SmartAttendanceControllerAPI.java

@@ -122,4 +122,9 @@ public interface SmartAttendanceControllerAPI {
     @ApiOperation(value = "班级考勤统计", notes = "班级考勤统计", httpMethod = "GET")
     CommonResult classHistoricalAttendance(@RequestParam String dateTime,@RequestParam int currentPage, @RequestParam int pageCount,String className);
 
+
+    @GetMapping(value = "/ackDetail")
+    @ApiOperation(value = "个人请假详情", notes = "个人请假详情", httpMethod = "GET")
+    CommonResult ackDetail(@RequestParam Integer userId,@RequestParam String dateTime);
+
 }

+ 13 - 0
src/main/java/com/template/controller/SmartAttendanceController.java

@@ -679,6 +679,19 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
         return CommonResult.ok(objectPage);
     }
 
+    @Override
+    @DESRespondSecret(validated = true)
+    public CommonResult ackDetail(Integer userId, String dateTime) {
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime startTime = LocalDateTime.parse(dateTime, dateTimeFormatter1);
+        LocalDateTime endTime = startTime.plusDays(1);
+
+//        获取单人单日的请假数据
+        List<SmartAttendance> ackVos= smartAttendanceService.ackDetail(userId,startTime,endTime);
+
+        return CommonResult.ok(ackVos);
+    }
+
     public PersonalLeaveListSchoolPeriodRecordsResult getXwAttendance(String startDate, String endDate, Integer currentPage, Integer pageSize) {
         //初始化客户端
         SeewoClient seewoClient = new DefaultSeewoClient(new Account(seewoConfig.getAppId(), seewoConfig.getAppSecret()));

+ 3 - 0
src/main/java/com/template/mapper/SmartAttendanceMapper.java

@@ -11,6 +11,7 @@ import com.template.model.vo.SmartAttendanceVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -36,5 +37,7 @@ public interface SmartAttendanceMapper extends BaseMapper<SmartAttendance> {
     IPage<AskForLeaveScreenVo> askForLeaveScreenPage(Page<AskForLeaveScreenVo> page, @Param("cardNo") String cardNo, @Param("ifVerification") String ifVerification);
 
     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);
 }
 

+ 3 - 0
src/main/java/com/template/services/SmartAttendanceService.java

@@ -9,6 +9,7 @@ import com.template.model.vo.AskForLeaveVo;
 import com.template.model.vo.ClasAttendanceVo;
 import com.template.model.vo.SmartAttendanceVo;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -50,4 +51,6 @@ public interface SmartAttendanceService extends IService<SmartAttendance> {
     List<ClasAttendanceVo> getClassHistoricalAttendance(Date startTime, Date endTime, Integer id);
 
     Integer getClassAckHistoricalAttendance(int i, Date startTime, Date endTime, Integer id);
+
+    List<SmartAttendance> ackDetail(Integer userId, LocalDateTime startTime, LocalDateTime endTime);
 }

+ 6 - 0
src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -172,4 +173,9 @@ public class SmartAttendanceServiceImpl extends ServiceImpl<SmartAttendanceMappe
         Integer count = this.count(queryWrapper);
         return count;
     }
+
+    @Override
+    public List<SmartAttendance> ackDetail(Integer userId, LocalDateTime startTime, LocalDateTime endTime) {
+        return smartAttendanceMapper.ackDetail(userId,startTime,endTime);
+    }
 }

+ 9 - 0
src/main/resources/mapper/template/SmartAttendanceMapper.xml

@@ -159,4 +159,13 @@
         GROUP BY
             `status`
     </select>
+    <select id="ackDetail" resultType="com.template.model.pojo.SmartAttendance">
+        SELECT sat.*
+        FROM `smart_attendance` sat
+        where sat.`status` = 6
+          AND sat.deleted = 0
+          AND sat.user_id= #{userId}
+          AND sat.initiate_time >= #{startTime}
+          AND #{endTime} >= sat.initiate_time
+    </select>
 </mapper>