From 8cdb25e97cbf09194449436c8ec0a2f1daec9200 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Mon, 9 Feb 2026 13:12:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8C=89=E5=9B=BA=E5=AE=9A=E4=BA=BA=E5=91=98?=
=?UTF-8?q?=E8=80=83=E5=8B=A4=E3=80=81=E4=B8=B4=E6=97=B6=E4=BA=BA=E5=91=98?=
=?UTF-8?q?=E8=80=83=E5=8B=A4=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SubCorePersonRankController.java | 2 +-
.../SubContractor/SubContractMapper.xml | 10 +-
.../mapper/subeva/SubCorepersonMapper.xml | 4 +-
.../mapper/subeva/SubProjectMapper.xml | 356 +++++++++---------
4 files changed, 186 insertions(+), 186 deletions(-)
diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subrank/controller/SubCorePersonRankController.java b/modules/bmw/src/main/java/com/bonus/bmw/subrank/controller/SubCorePersonRankController.java
index 538d9b9..8fdc4eb 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/subrank/controller/SubCorePersonRankController.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/subrank/controller/SubCorePersonRankController.java
@@ -56,7 +56,7 @@ public class SubCorePersonRankController {
@Override
public int count(PageTableRequest request) {
- return service.rankCount(request.getParams());
+ return service.rankCount(request.getParams());
}
}, new PageTableHandler.ListHandler() {
@Override
diff --git a/modules/bmw/src/main/resources/mapper/SubContractor/SubContractMapper.xml b/modules/bmw/src/main/resources/mapper/SubContractor/SubContractMapper.xml
index 7d92572..70a9e72 100644
--- a/modules/bmw/src/main/resources/mapper/SubContractor/SubContractMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/SubContractor/SubContractMapper.xml
@@ -97,9 +97,9 @@ select count(1) from (
LEFT JOIN pm_organization po ON po.id = bp.company_id and po.is_active = '1'
LEFT JOIN bm_sub_relation bsr1 on bsc.id = bsr1.sub_contract_id and bsr1.type = '1' and bsr1.is_active = '1'
LEFT JOIN bm_sub_relation bsr2 on bsc.id = bsr2.sub_contract_id and bsr2.type = '2' and bsr2.is_active = '1'
- LEFT JOIN bm_sub_relation bsr3 on bsc.id = bsr3.sub_contract_id and bsr3.type = '3' and bsr3.is_active = '1'
+
LEFT JOIN sys_user su ON su.id = bsr1.`value` and su.sub_id = bsc.sub_id and su.is_active = '1'
- LEFT JOIN bm_sub_team bst ON bst.id = bsr3.`value` and bst.is_active = '1'
+
LEFT JOIN bm_team_user_relation btur ON btur.team_id = bst.id and btur.is_active = '1' and btur.id_number is not null
GROUP BY bsc.id
@@ -115,7 +115,7 @@ select count(1) from (
bsc.is_complete as isComplete,
bsc.contract_money as contractMoney,
su.username as principal,
- COUNT(DISTINCT bst.id) as teamNumber,
+
COUNT(DISTINCT btur.id) as personNumber,
COUNT(DISTINCT bsr2.id) as fileNumber,
GROUP_CONCAT(DISTINCT bsr2.`value`) as filePaths,
@@ -130,9 +130,9 @@ select count(1) from (
LEFT JOIN pm_organization po ON po.id = bp.company_id and po.is_active = '1'
LEFT JOIN bm_sub_relation bsr1 on bsc.id = bsr1.sub_contract_id and bsr1.type = '1' and bsr1.is_active = '1'
LEFT JOIN bm_sub_relation bsr2 on bsc.id = bsr2.sub_contract_id and bsr2.type = '2' and bsr2.is_active = '1'
- LEFT JOIN bm_sub_relation bsr3 on bsc.id = bsr3.sub_contract_id and bsr3.type = '3' and bsr3.is_active = '1'
+
LEFT JOIN sys_user su ON su.id = bsr1.`value` and su.sub_id = bsc.sub_id and su.is_active = '1'
- LEFT JOIN bm_sub_team bst ON bst.id = bsr3.v and bst.is_active = '1'
+
LEFT JOIN bm_team_user_relation btur ON btur.team_id = bst.id and btur.is_active = '1' and btur.id_number is not null
LEFT JOIN bm_worker_ein_history bweh ON bweh.sub_id = bsc.sub_id AND bweh.is_active='1'
diff --git a/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml b/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml
index 265281d..23df4d2 100644
--- a/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml
@@ -24,7 +24,7 @@
`bm_sub_contract` bsc
LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1'
LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1'
- LEFT JOIN bm_sub_team bst ON bst.sub_id = bst.bs.id AND bst.is_active = '1'
+ LEFT JOIN bm_sub_team bst ON bst.sub_id = bs.id AND bst.is_active = '1'
LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1'
LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year}
@@ -53,7 +53,7 @@
`bm_sub_contract` bsc
LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1'
LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1'
- LEFT JOIN bm_sub_team bst ON bst.sub_id = bst.bs.id AND bst.is_active = '1'
+ LEFT JOIN bm_sub_team bst ON bst.sub_id = bs.id AND bst.is_active = '1'
LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1'
LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year}
diff --git a/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml b/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml
index de1241f..b6ddf4c 100644
--- a/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml
@@ -2,153 +2,44 @@
-
-
-
-
-
-
-
\ No newline at end of file