From c21e7075c2efd6e527e2b684cd92899271f9c4d6 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 27 Nov 2025 11:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/risk/entity/RegionV2.java    | 92 -------------------
 ...zSecurityQualityInspectionRecordMapper.xml | 12 ++-
 2 files changed, 7 insertions(+), 97 deletions(-)
 delete mode 100644 src/main/java/com/zhgd/xmgl/modules/risk/entity/RegionV2.java

diff --git a/src/main/java/com/zhgd/xmgl/modules/risk/entity/RegionV2.java b/src/main/java/com/zhgd/xmgl/modules/risk/entity/RegionV2.java
deleted file mode 100644
index baedd5a81..000000000
--- a/src/main/java/com/zhgd/xmgl/modules/risk/entity/RegionV2.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.zhgd.xmgl.modules.risk.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-
-/**
- * @Description: 区域v2
- * @author： pds
- * @date： 2025-06-10
- * @version： V1.0
- */
-@Data
-@TableName("region_v2")
-@ApiModel(value = "RegionV2实体类", description = "RegionV2")
-@Deprecated
-public class RegionV2 implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "id")
-    private java.lang.Long id;
-    /**
-     * 区域名称
-     */
-    @ApiModelProperty(value = "区域名称")
-    private java.lang.String regionName;
-    /**
-     * 父级区域ID
-     */
-    @ApiModelProperty(value = "父级区域ID")
-    private java.lang.Long parentRegion;
-    /**
-     * 说明
-     */
-    @ApiModelProperty(value = "说明")
-    private java.lang.String remark;
-    /**
-     * 项目唯一标识
-     */
-    @ApiModelProperty(value = "项目唯一标识")
-    private java.lang.String projectSn;
-    /**
-     * 祖级列表
-     */
-    @ApiModelProperty(value = "祖级列表")
-    private java.lang.String ancestors;
-    /**
-     * 安全责任单位ids
-     */
-    @ApiModelProperty(value = "安全责任单位ids")
-    private java.lang.String securityEnterpriseIds;
-    /**
-     * 安全整改人
-     */
-    @ApiModelProperty(value = "安全整改人")
-    private java.lang.String securityDutyIds;
-    /**
-     * 安全复查人s
-     */
-    @ApiModelProperty(value = "安全复查人s")
-    private java.lang.String securityReviewIds;
-    /**
-     * 安全风险排查责任人s
-     */
-    @ApiModelProperty(value = "安全风险排查责任人s")
-    private java.lang.String securityRiskAssessors;
-    /**
-     * 创建时间 yyyy-MM-dd HH:mm:ss
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss")
-    private java.util.Date createTime;
-    /**
-     * 更新时间 yyyy-MM-dd HH:mm:ss
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
-    private java.util.Date updateTime;
-}
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 01fc12575..013e08111 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
@@ -626,10 +626,10 @@
     <select id="countQualityInspectionRecordEnterprise" resultType="com.zhgd.xmgl.base.entity.vo.TrendOneVo">
         select ei.enterprise_name x, ifnull(sum(if(t.id is not null, 1, 0)), 0) y
         from enterprise_info ei
-        LEFT JOIN project_enterprise pe ON pe.enterprise_id = ei.id
-        Left join xz_security_quality_inspection_record t on ei.enterprise_sn = t.enterprise_sn
+        LEFT JOIN xz_security_quality_inspection_enterprise pe ON pe.enterprise_id = ei.id
+        Left join xz_security_quality_inspection_record t on pe.inspection_id = t.id
         where 1 = 1
-        and pe.project_sn = #{projectSn}
+        and t.project_sn = #{projectSn}
         GROUP BY ei.id
         order by y desc
     </select>
@@ -657,7 +657,8 @@
     <select id="countQualityInspectionRecordRegion" resultType="com.zhgd.xmgl.base.entity.vo.TrendOneVo">
         select qr.region_name x, ifnull(sum(if(t.id is not null, 1, 0)), 0) y
         from quality_region qr
-        join xz_security_quality_inspection_record t on qr.id = t.region_id
+        join xz_security_quality_inspection_region r on r.region_id=qr.id
+        join xz_security_quality_inspection_record t on t.id = r.inspection_id
         where 1 = 1
         and qr.project_sn = #{param.projectSn}
         and t.status != 6
@@ -732,7 +733,8 @@
         </include>
         ei.enterprise_name
         from xz_security_quality_inspection_record t
-        left join enterprise_info ei on ei.id = t.enterprise_id
+        LEFT JOIN xz_security_quality_inspection_enterprise pe ON pe.inspection_id = t.id
+        left join enterprise_info ei on ei.id = pe.enterprise_id
         WHERE record_type = 1
         and t.status != 6
         and project_sn = #{param.projectSn}