zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-03-19 19:56:10 +08:00
parent 4d0bd41431
commit 6553cc2b59
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockListDTO.java
View File

@ -44,5 +44,11 @@ public class BgtDailyClockListDTO {
@ApiModelProperty(value = "审核人Id",hidden = true) @ApiModelProperty(value = "审核人Id",hidden = true)
private Long auditorUserId; private Long auditorUserId;
@ApiModelProperty(value = "是否已读",hidden = true)
private Boolean isRead;
@ApiModelProperty(value = "是否待审核",hidden = true)
private Boolean isAudit;
} }

7
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java
View File

@ -336,6 +336,13 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
Page<BgtDailyClockListDTO> queryDTOPage = new Page<>(); Page<BgtDailyClockListDTO> queryDTOPage = new Page<>();
queryDTOPage.setCurrent(dto.getPageNum()); queryDTOPage.setCurrent(dto.getPageNum());
queryDTOPage.setSize(dto.getPageSize()); queryDTOPage.setSize(dto.getPageSize());
if( "5".equals(dto.getAuditorType()) ){
dto.setIsRead(true);
}
if( "1".equals(dto.getAuditorType()) ){
dto.setIsAudit(true);
}
Page<BgtDailyClockListVO> queryVOPage = baseMapper.appQueryPageList(queryDTOPage, dto); Page<BgtDailyClockListVO> queryVOPage = baseMapper.appQueryPageList(queryDTOPage, dto);
return PageUtils.buildDataInfo(queryVOPage); return PageUtils.buildDataInfo(queryVOPage);
} }

11
ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml
View File

@ -74,7 +74,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and wu.username like concat('%', #{dto.username}, '%') and wu.username like concat('%', #{dto.username}, '%')
</if> </if>
<if test="dto.auditorType != null and dto.auditorType != '' "> <if test="dto.auditorType != null and dto.auditorType != '' ">
<choose>
<when test="dto.isRead">
and wdc.status = '0' and wdc.auditor_type ='1'
</when>
<when test="dto.isAudit">
and wdc.auditor_type = '1' and wdc.status = '1'
</when>
<otherwise>
and wdc.auditor_type = #{dto.auditorType} and wdc.auditor_type = #{dto.auditorType}
</otherwise>
</choose>
</if> </if>
<if test="dto.dilyTime != null"> <if test="dto.dilyTime != null">
and DATE(wdc.dily_time) = #{dto.dilyTime} and DATE(wdc.dily_time) = #{dto.dilyTime}