From c0fc2dc99f5488ccdeb90ecc6031c0e00863dc81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Mon, 17 Mar 2025 09:49:22 +0800
Subject: [PATCH] =?UTF-8?q?3.17=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java  |  8 ++++++++
 .../service/impl/WgzPayCalculationServiceImpl.java  | 13 +++++++++----
 .../resources/mapper/wgz/WgzDailyClockMapper.xml    |  7 ++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java
index 2ec5625..060479a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java
@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDate;
+
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
@@ -14,4 +16,10 @@ import lombok.experimental.Accessors;
 public class WgzAppDailyRecordReq extends PageReq {
 	@ApiModelProperty(value = "务工者Id",hidden = true)
 	private Long userId;
+
+	@ApiModelProperty(value = "0正常 1补卡 2全部 ")
+	private String types;
+
+	@ApiModelProperty(value = "日期（格式：年-月-日）")
+	private LocalDate rq;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
index b95079a..adf1b55 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
@@ -213,14 +213,19 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
 			setUserId(user.getUserId()).
 			setUserName(user.getUserName()).
 			setAuditorUserId(recruit.getUserId());
-		boolean fjSave = iWgzPayCalculationFilesService.saveBatch(req.getPayCalculation());
-		if (!fjSave) {
-			throw new RuntimeException("附件新增失败！");
-		}
 		boolean save = save(wgzPayCalculation);
 		if (!save) {
 			throw new RuntimeException("结算新增失败！");
 		}
+
+		req.getPayCalculation().forEach(data -> {
+			data.setCalculationId(wgzPayCalculation.getId());
+		});
+		boolean fjSave = iWgzPayCalculationFilesService.saveBatch(req.getPayCalculation());
+		if (!fjSave) {
+			throw new RuntimeException("附件新增失败！");
+		}
+
 		//5、将修改标识符的数据存放到中间表
 		List<WgzPayCalculationMiddle> listMiddle = new ArrayList<>();
 		for (WgzAttendance data : attList) {
diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml
index fbcd7f5..667ecbf 100644
--- a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml
@@ -43,7 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             wgz_daily_clock a
                 LEFT JOIN wgz_user b ON (a.user_id = b.user_id and b.del_flag = 0)
         WHERE
-            a.user_id = #{req.userId} and a.del_flag = 0
+            a.user_id = #{req.userId} and
+            DATE_FORMAT(dily_time, '%Y-%m-%d') = #{req.rq} and
+            <if test="req.types != 2">
+                status = #{req.types} and
+            </if>
+            a.del_flag = 0
         ORDER BY
             a.id DESC
     </select>