From 3224dcca2c80941d124ca521b991288d132e3e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Fri, 24 Oct 2025 14:05:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=B8=AA=E4=B8=89=E8=A1=A8=E4=B8=80?=
 =?UTF-8?q?=E5=86=8C=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/job/mapper/WorkerJobMapper.java   | 2 +-
 .../java/com/bonus/job/task/ThreeTableOneRosterTask.java  | 8 ++++++--
 .../src/main/resources/mapper/job/WorkerJobMapper.xml     | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-job/src/main/java/com/bonus/job/mapper/WorkerJobMapper.java b/bonus-modules/bonus-job/src/main/java/com/bonus/job/mapper/WorkerJobMapper.java
index 138e0e7..7685f43 100644
--- a/bonus-modules/bonus-job/src/main/java/com/bonus/job/mapper/WorkerJobMapper.java
+++ b/bonus-modules/bonus-job/src/main/java/com/bonus/job/mapper/WorkerJobMapper.java
@@ -88,7 +88,7 @@ public interface WorkerJobMapper {
      */
     boolean getThreeTableOneRosterDataByLastMonth(String string);
 
-    void deleteWorkerPay(String lastMonth);
+    void deleteWorkerPay(@Param("lastMonth") String lastMonth, @Param("proId") String proId);
 
     List<AttProMonthPo> getProMonthData(String lastMonth);
 
diff --git a/bonus-modules/bonus-job/src/main/java/com/bonus/job/task/ThreeTableOneRosterTask.java b/bonus-modules/bonus-job/src/main/java/com/bonus/job/task/ThreeTableOneRosterTask.java
index cf8fc0a..0e7c782 100644
--- a/bonus-modules/bonus-job/src/main/java/com/bonus/job/task/ThreeTableOneRosterTask.java
+++ b/bonus-modules/bonus-job/src/main/java/com/bonus/job/task/ThreeTableOneRosterTask.java
@@ -72,6 +72,10 @@ public class ThreeTableOneRosterTask {
 
             //查询所有有人在场的工程
             List<MapBeanVo> listPro = mapper.getAllPro(lastMonth.toString());
+//            List<MapBeanVo> listPro = new ArrayList<>();
+//            MapBeanVo aaa = new MapBeanVo();
+//            aaa.setId(60);
+//            listPro.add(aaa);
             List<ThreeTableOneRosterPo> listRosterAll = new ArrayList<>();
             listPro.forEach(mapBeanVo -> {
                 //每个工程去循环生成
@@ -141,7 +145,7 @@ public class ThreeTableOneRosterTask {
             if(!listRosterAll.isEmpty()){
                 //插入数据
                 if(isExist){
-                    mapper.deleteWorkerPay(lastMonth.toString());
+                    mapper.deleteWorkerPay(lastMonth.toString(),"");
                 }
                 mapper.insertWorkerPay(listRosterAll);
                 //获取整合数据
@@ -271,7 +275,7 @@ public class ThreeTableOneRosterTask {
             if(!listRosterAll.isEmpty()){
                 //插入数据
                 if(isExist){
-                    mapper.deleteWorkerPay(month);
+                    mapper.deleteWorkerPay(month, String.valueOf(proId));
                 }
                 mapper.insertWorkerPay(listRosterAll);
                 //获取整合数据
diff --git a/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml b/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml
index ad8b33a..5aaa3a0 100644
--- a/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml
+++ b/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml
@@ -310,6 +310,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<delete id="deleteWorkerPay">
 		delete from tb_pro_month_table_roster where month = #{lastMonth}
+		<if test="proId != null and proId !=''">
+			and pro_id = #{proId}
+		</if>
 	</delete>
 
 	<select id="getProMonthData" resultType="com.bonus.job.domain.AttProMonthPo">