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 @@
- 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 @@
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 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"
,is_audit
@@ -118,11 +118,11 @@
- 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"
- ,is_audit
+ ,"is_audit"
)
select #{contractId}, #{idNumber},#{name}, #{postId},#{contractCode}, #{laborContractType}, #{role}, #{contractValidDate},
@@ -134,7 +134,7 @@
from dual
where NOT EXISTS (
- select * from bm_worker_contract where id = #{contractId}
+ select * from "ynrealname"."bm_worker_contract" where "id" = #{contractId}
);
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
-
+ bs."id" IS NOT NULL
+ AND fsp."eva_month" IS NOT NULL
+ /*AND td."value" = #{params.month} and fcpe."eva_date" is not null*/
+
+
AND bsc."contract_name" LIKE concat('%', #{params.subName}, '%')
@@ -158,18 +160,10 @@
GROUP BY
bs."sub_name"
- 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) < 61 THEN 4
- ELSE 0
- END = #{params.status}
+ having status = #{params.status}
- OFFSET #{offset} ROWS FETCH NEXT #{limit} ROWS ONLY
+ OFFSET #{offset, jdbcType=INTEGER} ROWS FETCH NEXT #{limit, jdbcType=INTEGER} ROWS ONLY