From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/impl/GetAttendanceClassesTaskDetailBMOImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/impl/GetAttendanceClassesTaskDetailBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/impl/GetAttendanceClassesTaskDetailBMOImpl.java
index c90ffd1..8b0d29a 100644
--- a/service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/impl/GetAttendanceClassesTaskDetailBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/impl/GetAttendanceClassesTaskDetailBMOImpl.java
@@ -1,9 +1,10 @@
package com.java110.common.bmo.attendanceClassesTaskDetail.impl;
import com.java110.common.bmo.attendanceClassesTaskDetail.IGetAttendanceClassesTaskDetailBMO;
-import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
-import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
+import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
+import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
+import com.java110.intf.report.IReportAttendanceInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -18,6 +19,9 @@
@Autowired
private IAttendanceClassesTaskDetailInnerServiceSMO attendanceClassesTaskDetailInnerServiceSMOImpl;
+
+ @Autowired
+ private IReportAttendanceInnerServiceSMO reportAttendanceInnerServiceSMOImpl;
/**
* @param attendanceClassesTaskDetailDto
@@ -44,7 +48,20 @@
@Override
public ResponseEntity<String> getMonthAttendance(AttendanceClassesTaskDto attendanceClassesTaskDto) {
- return null;
+ int count = reportAttendanceInnerServiceSMOImpl.getMonthAttendanceCount(attendanceClassesTaskDto);
+
+ List<AttendanceClassesTaskDto> attendanceClassesTaskDtos = null;
+ if (count > 0) {
+ attendanceClassesTaskDtos = reportAttendanceInnerServiceSMOImpl.getMonthAttendance(attendanceClassesTaskDto);
+ } else {
+ attendanceClassesTaskDtos = new ArrayList<>();
+ }
+
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) attendanceClassesTaskDto.getRow()), count, attendanceClassesTaskDtos);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+ return responseEntity;
}
}
--
Gitblit v1.8.0