From f038e7d0338375025baa96986c5f1990abd990b9 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Fri, 10 Apr 2026 16:32:16 +0800
Subject: [PATCH] 新增暂存及图片功能
---
gkhy-system/src/main/resources/mapper/system/DailySafetyInspectionMapper.xml | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/gkhy-system/src/main/resources/mapper/system/DailySafetyInspectionMapper.xml b/gkhy-system/src/main/resources/mapper/system/DailySafetyInspectionMapper.xml
index 403dd09..1453362 100644
--- a/gkhy-system/src/main/resources/mapper/system/DailySafetyInspectionMapper.xml
+++ b/gkhy-system/src/main/resources/mapper/system/DailySafetyInspectionMapper.xml
@@ -23,6 +23,8 @@
<result column="update_by" property="updateBy"/>
<result column="update_time" property="updateTime"/>
<result column="check_type" property="checkType"/>
+ <result column="scratchpad" property="scratchpad"/>
+ <result column="check_pics" property="checkPics"/>
<!-- <collection property="dailySafetyInspectionUsers" ofType="com.gkhy.system.domain.DailySafetyInspectionUser" column="id = id" select="selectDailySafetyInspectionUsers" />-->
<collection property="dailySafetyInspectionDepts" ofType="com.gkhy.system.domain.DailySafetyInspectionDept"
@@ -72,6 +74,9 @@
<if test="checkType != null ">
and a.check_type = #{checkType}
</if>
+ <if test="scratchpad != null ">
+ and a.scratchpad = #{scratchpad}
+ </if>
<if test="checkBeginDate != null ">
<!-- 开始时间检索 -->
AND date_format(a.check_date,'%Y%m%d') >= date_format(#{checkBeginDate},'%Y%m%d')
@@ -114,7 +119,19 @@
from daily_safety_inspection_dept a
inner join daily_safety_inspection b on a.daily_safety_inspection_id = b.id
where b.del_flag = 0
- and a.dept_id = #{deptId}
+ and a.dept_id = #{deptId} and b.scratchpad = 2
+ and date_format(b.check_date, '%Y%m') = date_format(now(), '%Y%m')
+ </select>
+
+ <select id="getCheckCountList" parameterType="java.util.List" resultType="int">
+ select count(*)
+ from daily_safety_inspection_dept a
+ inner join daily_safety_inspection b on a.daily_safety_inspection_id = b.id and b.scratchpad = 2
+ where b.del_flag = 0
+ and a.dept_id in
+ <foreach collection="list" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
and date_format(b.check_date, '%Y%m') = date_format(now(), '%Y%m')
</select>
</mapper>
--
Gitblit v1.9.2