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 { + data.setCalculationId(wgzPayCalculation.getId()); + }); + boolean fjSave = iWgzPayCalculationFilesService.saveBatch(req.getPayCalculation()); + if (!fjSave) { + throw new RuntimeException("附件新增失败!"); + } + //5、将修改标识符的数据存放到中间表 List 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 + + status = #{req.types} and + + a.del_flag = 0 ORDER BY a.id DESC