From 6553cc2b59404788f1f8667a81e669ced759fbb7 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Wed, 19 Mar 2025 19:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bgt/domain/dto/BgtDailyClockListDTO.java      |  6 ++++++
 .../service/impl/WgzDailyClockServiceImpl.java    |  7 +++++++
 .../resources/mapper/wgz/WgzDailyClockMapper.xml  | 15 +++++++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

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<WgzDailyClockMappe
 		Page<BgtDailyClockListDTO> 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<BgtDailyClockListVO> 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"
         <if test="dto.username != null and dto.username != ''">
             and wu.username like concat('%', #{dto.username}, '%')
         </if>
-        <if test="dto.auditorType != null and dto.auditorType != ''">
-            and wdc.auditor_type = #{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}
+                </otherwise>
+            </choose>
+
         </if>
         <if test="dto.dilyTime != null">
             and DATE(wdc.dily_time) = #{dto.dilyTime}