From 92bceccd914eebbb7f4f4cd2b4070b986d2fc02e Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 3 Jun 2024 18:29:53 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XzSecurityQualityInspectionRecordController.java |  3 ++-
 .../xml/XzSecurityQualityInspectionRecordMapper.xml  | 12 ++++++------
 .../controller/XzHikvisionCompareDataController.java |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
index 6922b8aae..aa836df1a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
@@ -8,6 +8,7 @@ import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.base.entity.vo.SectorVo;
 import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
+import com.zhgd.xmgl.constant.Cts;
 import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService;
 import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService;
 import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
@@ -485,7 +486,7 @@ public class XzSecurityQualityInspectionRecordController {
     @ApiOperation(value = "风险走势图", notes = "风险走势图", httpMethod = "POST")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "type", value = "1过去一年每月(默认）2过去一周每天", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = Cts.QUERY_TYPE, value = "1过去一年每月(默认）2过去一周每天", paramType = "body", required = true, dataType = "String"),
     })
     @PostMapping(value = "/riskChart")
     public Result<List<XzSecurityQualityInspectionRecordTotalVo>> riskChart(@RequestBody Map<String, Object> map) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
index c704487d3..f48373fc6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
@@ -177,12 +177,12 @@
         IFNULL(SUM((CASE WHEN t.level = 2 THEN 1 ELSE 0 END)), 0) largerRiskNum,
         IFNULL(SUM((CASE WHEN t.level = 3 THEN 1 ELSE 0 END)), 0) generalRiskNum,
         IFNULL(SUM((CASE WHEN t.level = 4 THEN 1 ELSE 0 END)), 0) lowRiskNum,
-        if(FLOOR((DAYOFMONTH(t.create_time) - 1) / 7) > 3, 3,
-        FLOOR((DAYOFMONTH(t.create_time) - 1) / 7)) as whichWeekOfMonth,
-        date_format(t.create_time, '%Y-%m') as yearMonth,
-        date_format(t.create_time, '%Y-%m-%d') as lastWeekByDate,
-        year(t.create_time) as year,
-        month(t.create_time) as month
+        if(FLOOR((DAYOFMONTH(t.inspect_time) - 1) / 7) > 3, 3,
+        FLOOR((DAYOFMONTH(t.inspect_time) - 1) / 7)) as whichWeekOfMonth,
+        date_format(t.inspect_time, '%Y-%m') as yearMonth,
+        date_format(t.inspect_time, '%Y-%m-%d') as lastWeekByDate,
+        year(t.inspect_time) as year,
+        month(t.inspect_time) as month
         from xz_security_quality_inspection_record t
         WHERE t.project_sn = #{param.projectSn}
         and t.status != 6
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzHikvisionCompareDataController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzHikvisionCompareDataController.java
index c7a5bcaeb..3670639ba 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzHikvisionCompareDataController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzHikvisionCompareDataController.java
@@ -45,6 +45,7 @@ public class XzHikvisionCompareDataController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "type", value = "类型1组织2人员信息3人员照片4车辆信息", paramType = "query", required = true, dataType = "Integer"),
     })
     @GetMapping(value = "/page")
     public Result<IPage<XzHikvisionCompareData>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {