src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.java
@@ -39,7 +39,16 @@ * @param checkInRecords * @return */ List<CheckInRecordsVO> selectCheckInRecordsPage(IPage page, @Param("checkInRecords") CheckInRecordsVO checkInRecords); List<CheckInRecordsVO> selectCheckInRecordsPage(IPage page, @Param("checkInRecords") CheckInRecordsVO checkInRecords, @Param("deptIdList") List<Long> deptIdList); // List<CheckInRecordsVO> selectCheckInRecordsPage(IPage<CheckInRecordsVO> page, // @Param("checkInRecords")CheckInRecordsVO checkInRecords, // @Param("isAdministrator") Integer isAdministrator, // @Param("gridCodeList")List gridCodeList, // @Param("regionChildCodesList")List regionChildCodesList); /** @@ -57,4 +66,5 @@ * @return 打卡记录表集合 */ public List<CheckInRecordsDTO> selectCheckInRecordsList(CheckInRecordsDTO checkInRecordsDTO); } src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml
@@ -19,27 +19,48 @@ jcir.lat, jcir.address, jcir.deleted_flag, bu.`name` bu.`name`, bd.region_code FROM jczz_check_in_records jcir LEFT JOIN blade_user bu ON bu.id = jcir.create_user_id LEFT JOIN blade_dept bd on bd.id = bu.dept_id <where> <if test="checkInRecords.id != null "> and jcir.id = #{checkInRecords.id}</if> <if test="checkInRecords.createUserId != null "> and jcir.create_user_id = #{checkInRecords.createUserId}</if> <if test="checkInRecords.createUserId != null ">and jcir.create_user_id = #{checkInRecords.createUserId} </if> <if test="checkInRecords.createTime != null "> and jcir.create_time = #{checkInRecords.createTime}</if> <if test="checkInRecords.workTheme != null and checkInRecords.workTheme != ''"> and jcir.work_theme = #{checkInRecords.workTheme}</if> <if test="checkInRecords.workContent != null and checkInRecords.workContent != ''"> and jcir.work_content = #{checkInRecords.workContent}</if> <if test="checkInRecords.img != null and checkInRecords.img != ''"> and jcir.img = #{checkInRecords.img}</if> <if test="checkInRecords.lng != null and checkInRecords.lng != ''"> and jcir.lng = #{checkInRecords.lng}</if> <if test="checkInRecords.lat != null and checkInRecords.lat != ''"> and jcir.lat = #{checkInRecords.lat}</if> <if test="checkInRecords.address != null and checkInRecords.address != ''"> and jcir.address = #{checkInRecords.address}</if> <if test="checkInRecords.workTheme != null and checkInRecords.workTheme != ''">and jcir.work_theme = #{checkInRecords.workTheme} </if> <if test="checkInRecords.workContent != null and checkInRecords.workContent != ''">and jcir.work_content = #{checkInRecords.workContent} </if> <if test="checkInRecords.img != null and checkInRecords.img != ''">and jcir.img = #{checkInRecords.img} </if> <if test="checkInRecords.lng != null and checkInRecords.lng != ''">and jcir.lng = #{checkInRecords.lng} </if> <if test="checkInRecords.lat != null and checkInRecords.lat != ''">and jcir.lat = #{checkInRecords.lat} </if> <if test="checkInRecords.address != null and checkInRecords.address != ''">and jcir.address = #{checkInRecords.address} </if> <if test="checkInRecords.deletedFlag != null "> and jcir.deleted_flag = #{checkInRecords.deletedFlag}</if> <if test="checkInRecords.name != null and checkInRecords.name !='' "> and bu.name like concat('%',#{checkInRecords.name},'%') </if> <if test="checkInRecords.name != null and checkInRecords.name !='' ">and bu.name like concat('%',#{checkInRecords.name},'%') </if> <if test="checkInRecords.startTime!=null and checkInRecords.startTime!=''"> AND date_format(jcir.create_time,'%Y-%m-%d')>= #{checkInRecords.startTime} </if> <if test="checkInRecords.endTime!=null and checkInRecords.endTime!=''"> AND date_format(jcir.create_time,'%Y-%m-%d')<= #{checkInRecords.endTime} </if> <if test="deptIdList !=null and deptIdList.size() > 0"> and <foreach collection="deptIdList" index="index" item="item" open="(" separator="or" close=")"> bu.dept_id like concat('%',#{item},'%') </foreach> </if> </where> order by jcir.create_time desc @@ -59,8 +80,7 @@ </resultMap> <sql id="selectCheckInRecords"> select id, select id, create_user_id, create_time, work_theme, @@ -70,8 +90,7 @@ lat, address, deleted_flag from jczz_check_in_records from jczz_check_in_records </sql> <select id="selectCheckInRecordsById" parameterType="int" resultMap="CheckInRecordsDTOResult"> @@ -80,7 +99,8 @@ id = #{id} </select> <select id="selectCheckInRecordsList" parameterType="org.springblade.modules.checkInRecords.dto.CheckInRecordsDTO" resultMap="CheckInRecordsDTOResult"> <select id="selectCheckInRecordsList" parameterType="org.springblade.modules.checkInRecords.dto.CheckInRecordsDTO" resultMap="CheckInRecordsDTOResult"> <include refid="selectCheckInRecords"/> <where> <if test="id != null "> and id = #{id}</if> src/main/java/org/springblade/modules/checkInRecords/service/impl/CheckInRecordsServiceImpl.java
@@ -17,16 +17,26 @@ package org.springblade.modules.checkInRecords.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.logging.log4j.util.Strings; import org.springblade.common.cache.SysCache; import org.springblade.common.param.CommonParamSet; import org.springblade.common.utils.SpringUtils; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.modules.checkInRecords.dto.CheckInRecordsDTO; import org.springblade.modules.checkInRecords.entity.CheckInRecordsEntity; import org.springblade.modules.checkInRecords.vo.CheckInRecordsVO; import org.springblade.modules.checkInRecords.mapper.CheckInRecordsMapper; import org.springblade.modules.checkInRecords.service.ICheckInRecordsService; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.modules.system.service.IDeptService; import org.springblade.modules.system.vo.DeptVO; import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; /** * 打卡记录表 服务实现类 @@ -39,9 +49,18 @@ @Override public IPage<CheckInRecordsVO> selectCheckInRecordsPage(IPage<CheckInRecordsVO> page, CheckInRecordsVO checkInRecords) { return page.setRecords(baseMapper.selectCheckInRecordsPage(page, checkInRecords)); // todo 数据过滤 String deptId = checkInRecords.getDeptId(); if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) { deptId = AuthUtil.getDeptId(); } List<Long> deptIdList = SysCache.getDeptChildIds(deptId); // 公共参数设置 // CommonParamSet commonParamSet = new CommonParamSet().invoke(CheckInRecordsVO.class,checkInRecords); IPage<CheckInRecordsVO> checkInRecordsVOIPage = page.setRecords(baseMapper.selectCheckInRecordsPage(page, checkInRecords, deptIdList)); return checkInRecordsVOIPage; } /** @@ -51,8 +70,7 @@ * @return 打卡记录表 */ @Override public CheckInRecordsDTO selectCheckInRecordsById(Integer id) { public CheckInRecordsDTO selectCheckInRecordsById(Integer id) { return this.baseMapper.selectCheckInRecordsById(id); } @@ -63,8 +81,7 @@ * @return 打卡记录表集合 */ @Override public List<CheckInRecordsDTO> selectCheckInRecordsList(CheckInRecordsDTO checkInRecordsDTO) { public List<CheckInRecordsDTO> selectCheckInRecordsList(CheckInRecordsDTO checkInRecordsDTO) { return this.baseMapper.selectCheckInRecordsList(checkInRecordsDTO); }
@@ -16,6 +16,7 @@ */ package org.springblade.modules.checkInRecords.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.modules.checkInRecords.entity.CheckInRecordsEntity; @@ -43,4 +44,14 @@ */ private String endTime; private String deptId; // 角色名称 @ApiModelProperty(value = "角色名称", example = "") private String roleName; // 社区编号 @ApiModelProperty(value = "社区编号", example = "") private String communityCode; }
