From 0abe4478d9df4c835847303c2debd0a512352688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Thu, 25 Sep 2025 15:52:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E8=A1=A8=E4=B8=80=E5=86=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/job/domain/AttProMonthPo.java |  1 +
 .../java/com/bonus/job/mapper/WorkerJobMapper.java    |  4 +++-
 .../com/bonus/job/task/ThreeTableOneRosterTask.java   |  7 +++++--
 .../src/main/resources/mapper/job/WorkerJobMapper.xml | 11 ++++++++---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-job/src/main/java/com/bonus/job/domain/AttProMonthPo.java b/bonus-modules/bonus-job/src/main/java/com/bonus/job/domain/AttProMonthPo.java
index f5a1ddd..04380a6 100644
--- a/bonus-modules/bonus-job/src/main/java/com/bonus/job/domain/AttProMonthPo.java
+++ b/bonus-modules/bonus-job/src/main/java/com/bonus/job/domain/AttProMonthPo.java
@@ -4,6 +4,7 @@ import lombok.Data;
 
 @Data
 public class AttProMonthPo {
+    private Integer id;
     private Integer proId;
     private String month;
     private Integer rosterNum;
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 393aba5..c9930f2 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
@@ -92,9 +92,11 @@ public interface WorkerJobMapper {
 
     List<AttProMonthPo> getProMonthData(String lastMonth);
 
-    boolean getProMonthDataByTable(AttProMonthPo attProMonthPo);
+    Integer getProMonthDataByTable(AttProMonthPo attProMonthPo);
 
     void insertProMonthData(AttProMonthPo attProMonthPo);
 
     void updateProMonthData(AttProMonthPo attProMonthPo);
+
+    void updateMonthId(AttProMonthPo attProMonthPo);
 }
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 a759db5..18970f0 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
@@ -137,13 +137,16 @@ public class ThreeTableOneRosterTask {
                 //获取整合数据
                 List<AttProMonthPo> listRosterMonthAll = mapper.getProMonthData(lastMonth.toString());
                 for (AttProMonthPo attProMonthPo : listRosterMonthAll) {
-                    boolean isExistMonth =mapper.getProMonthDataByTable(attProMonthPo);
-                    if(isExistMonth){
+                    Integer id =mapper.getProMonthDataByTable(attProMonthPo);
+                    if(id>0){
+                        attProMonthPo.setId(id);
                         mapper.updateProMonthData(attProMonthPo);
                     }else{
                         mapper.insertProMonthData(attProMonthPo);
                     }
+                    mapper.updateMonthId(attProMonthPo);
                 }
+
             }
         }catch (Exception e){
             logger.error("人员入场更新表失败，{}",e.getMessage());
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 cfe55fc..45c7a2c 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
@@ -321,16 +321,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			pro_id
 	</select>
 
-	<select id="getProMonthDataByTable" resultType="boolean">
+	<select id="getProMonthDataByTable" resultType="Integer">
 		SELECT
-		COUNT(1) AS count
+			id
 		FROM
 		tb_pro_month_table
 		WHERE
 		table_month = #{month} and pro_id = #{proId}
+		limit 1
 	</select>
 
-	<insert id="insertProMonthData">
+	<insert id="insertProMonthData" keyProperty="id" keyColumn="id" useGeneratedKeys="true">
 		insert into tb_pro_month_table(pro_id,table_month,roster_num,attendance_num,repair_num,salary_num,sub_num,team_num,gross_salary,net_salary,pay_num)
 		values(#{proId},#{month},#{rosterNum},#{attendanceNum},#{repairNum},#{salaryNum},#{subNum},#{teamNum},#{grossSalary},#{netSalary},#{payNum})
 	</insert>
@@ -340,4 +341,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		sub_num=#{subNum},team_num=#{teamNum},gross_salary=#{grossSalary},net_salary=#{netSalary},pay_num=#{payNum}
 		where pro_id=#{proId} and table_month=#{month}
 	</update>
+
+	<update id="updateMonthId">
+		update tb_pro_month_table_roster set month_id=#{id} where pro_id=#{proId} and month=#{month}
+	</update>
 </mapper>