From e807076cfeab4deeeff57f03e400a2f885437fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Thu, 23 Oct 2025 16:35:11 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/bmw/domain/vo/BmWorkerContract.java   | 9 +++++----
 .../java/com/bonus/bmw/domain/vo/BmWorkerWageCard.java   | 4 +++-
 .../main/resources/mapper/bmw/RepairCardApplyMapper.xml  | 3 ++-
 .../main/resources/mapper/bmw/SubStatisticsMapper.xml    | 8 ++++----
 .../main/resources/mapper/bmw/WorkerStatisticsMapper.xml | 2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java
index d444cf2..27ed87e 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java
@@ -1,13 +1,13 @@
 package com.bonus.bmw.domain.vo;
 
-import java.util.Date;
-import java.util.List;
-
 import com.bonus.common.core.annotation.Excel;
 import com.bonus.system.api.model.UploadFileVo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 人员合同信息表
  */
@@ -90,6 +90,7 @@ public class BmWorkerContract {
     /**
     * 创建时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -150,4 +151,4 @@ public class BmWorkerContract {
 
     private String photoIds;
 
-}
\ No newline at end of file
+}
diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerWageCard.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerWageCard.java
index 62711d3..6c63085 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerWageCard.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerWageCard.java
@@ -55,6 +55,8 @@ public class BmWorkerWageCard {
      */
     private String createUser;
 
+    private String createTime;
+
     /**
      * 修改人
      */
@@ -99,4 +101,4 @@ public class BmWorkerWageCard {
 
     private String photoIds;
 
-}
\ No newline at end of file
+}
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml
index 34effb3..969d1ea 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml
@@ -205,7 +205,8 @@
                when brca.check_status = 1 then '审核通过'
                when brca.check_status = 2 then '审核未通过'
                else '' end as checkStatusName,
-               brca.check_time as checkTime
+               brca.check_time as checkTime,
+                brca.refuse_remark as refuseRemark
                from bm_repair_card_apply brca
         left join pm_project pp on pp.id = brca.pro_id
         <where>
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml
index 50aa639..0b58630 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml
@@ -8,7 +8,7 @@
         ps.sub_name as subName,
         ps.legal_person,
         count(DISTINCT bsc.pro_id) as proNum,
-        count(DISTINCT pstc.id) as teamNum,
+        count(DISTINCT pstc.team_id) as teamNum,
         count(DISTINCT bwem.worker_id) as einNum
         from pm_sub ps
         left join bm_sub_contract bsc on ps.id = bsc.sub_id and bsc.is_active='1' and bsc.sub_ein_status = '1'
@@ -130,7 +130,7 @@
                 INNER JOIN pm_project pp ON pp.id = bsc.pro_id
                 AND pp.is_active = 1
                 INNER JOIN pm_sub_team_contract pstc ON ps.id = pstc.sub_id
-                AND pstc.is_active = 1
+                AND pstc.is_active = 1 and pstc.pro_id = pp.id
                 INNER JOIN pm_sub_team pst ON pst.id = pstc.team_id
                 AND pst.is_active = 1
                 LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id
@@ -140,7 +140,7 @@
                 AND ps.id = bwer.sub_id and bwer.team_id = pst.id
         WHERE
             ps.is_active = 1 AND ps.id = #{subId}
-        GROUP BY pp.id,pst.id
+        GROUP BY pstc.id
     </select>
     <select id="getSubDeviceMsg" resultType="com.bonus.bmw.domain.po.PmAttDevice">
         SELECT
@@ -252,7 +252,7 @@
         WHERE
         bap.sub_id = #{subId}
         <if test="name != null">
-            and pw.workerName = #{name}
+            and workerName = #{name}
         </if>
         <if test="teamId != null">
             and bap.team_id = #{teamId}
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml
index 5d8b854..6d6c1b6 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml
@@ -57,7 +57,7 @@
   </select>
   <select id="getBmWorkerContractList" resultType="com.bonus.bmw.domain.vo.BmWorkerContract">
     select bwc.id,bwc.contract_code,bwc.contract_term_type,bwc.is_active,bwc.contract_start_date,
-      bwc.contract_stop_date,bwc.wage_approved_way,bwc.wage_criterion,bwc.contract_upload_date
+      bwc.contract_stop_date,bwc.wage_approved_way,bwc.wage_criterion,bwc.create_time
     from bm_worker_contract bwc
     left join bm_worker_ein_pro_record bwepr on bwc.id = bwepr.worker_id
     where bwc.worker_id =#{id}