From 9313619cf6423f9fb3fdad1c976b8e087459acd0 Mon Sep 17 00:00:00 2001
From: 15036302109 <zhp5211314>
Date: Fri, 19 Jul 2024 14:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E7=82=B9=E5=87=BB=E5=9B=BE=E6=A0=87=E5=8F=AF=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E9=9A=90=E6=82=A3=E8=AF=A6=E6=83=85bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/ehsHiddenDanger/domain/EhsHiddenDanger.java | 11 +++++++++--
 .../service/impl/EhsHiddenDangerServiceImpl.java      |  9 +++++++++
 .../resources/mapper/ehs/EhsHiddenDangerMapper.xml    |  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/domain/EhsHiddenDanger.java b/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/domain/EhsHiddenDanger.java
index 1f44dbb..801dfb2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/domain/EhsHiddenDanger.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/domain/EhsHiddenDanger.java
@@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -150,4 +150,11 @@ public class EhsHiddenDanger extends BaseEntity
     private Integer  currMonth;
     @TableField(exist = false)
     private String  overTimeId;//超时隐患的id合集
+    // 以下是数据统计分析中的临时字段
+    @TableField(exist = false)
+    private String targetTime;
+    @TableField(exist = false)
+    private Date targetStartTime;
+    @TableField(exist = false)
+    private Date targetEndTime;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/service/impl/EhsHiddenDangerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/service/impl/EhsHiddenDangerServiceImpl.java
index 6ebbe99..a816cdc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/service/impl/EhsHiddenDangerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/service/impl/EhsHiddenDangerServiceImpl.java
@@ -1,5 +1,7 @@
 package com.ruoyi.ehsHiddenDanger.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -62,6 +64,13 @@ public class EhsHiddenDangerServiceImpl extends ServiceImpl<EhsHiddenDangerMappe
 		if(StringUtils.isNotEmpty(ehsHiddenDanger.getAssistDept())){//协办就不限制只能查询本部门的数据了。
 			ehsHiddenDanger.setDeptId(null);
 		}
+		if (StringUtils.isNotBlank(ehsHiddenDanger.getTargetTime())) {
+			String targetTime = ehsHiddenDanger.getTargetTime() + "-01 00:00:00";
+			DateTime targetStartTime = DateUtil.parse(targetTime, "yyyy-MM-dd HH:mm:ss");
+			DateTime targetEndTime = DateUtil.endOfMonth(targetStartTime);
+			ehsHiddenDanger.setTargetStartTime(targetStartTime);
+			ehsHiddenDanger.setTargetEndTime(targetEndTime);
+		}
 		return ehsHiddenDangerMapper.selectEhsHiddenDangerList(ehsHiddenDanger);
 	}
 
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml
index 9d9d0e6..520ec63 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml
@@ -84,6 +84,9 @@ FROM ehs_hidden_danger h  LEFT JOIN sys_dept d ON h.dept_id = d.dept_id
                     FIND_IN_SET(#{item}, hidden_danger_label)
                 </foreach>
             </if>
+            <if test="targetTime != null and targetTime != ''">
+                AND h.check_time BETWEEN #{targetStartTime} AND #{targetEndTime}
+            </if>
         </where>
     </select>
     <select id="selectOverTimeId" parameterType="EhsHiddenDanger" resultMap="EhsHiddenDangerResult">