Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-06-29 b173d31976fc4731b7c247d4038de92134eba317

 service-report/src/main/java/com/java110/report/smo/impl/ReportAttendanceInnerServiceSMOImpl.java

old mode 100644
new mode 100755
@@ -2,7 +2,9 @@


import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import com.java110.dto.PageDto;
import com.java110.dto.attendance.AttendanceClassesTaskDetailDto;
import com.java110.dto.attendance.AttendanceClassesTaskDto;
import com.java110.intf.report.IReportAttendanceInnerServiceSMO;
import com.java110.report.dao.IReportAttendanceServiceDao;
import com.java110.utils.util.BeanConvertUtil;
@@ -34,6 +36,17 @@

    @Override
    public List<AttendanceClassesTaskDto> getMonthAttendance(@RequestBody AttendanceClassesTaskDto attendanceClassesTaskDto) {
        int page = attendanceClassesTaskDto.getPage();

        if (page != PageDto.DEFAULT_PAGE) {
            attendanceClassesTaskDto.setPage((page - 1) * attendanceClassesTaskDto.getRow());
        }

        return BeanConvertUtil.covertBeanList(reportAttendanceServiceDaoImpl.getMonthAttendance(BeanConvertUtil.beanCovertMap(attendanceClassesTaskDto)),AttendanceClassesTaskDto.class);
    }

    @Override
    public List<AttendanceClassesTaskDetailDto> getMonthAttendanceDetail(@RequestBody AttendanceClassesTaskDto attendanceClassesTaskDto) {
        return BeanConvertUtil.covertBeanList(reportAttendanceServiceDaoImpl.getMonthAttendanceDetail(BeanConvertUtil.beanCovertMap(attendanceClassesTaskDto)),AttendanceClassesTaskDetailDto.class);
    }
}