From a324b167780c656177b95f0934729ed018f226e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Tue, 11 Nov 2025 16:34:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/bmw/service/impl/HomePageSubServiceImpl.java | 1 + .../src/main/resources/mapper/bmw/HomePageSubMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java index 7942320..2f52381 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java @@ -44,6 +44,7 @@ public class HomePageSubServiceImpl implements HomePageSubService { @Override public List getTeamMsg(HomePagePoVo o) { + o.setCurrentDay(DateUtil.today()); if (o.getProId() != null){ String[] split = o.getProId().split(","); o.setProIds(Arrays.asList(split)); diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml index a362457..f45456b 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml @@ -68,7 +68,7 @@ pp.vol_level, pp.pro_status, count(DISTINCT ps.id) AS subNum, - count(DISTINCT psc.id) AS teamNum, + count(DISTINCT pst.id) AS teamNum, count(DISTINCT bwem.worker_id) AS einNum, count(DISTINCT bap.worker_id) AS attNum, count(DISTINCT IF(bwem.light_status = 1, bwem.worker_id, NULL)) AS yellowNum, @@ -204,7 +204,7 @@ INNER JOIN bm_sub_contract bsc ON ps.id = bsc.sub_id AND bsc.is_active = 1 AND bsc.sub_ein_status = 1 - INNER JOIN pm_project pp ON pp.id = bsc.pro_id + INNER JOIN pm_project pp ON pp.id = bsc.pro_id and pp.id = pstc.pro_id AND pp.is_active = 1 LEFT JOIN pm_sub_company psc ON pp.sub_com_id = psc.id LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id