Skip to content

D
dd_school
Commit 0cde0ab9 by xuwenhao
Options

修改打卡记录分页

parent 835041b2
Showing with 71 additions and 18 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAtt/SchoolAttController.java
......@@ -61,7 +61,8 @@ public class SchoolAttController extends BaseController {
*/
@GetMapping("/list")
public TableDataInfo list(SchoolAtt schoolAtt) {
List<SchoolAttVO> list = schoolAttService.queryList(schoolAtt);
startPage();
List<SchoolAtt> list = schoolAttService.queryList(schoolAtt);
return getDataTable(list);
}
......@@ -71,7 +72,8 @@ public class SchoolAttController extends BaseController {
@GetMapping("/personalList")
public TableDataInfo personalList(SchoolAtt schoolAtt) {
schoolAtt.setUserId(getUserId());
List<SchoolAttVO> list = schoolAttService.queryList(schoolAtt);
startPage();
List<SchoolAtt> list = schoolAttService.queryList(schoolAtt);
return getDataTable(list);
}
......@@ -94,7 +96,7 @@ public class SchoolAttController extends BaseController {
public TableDataInfo gradeList(SchoolAtt schoolAtt) {
//获取当前登录人所在级部
//获取当前学年
int schoolYear = HolidayDateUtil.getSchoolYear();
// int schoolYear = HolidayDateUtil.getSchoolYear();
//List<SchoolGrade> gradeIds = gradeMentorService.selectGrades(getUserId(),schoolYear);
List<SchoolGrade> gradeIds = gradeMentorService.selectGradeList(getUserId());
if(StringUtils.isNull(gradeIds) || gradeIds.size() == 0){
......@@ -116,7 +118,8 @@ public class SchoolAttController extends BaseController {
//设置查询条件，级部id，类型为教工
//schoolAtt.setOrgid(mentor.get(0).getGradeId());
schoolAtt.setUserType(TEACH);
List<SchoolAttVO> list = schoolAttService.queryGradeList(idList,schoolAtt);
startPage();
List<SchoolAtt> list = schoolAttService.queryGradeList(idList, schoolAtt);
return getDataTable(list);
}
......@@ -126,7 +129,7 @@ public class SchoolAttController extends BaseController {
@PostMapping("/gradeList/export")
public void gradeListExport(SchoolAtt schoolAtt, HttpServletResponse response) {
//获取当前学年
int schoolYear = HolidayDateUtil.getSchoolYear();
// int schoolYear = HolidayDateUtil.getSchoolYear();
/*List<SchoolGrade> gradeIds = gradeMentorService.selectGrades(getUserId(),schoolYear);
if(StringUtils.isNull(gradeIds) || gradeIds.size() == 0){
throw new ServiceException("非级部成员，无法查看");
......@@ -166,7 +169,8 @@ public class SchoolAttController extends BaseController {
//设置查询条件，部门id，类型为职工
schoolAtt.setOrgid(getDeptId());
schoolAtt.setUserType(EMPLOYEE);
List<SchoolAttVO> list = schoolAttService.queryList(schoolAtt);
startPage();
List<SchoolAtt> list = schoolAttService.queryList(schoolAtt);
return getDataTable(list);
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAtt/SchoolAttMonController.java
......@@ -92,7 +92,7 @@ public class SchoolAttMonController extends BaseController {
public TableDataInfo gradeList(SchoolAttMon schoolAttMon)
{
//获取当前学年
int schoolYear = HolidayDateUtil.getSchoolYear();
// int schoolYear = HolidayDateUtil.getSchoolYear();
//获取当前登录人所在级部(多个级部)
/*List<SchoolGrade> gradeIds = gradeMentorService.selectGrades(getUserId(),schoolYear);
if(StringUtils.isNull(gradeIds) || gradeIds.size() == 0){
......@@ -128,7 +128,7 @@ public class SchoolAttMonController extends BaseController {
public void exportGrade(HttpServletResponse response, SchoolAttMon schoolAttMon)
{
//获取当前学年
int schoolYear = HolidayDateUtil.getSchoolYear();
// int schoolYear = HolidayDateUtil.getSchoolYear();
//获取当前登录人所在级部
//获取当前登录人所在级部(多个级部)
List<SchoolGrade> gradeIds = gradeMentorService.selectGradeList(getUserId());
......@@ -224,7 +224,9 @@ public class SchoolAttMonController extends BaseController {
throw new ServiceException("请选择需要批量提交的月份");
}
//获取当前学年
int schoolYear = HolidayDateUtil.getSchoolYear();
// int schoolYear = HolidayDateUtil.getSchoolYear();
// TODO 修改获取最新学年
int schoolYear = gradeService.isNewSchoolYear();
List<SchoolGrade> gradeIds = gradeMentorService.selectGrades(getUserId(),schoolYear);
if(StringUtils.isNull(gradeIds) || gradeIds.size() == 0){
//若管理员此时不是级部成员，则查出所有级部
......@@ -274,7 +276,9 @@ public class SchoolAttMonController extends BaseController {
throw new ServiceException("请选择需要批量初始化的月份");
}
//获取当前学年
int schoolYear = HolidayDateUtil.getSchoolYear();
// int schoolYear = HolidayDateUtil.getSchoolYear();
// TODO 修改最新学年
int schoolYear = gradeService.isNewSchoolYear();
List<SchoolGrade> gradeIds = gradeMentorService.selectGrades(getUserId(),schoolYear);
if(StringUtils.isNull(gradeIds) || gradeIds.size() == 0){
//若管理员此时不是级部成员，则查出所有级部
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolAtt/SchoolAttMapper.java
......@@ -23,4 +23,6 @@ public interface SchoolAttMapper extends BaseMapper<SchoolAtt> {
@Param("userType") String userType,
@Param("beginDate") Date beginDate,
@Param("endDate") Date endDate);
void insertAttList(@Param("list") List<SchoolAtt> list);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolAtt/SchoolAttMonServiceImpl.java
......@@ -750,7 +750,9 @@ public class SchoolAttMonServiceImpl extends ServiceImpl<SchoolAttMonMapper, Sch
* */
if(mid.compareTo(time2) <= 0){
//获取当前学年，教师所在班级
int schoolYear = getNewYear();
// int schoolYear = getNewYear();
// TODO 修改最新学年
int schoolYear = gradeMapper.isNewSchoolYear();
List<SchoolClassMentor> mentors = mentorMapper.getMentors(teacherVO.getId(),schoolYear);
//确保该教师在本学年有 所教班级
if(isNotNull(mentors) && mentors.size() > 0){
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolAtt/SchoolAttOtServiceImpl.java
......@@ -13,6 +13,7 @@ import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor;
import yangtz.cs.liu.campus.domain.time.SchoolTimeTable;
import yangtz.cs.liu.campus.mapper.schoolAtt.SchoolAttOtMapper;
import yangtz.cs.liu.campus.mapper.schoolClass.SchoolClassMentorMapper;
import yangtz.cs.liu.campus.mapper.schoolgrade.SchoolGradeMapper;
import yangtz.cs.liu.campus.mapper.time.SchoolTimeTableMapper;
import yangtz.cs.liu.campus.service.schoolAtt.ISchoolAttOtService;
import yangtz.cs.liu.campus.service.workDay.ISchoolWorkDayService;
......@@ -42,6 +43,9 @@ public class SchoolAttOtServiceImpl extends ServiceImpl<SchoolAttOtMapper, Schoo
@Autowired
private SchoolTimeTableMapper tableMapper;
@Autowired
private SchoolGradeMapper gradeMapper;
public static final String s = "00:00:00";
public static final String e = "23:59:59";
......@@ -214,7 +218,9 @@ public class SchoolAttOtServiceImpl extends ServiceImpl<SchoolAttOtMapper, Schoo
* */
if(mid.compareTo(schoolAttOt.getEndTime()) <= 0){
//获取当前学年，教师所在班级
int schoolYear = getNewYear();
// int schoolYear = getNewYear();
// TODO 修改最新学年
int schoolYear = gradeMapper.isNewSchoolYear();
List<SchoolClassMentor> mentors = mentorMapper.getMentors(schoolAttOt.getUserId(),schoolYear);
//确保该教师在本学年有 所教班级
if(isNotNull(mentors) && mentors.size() > 0){
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolAtt/ISchoolAttService.java
......@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.schoolAtt;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAtt;
import yangtz.cs.liu.campus.vo.schoolAtt.SchoolAttVO;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
......@@ -11,9 +12,9 @@ import java.util.List;
public interface ISchoolAttService extends IService<SchoolAtt> {
//查询打卡记录列表
public List<SchoolAttVO> queryList(SchoolAtt schoolAtt);
public List<SchoolAtt> queryList(SchoolAtt schoolAtt);
public List<SchoolAttVO> queryGradeList(List<Long> gradeIds,SchoolAtt schoolAtt);
public List<SchoolAtt> queryGradeList(List<Long> gradeIds,SchoolAtt schoolAtt);
//打卡导出
public List<SchoolAttVO> export(SchoolAtt schoolAtt);
......
smart-campus/src/main/resources/mapper/schoolAtt/SchoolAttMapper.xml
......@@ -41,8 +41,8 @@
where id = #{id}
</select>
<select id="queryList" resultType="yangtz.cs.liu.campus.domain.schoolAtt.SchoolAtt">
<include refid="selectSchoolAttVo" />
<select id="queryList" parameterType="yangtz.cs.liu.campus.domain.schoolAtt.SchoolAtt" resultMap="SchoolAttResult">
select id, device_num, teacher_code, user_id, user_name, user_type, orgid, orgname, clock_date, GROUP_CONCAT(clock_time) as clock_time, create_by, create_time, remark from school_att
<where>
del_flag = '0'
<if test="deviceNum != null and deviceNum != ''"> and device_num = #{deviceNum}</if>
......@@ -59,11 +59,12 @@
AND date_format(clock_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
GROUP BY device_num, teacher_code, user_id, user_name, user_type, orgid, orgname, clock_date
order by clock_date desc ,device_num asc
</select>
<select id="queryGradeList" resultType="yangtz.cs.liu.campus.domain.schoolAtt.SchoolAtt">
<include refid="selectSchoolAttVo" />
<select id="queryGradeList" parameterType="yangtz.cs.liu.campus.domain.schoolAtt.SchoolAtt" resultMap="SchoolAttResult">
select id, device_num, teacher_code, user_id, user_name, user_type, orgid, orgname, clock_date, GROUP_CONCAT(clock_time) as clock_time, create_by, create_time, remark from school_att
<where>
del_flag = '0'
<if test="entity.userName != null and entity.userName != ''"> and user_name like concat('%', #{entity.userName}, '%')</if>
......@@ -80,6 +81,7 @@
AND date_format(clock_date,'%y%m%d') &lt;= date_format(#{entity.params.endTime},'%y%m%d')
</if>
</where>
GROUP BY device_num, teacher_code, user_id, user_name, user_type, orgid, orgname, clock_date
order by clock_date desc ,device_num asc
</select>
......@@ -155,4 +157,36 @@
#{id}
</foreach>
</delete>
<insert id="insertAttList" parameterType="SchoolAtt" useGeneratedKeys="true" keyProperty="id">
<foreach collection="list" item="data" separator=";">
insert into school_att
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="data.deviceNum != null">device_num,</if>
<if test="data.teacherCode != null">teacher_code,</if>
<if test="data.userId != null">user_id,</if>
<if test="data.userName != null">user_name,</if>
<if test="data.userType != null">user_type,</if>
<if test="data.orgid != null">orgid,</if>
<if test="data.orgname != null">orgname,</if>
<if test="data.clockDate != null">clock_date,</if>
<if test="data.clockTime != null">clock_time,</if>
<if test="data.createBy != null">create_by,</if>
<if test="data.createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="data.deviceNum != null">#{data.deviceNum},</if>
<if test="data.teacherCode != null">#{data.teacherCode},</if>
<if test="data.userId != null">#{data.userId},</if>
<if test="data.userName != null">#{data.userName},</if>
<if test="data.userType != null">#{data.userType},</if>
<if test="data.orgid != null">#{data.orgid},</if>
<if test="data.orgname != null">#{data.orgname},</if>
<if test="data.clockDate != null">#{data.clockDate},</if>
<if test="data.clockTime != null">#{data.clockTime},</if>
<if test="data.createBy != null">#{data.createBy},</if>
<if test="data.createTime != null">#{data.createTime},</if>
</trim>
</foreach>
</insert>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment