diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockListDTO.java index c125743..a243447 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockListDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockListDTO.java @@ -44,5 +44,11 @@ public class BgtDailyClockListDTO { @ApiModelProperty(value = "审核人Id",hidden = true) private Long auditorUserId; + @ApiModelProperty(value = "是否已读",hidden = true) + private Boolean isRead; + + @ApiModelProperty(value = "是否待审核",hidden = true) + private Boolean isAudit; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java index ade5dbe..944ff0f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java @@ -336,6 +336,13 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl queryDTOPage = new Page<>(); queryDTOPage.setCurrent(dto.getPageNum()); queryDTOPage.setSize(dto.getPageSize()); + if( "5".equals(dto.getAuditorType()) ){ + dto.setIsRead(true); + } + if( "1".equals(dto.getAuditorType()) ){ + dto.setIsAudit(true); + } + Page queryVOPage = baseMapper.appQueryPageList(queryDTOPage, dto); return PageUtils.buildDataInfo(queryVOPage); } diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml index 9c260ca..72ca36d 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml @@ -73,8 +73,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and wu.username like concat('%', #{dto.username}, '%') - - and wdc.auditor_type = #{dto.auditorType} + + + + and wdc.status = '0' and wdc.auditor_type ='1' + + + and wdc.auditor_type = '1' and wdc.status = '1' + + + and wdc.auditor_type = #{dto.auditorType} + + + and DATE(wdc.dily_time) = #{dto.dilyTime}