From f8cb5700586005b43a17f40c00aa10622d49fcd5 Mon Sep 17 00:00:00 2001
From: liuyiliang <yiliang.liu@51dayu.com.cn>
Date: Thu, 27 Mar 2025 17:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BC=81=E4=B8=80=E6=A1=A3=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccic/safeliab/vo/HivePolicyInnerCoInsurerVO.java   |  2 ++
 .../main/resources/mappers/ExamStatisticsMapper.xml    |  4 +---
 .../src/main/resources/mappers/ServiceStatMapper.xml   | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/vo/HivePolicyInnerCoInsurerVO.java b/ccic-exam/src/main/java/com/ccic/safeliab/vo/HivePolicyInnerCoInsurerVO.java
index ecde7f1..be4520e 100644
--- a/ccic-exam/src/main/java/com/ccic/safeliab/vo/HivePolicyInnerCoInsurerVO.java
+++ b/ccic-exam/src/main/java/com/ccic/safeliab/vo/HivePolicyInnerCoInsurerVO.java
@@ -8,4 +8,6 @@ public class HivePolicyInnerCoInsurerVO {
     private String innerCoOrgCode;
 
     private String shareRate;
+
+    private String orgName;
 }
diff --git a/ccic-exam/src/main/resources/mappers/ExamStatisticsMapper.xml b/ccic-exam/src/main/resources/mappers/ExamStatisticsMapper.xml
index c7246e7..018ab55 100644
--- a/ccic-exam/src/main/resources/mappers/ExamStatisticsMapper.xml
+++ b/ccic-exam/src/main/resources/mappers/ExamStatisticsMapper.xml
@@ -232,10 +232,8 @@
                 LEFT JOIN ex_exam_info AS info ON info.ID = scores.exam_id
                 AND info.paper_id = scores.paper_id
                 AND info.is_deleted = 0
---                 AND info.publish_status = 1
                 LEFT JOIN ex_exam_papers papers ON papers.ID = scores.paper_id
                 AND papers.is_deleted = 0
---                 AND papers.paper_status = 1
                 LEFT JOIN tbl_industry ind ON ind.industry_id = info.industry_id
                 AND ind.status = 1
         WHERE
@@ -244,7 +242,7 @@
             AND info.exam_name LIKE '%' || #{examName} || '%'
         </if>
         <if test="paperName != null and paperName != ''">
-            AND paper.paper_name LIKE '%' || #{paperName} || '%'
+            AND papers.paper_name LIKE '%' || #{paperName} || '%'
         </if>
         <if test="industry != null and industry != ''">
             AND ind.industry_id = #{industry}
diff --git a/ccic-exam/src/main/resources/mappers/ServiceStatMapper.xml b/ccic-exam/src/main/resources/mappers/ServiceStatMapper.xml
index 416b285..1d3b487 100644
--- a/ccic-exam/src/main/resources/mappers/ServiceStatMapper.xml
+++ b/ccic-exam/src/main/resources/mappers/ServiceStatMapper.xml
@@ -221,14 +221,16 @@
 
     <select id="getHivePolicyInnerCoInsurerStatistics" resultType="com.ccic.safeliab.vo.HivePolicyInnerCoInsurerVO">
         SELECT
-           inner_co_org_code innerCoOrgCode,
+           a.inner_co_org_code innerCoOrgCode,
            CASE
             WHEN ROUND(share_rate * 100, 2) = FLOOR(share_rate * 100)
             THEN CONCAT(CAST(ROUND(share_rate * 100, 0) AS STRING), '%')
             ELSE CONCAT(ROUND(share_rate * 100, 2), '%')
-          END AS shareRate
+          END AS shareRate,
+          b.organ_name orgName
         FROM
-          hive_policy_inner_co_insurer
+          hive_policy_inner_co_insurer a
+        left join tbl_organ b on a.inner_co_org_code = b.organ_code
           where policy_no = #{policyNumber}
     </select>
 
@@ -281,7 +283,7 @@
 
     <select id="getAccidentPreventionStatistics" resultType="com.ccic.safeliab.vo.AccidentPreventionVO">
       SELECT
-           a.completed_at completedAt,
+           TO_CHAR(a.completed_at, 'YYYY-MM-DD') completedAt,
            a.service_name serviceName,
            b.service_object_name serviceObjectName,
            a.service_range serviceRange,