From e91d92645003c9052e43cd4f42f5c7d42e278011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Mon, 1 Sep 2025 13:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E6=95=B0=E6=8D=AE=E5=BA=93sq?=
 =?UTF-8?q?l=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/person/ContractMapper.xml          |  6 ++---
 .../person/PersonComprehensiveMapper.xml      | 18 +++++++-------
 .../mapper/subeva/SubProjectMapper.xml        | 24 +++++++------------
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/modules/bmw/src/main/resources/mapper/person/ContractMapper.xml b/modules/bmw/src/main/resources/mapper/person/ContractMapper.xml
index 50f7b87..61a1857 100644
--- a/modules/bmw/src/main/resources/mapper/person/ContractMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/person/ContractMapper.xml
@@ -243,15 +243,15 @@
     </select>
     <select id="getLightStatus" resultType="com.bonus.bmw.person.entity.ContractBean">
         SELECT
-            bw.light_status AS lightStatus
+            bw."light_status" AS lightStatus
         FROM
             "ynrealname"."bm_worker" bw
-        WHERE bw.id_number = #{idNumber}
+        WHERE bw."id_number" = #{idNumber}
     </select>
 
 
     <delete id="delContract">
-        delete from "ynrealname"."bm_worker_contract" where "id" = #{id}
+        delete from "ynrealname"."bm_worker_contract" where "idCard" = #{idNumber}
         ;
         delete from "ynrealname"."bm_worker_contract_details"  where "id_card" = #{idNumber}
         ;
diff --git a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
index 202b47d..000c3f3 100644
--- a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
@@ -97,12 +97,12 @@
     <insert id="insertPersonToTeam">
         update "ynrealname"."bm_team_user_relation" set "is_active" = '0' where "id_number" = #{idNumber};
         INSERT INTO "ynrealname"."bm_team_user_relation"
-		("team_id", "id_number",is_regular_person, "IS_ACTIVE") VALUES (#{teamId},#{idNumber},#{isRegularPerson},'1');
+		("team_id", "id_number","is_regular_person", "is_active") VALUES (#{teamId},#{idNumber},#{isRegularPerson},'1');
     </insert>
     <insert id="insertPersonContractData">
-        insert into bm_worker_contract
-        (id,idCard,`name`,`post`, contractCode, laborContractType, role, contractValidDate, contractInvalidDate,
-        contractType, wageApprovedWay, wageCriterion, miurInsurance, whetherOnJob, endowmentInsurance
+        insert into "ynrealname"."bm_worker_contract"
+        ("id","idCard","name","post", "contractCode", "laborContractType", "role", "contractValidDate", "contractInvalidDate",
+        "contractType", "wageApprovedWay", "wageCriterion", "miurInsurance", "whetherOnJob", "endowmentInsurance"
         <if test="contractType == '纸质合同'">
             ,is_audit
         </if>
@@ -118,11 +118,11 @@
     </insert>
 
     <insert id="replacePersonContractData">
-        insert into bm_worker_contract
-        (id,idCard,`name`,`post`, contractCode, laborContractType, role, contractValidDate, contractInvalidDate,
-        contractType, wageApprovedWay, wageCriterion, miurInsurance, whetherOnJob, endowmentInsurance
+        insert into "ynrealname"."bm_worker_contract"
+        ("id","idCard","name","post", "contractCode", "laborContractType", "role", "contractValidDate", "contractInvalidDate",
+        "contractType", "wageApprovedWay", "wageCriterion", "miurInsurance", "whetherOnJob", "endowmentInsurance"
         <if test="contractType == '纸质合同'">
-            ,is_audit
+            ,"is_audit"
         </if>
         )
         select #{contractId}, #{idNumber},#{name}, #{postId},#{contractCode}, #{laborContractType}, #{role}, #{contractValidDate},
@@ -134,7 +134,7 @@
         </if>
         from dual
         where NOT EXISTS (
-            select * from bm_worker_contract where id = #{contractId}
+            select * from "ynrealname"."bm_worker_contract" where "id" = #{contractId}
         );
     </insert>
 
diff --git a/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml b/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml
index fd02316..df9f298 100644
--- a/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml
@@ -143,13 +143,15 @@
         AND bs."id" IS NOT NULL
         LEFT JOIN "ynrealname"."fbeva_sub_project" fsp ON fsp."contract_id" = bsc."id"
         WHERE
-        WHERE
-        bsc."is_active" = '1'
-        AND td."value" = #{params.month} and fcpe."eva_date" is not null
-        <if test="params != null and params != ''">
+        bs."id" IS NOT NULL
+        AND fsp."eva_month" IS NOT NULL
+        /*AND td."value" = #{params.month} and fcpe."eva_date" is not null*/
+        <if test="params != null">
+<!--
             <if test="params.proId != null and params.proId != ''">
                 AND bp."id" =#{params.proId}
             </if>
+-->
             <if test="params.subName != null and params.subName != ''">
                 AND  bsc."contract_name" LIKE concat('%', #{params.subName}, '%')
             </if>
@@ -158,18 +160,10 @@
         GROUP BY
         bs."sub_name"
            <if test="params.status != null and params.status != '' ">
-               HAVING
-               CASE
-               WHEN COUNT(bs."sub_name") = 0 THEN 0
-               WHEN ROUND(SUM(fsp."eva_score") / COUNT(bs."sub_name"), 2) > 90 THEN 1
-               WHEN ROUND(SUM(fsp."eva_score") / COUNT(bs."sub_name"), 2) > 80 THEN 2
-               WHEN ROUND(SUM(fsp."eva_score") / COUNT(bs."sub_name"), 2) > 60 THEN 3
-               WHEN ROUND(SUM(fsp."eva_score") / COUNT(bs."sub_name"), 2) &lt; 61 THEN 4
-               ELSE 0
-               END = #{params.status}
+               having  status = #{params.status}
            </if>
             <if test="offset != null and offset >= 0 and limit != null and limit >= 0">
-                OFFSET #{offset} ROWS FETCH NEXT #{limit} ROWS ONLY
+                OFFSET #{offset, jdbcType=INTEGER} ROWS FETCH NEXT #{limit, jdbcType=INTEGER} ROWS ONLY
             </if>
     </select>
     <select id="getRankListCount" resultType="java.lang.Integer">
@@ -258,4 +252,4 @@ FROM
         values (#{score},#{evaDate},#{evaId},#{type},#{uuid},#{reason})
     </insert>
 
-</mapper>
\ No newline at end of file
+</mapper>