From bb940c4a0c0caf97c04352497d556e9894862b0a Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Tue, 4 Aug 2026 15:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/bo/SxtJcdzb107522Bo.java           |  5 ++++
 .../ComprehensiveAnalysisMapper.xml           | 24 +++++++++----------
 .../EnterpriseInformationMapper.xml           | 10 ++++----
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtJcdzb107522Bo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtJcdzb107522Bo.java
index a344d086..37ea4e9d 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtJcdzb107522Bo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtJcdzb107522Bo.java
@@ -252,6 +252,11 @@ public class SxtJcdzb107522Bo extends BaseEntity {
      */
     private Long updatestatus;
 
+    /**
+     * 当事人证件号码（用于关联查询条件）
+     */
+    private String c601034;
+
     /**
      * 非业务主键
      */
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml
index f4ebfbd1..04c95bff 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml
@@ -81,7 +81,7 @@
     <select id="huanSectionA" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select r.check_category, e.company_org_type,r.enterprise_address
         from enforcement_registration r
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on r.enterprise_number = e.enterprise_number
         <where>
             and r.enterprise_number is not null
@@ -119,7 +119,7 @@
     <select id="tongSectionA" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select r.check_category, e.company_org_type,r.enterprise_address
         from enforcement_registration r
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on r.enterprise_number = e.enterprise_number
         <where>
             and r.enterprise_number is not null
@@ -263,7 +263,7 @@
     </select>
     <select id="primaryNotice" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from enterprise_law_enforcement n
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on n.enterprise_number=e.enterprise_number
         <where>
             and n.enterprise_number is not null
@@ -294,7 +294,7 @@
     </select>
     <select id="huanNotice" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from enterprise_law_enforcement n
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on n.enterprise_number=e.enterprise_number
         <where>
             and n.enterprise_number is not null
@@ -325,7 +325,7 @@
     </select>
     <select id="tongNotice" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from enterprise_law_enforcement n
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on n.enterprise_number=e.enterprise_number
         <where>
             and n.enterprise_number is not null
@@ -356,7 +356,7 @@
     </select>
     <select id="primaryComplaint" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address,c.enforce_type from complaint_statistics c
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on c.enterprise_number=e.enterprise_number
         <where>
             and (c.rid is not null or c.complaint_department_id is not null)
@@ -389,7 +389,7 @@
     </select>
     <select id="huanComplaint" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address,c.enforce_type from complaint_statistics c
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on c.enterprise_number=e.enterprise_number
         <where>
             and (c.rid is not null or c.complaint_department_id is not null)
@@ -422,7 +422,7 @@
     </select>
     <select id="tongComplaint" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address,c.enforce_type from complaint_statistics c
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on c.enterprise_number=e.enterprise_number
         <where>
             and (c.rid is not null or c.complaint_department_id is not null)
@@ -455,7 +455,7 @@
     </select>
     <select id="primaryWarning" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from law_enforcement_warning_list w
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on w.enterprise_number=e.enterprise_number
         <where>
             and w.enterprise_number is not null
@@ -487,7 +487,7 @@
     </select>
     <select id="huanWarning" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from law_enforcement_warning_list w
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on w.enterprise_number=e.enterprise_number
         <where>
             and w.enterprise_number is not null
@@ -519,7 +519,7 @@
     </select>
     <select id="tongWarning" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from law_enforcement_warning_list w
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on w.enterprise_number=e.enterprise_number
         <where>
             and w.enterprise_number is not null
@@ -653,7 +653,7 @@
         left join (select id,bureau_dept_id,bureau_dept_name from enforcement_registration where
         enterprise_number is not null and check_category is not null) r
         on c.rid=r.id
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on c.enterprise_number=e.enterprise_number
         <where>
             and (c.rid is not null or c.complaint_department_id is not null)
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml
index 64b9f512..ea4a1b18 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml
@@ -72,18 +72,16 @@
             enterprise_information ei
         LEFT JOIN (
             SELECT
-                enterprise_number,
-                qr_code_url
+                t.enterprise_number,
+                ANY_VALUE(t.qr_code_url) AS qr_code_url
             FROM
                 ( SELECT enterprise_number,
                         qr_code_url,
                         generate_time
                         FROM qr_code_generate_history
-                    WHERE `status` = 0 ORDER BY generate_time DESC LIMIT 1000000000 ) t
+                    WHERE `status` = 0 ORDER BY generate_time DESC LIMIT 1 ) t
          GROUP BY
-            t.enterprise_number
-        ORDER BY
-            t.generate_time DESC
+            t.enterprise_number,t.qr_code_url,t.generate_time
             ) gh ON ei.enterprise_number = gh.enterprise_number
         <where>
             and ei.is_delete = 0