From 5dc18dd22a35e142185582568c90596b7ce6601e Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 3 Jul 2024 11:58:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD-=E8=B4=A8=E9=87=8F-=E6=8C=89?=
 =?UTF-8?q?=E5=91=A8=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/controller/QualityInspectionRecordController.java  | 1 -
 .../quality/mapper/xml/QualityInspectionRecordMapper.xml       | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java
index 1fc343adf..e40cfac1c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java
@@ -433,7 +433,6 @@ public class QualityInspectionRecordController {
         return Result.success(qualityInspectionRecordService.riskChart(map));
     }
 
-
 }
 
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
index 1d25429dc..4322fa178 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
@@ -183,6 +183,9 @@
         and t.status != 6
         <include refid="whereCondition">
         </include>
+        <if test="param.isStatsByWeek == '1'.toString()">
+            and t.inspect_time <![CDATA[>=]]> concat(date_format(current_date,'%Y-%m'),'-01 00:00:00')
+        </if>
         <if test="param.isStatsByWeek == '1'.toString()">
             group by whichWeekOfMonth
         </if>