工资，日报，补卡

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockListDTO.java

@@ -0,0 +1,48 @@
+package com.ruoyi.bgt.domain.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("App包工头看日报查询对象")
+public class BgtDailyClockListDTO {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+
+	@ApiModelProperty("任务Id")
+	private Long taskId;
+
+	@ApiModelProperty("招工ID")
+	private Long recruitId;
+
+	@ApiModelProperty("审核状态（0未读 1未审核 2已审核）")
+	private String auditorType;
+
+	@ApiModelProperty("日报时间")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate dilyTime;
+
+	@ApiModelProperty("姓名")
+	private String username;
+
+	@ApiModelProperty(value = "审核人Id",hidden = true)
+	private Long auditorUserId;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockUpdateDTO.java

@@ -0,0 +1,25 @@
+package com.ruoyi.bgt.domain.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("App包工头看已读和审批对象")
+public class BgtDailyClockUpdateDTO {
+
+	@ApiModelProperty("主键")
+	private Long id;
+
+	@ApiModelProperty("审核状态（0未读 1未审核 2已审核）")
+	private String auditorType;
+
+	@ApiModelProperty("审核意见")
+	private String auditorOpinion;
+
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationListDTO.java

@@ -0,0 +1,45 @@
+package com.ruoyi.bgt.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 工资结算分页查询对象 wgz_pay_calculation
+ *
+ * @author ruoyi
+ * @date 2025-02-21
+ */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("包工头工资结算审核分页查询对象")
+public class BgtPayCalculationListDTO {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+
+	@ApiModelProperty("任务Id")
+	private Long taskId;
+
+	@ApiModelProperty("申请人名称")
+	private String userName;
+
+	/** 审核状态（0未读 1待审核 2已同意 3已拒绝） */
+	@ApiModelProperty("审核状态（0未读 1待审核 2已同意 3已拒绝）")
+	private List<String> auditorTypes;
+
+	@ApiModelProperty(value = "审核人Id",hidden = true)
+	private Long auditorUserId;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationUpdateDTO.java

@@ -0,0 +1,32 @@
+package com.ruoyi.bgt.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 工资结算分页查询对象 wgz_pay_calculation
+ *
+ * @author ruoyi
+ * @date 2025-02-21
+ */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("包工头工资结算审核对象")
+public class BgtPayCalculationUpdateDTO {
+
+	@ApiModelProperty("主键自增ID")
+	private Long id;
+	/** 审核状态（0未读 1待审核 2已同意 3已拒绝） */
+	@ApiModelProperty("审核状态（0未读 1待审核 2已同意 3已拒绝）")
+	private String auditorType;
+
+	@ApiModelProperty("审核意见")
+	private String auditorOpinion;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtReissueacardListDTO.java

@@ -0,0 +1,42 @@
+package com.ruoyi.bgt.domain.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("App包工头补卡记录查询对象")
+public class BgtReissueacardListDTO {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+
+	@ApiModelProperty("任务ID")
+	private Long taskId;
+
+	@ApiModelProperty("审核状态（0待审核 1审核中 2已同意 3已拒绝）")
+	private String auditorType;
+
+	@ApiModelProperty("时间")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate nowTime;
+
+	@ApiModelProperty(value = "审核人Id",hidden = true)
+	private Long auditorUserId;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtReissueacardUpdateDTO.java

@@ -0,0 +1,24 @@
+package com.ruoyi.bgt.domain.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("App包工头补卡审核对象")
+public class BgtReissueacardUpdateDTO {
+
+
+	@ApiModelProperty("主键ID")
+	private Long id;
+
+	@ApiModelProperty("审核状态（0待审核 1审核中 2已同意 3已拒绝）")
+	private String auditorType;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtDailyClockDetailVO.java

@@ -0,0 +1,72 @@
+package com.ruoyi.bgt.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("App包工头看日报视图对象")
+public class BgtDailyClockDetailVO {
+
+	@ApiModelProperty("主键")
+	private Long id;
+
+	/** 项目ID */
+	@ApiModelProperty("项目ID")
+	private Long recruitId;
+	/** 项目ID */
+	@ApiModelProperty("招工主题")
+	private String recruitName;
+	/** 人员ID */
+	@ApiModelProperty("人员ID")
+	private Long userId;
+
+	@ApiModelProperty("头像地址")
+	private String avatarName;
+
+	@ApiModelProperty("姓名")
+	private String username;
+	/** 日报时间 */
+	@ApiModelProperty("日报时间")
+	private LocalDateTime dilyTime;
+	/** 日报标记 */
+	@ApiModelProperty("日报标记")
+	private Integer dailyMark;
+	/** 日报位置 */
+	@ApiModelProperty("日报位置")
+	private String pnchOsition;
+	/** 今日完成工作 */
+	@ApiModelProperty("今日完成工作")
+	private String finishToday;
+	/** 未完成工作 */
+	@ApiModelProperty("未完成工作")
+	private String unfinished;
+	/** 明日工作 */
+	@ApiModelProperty("明日工作")
+	private String workTomorrow;
+	/** 协调与帮助 */
+	@ApiModelProperty("协调与帮助")
+	private String coordinate;
+	/** 附件，多个逗号分隔 */
+	@ApiModelProperty("附件，多个逗号分隔")
+	private String attachment;
+	/** 审核人ID */
+	@ApiModelProperty("审核人ID")
+	private Long auditorUserId;
+	/** 审核状态（0未读 1未审核 2已审核） */
+	@ApiModelProperty("审核状态（0未读 1未审核 2已审核）")
+	private String auditorType;
+	/** 审核意见 */
+	@ApiModelProperty("审核意见")
+	private String auditorOpinion;
+	/** 已读|审核时间 */
+	@ApiModelProperty("已读|审核时间")
+	private LocalDateTime auditorTime;
+
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtDailyClockListVO.java

@@ -0,0 +1,37 @@
+package com.ruoyi.bgt.domain.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("App包工头看日报视图对象")
+public class BgtDailyClockListVO {
+
+	@ApiModelProperty("主键")
+	private Long id;
+
+	@ApiModelProperty("今日完成工作")
+	private String finishToday;
+
+	@ApiModelProperty("审核状态（0未读 1未审核 2已审核）")
+	private String auditorType;
+
+	@ApiModelProperty("日报时间")
+	private LocalDateTime dilyTime;
+
+	@ApiModelProperty("头像地址")
+	private String avatarName;
+
+	@ApiModelProperty("姓名")
+	private String username;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppApplyForPayrollSettlementListRes.java

@@ -1,9 +1,5 @@
 package com.ruoyi.wgz.bo.res;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.wgz.domain.WgzPayCalculationFiles;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -74,6 +70,9 @@ public class WgzAppApplyForPayrollSettlementListRes implements Serializable {
 	@ApiModelProperty("审核人ID")
 	private Long auditorUserId;
 
+	@ApiModelProperty("审核人名字")
+	private String auditorUserName;
+
 	@ApiModelProperty("审核状态（0未读 1待审核 2已同意 3已拒绝）")
 	private String auditorType;
 

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzReplacementCardRecordRes.java

@@ -17,6 +17,8 @@ import java.time.LocalDateTime;
 @ApiModel("补卡申请历史记录返回对象")
 public class WgzReplacementCardRecordRes implements Serializable {
 
+	@ApiModelProperty("主键ID")
+	private Long id;
 
 	@ApiModelProperty("项目ID")
 	private Long recruitId;

ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzPayCalculation.java

@@ -1,21 +1,20 @@
 package com.ruoyi.wgz.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
-
-import java.math.BigDecimal;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
-import java.time.LocalDateTime;
-import java.time.LocalTime;
+import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 工资结算对象 wgz_pay_calculation
@@ -77,6 +76,9 @@ public class WgzPayCalculation implements Serializable {
     @ApiModelProperty("进场时间")
     private LocalDate entryTime;
 
+	@ApiModelProperty("离场时间")
+	private LocalDate leaveTime;
+
     /** 工资金额 */
     @Excel(name = "工资金额")
     @ApiModelProperty("工资金额")
@@ -112,6 +114,9 @@ public class WgzPayCalculation implements Serializable {
     @ApiModelProperty("审核人ID")
     private Long auditorUserId;
 
+	@ApiModelProperty("审核人名字")
+	private String auditorUserName;
+
     /** 审核状态（0未读 1待审核 2已同意 3已拒绝） */
     @Excel(name = "审核状态" , readConverterExp = "0=未读,1=待审核,2=已同意,3=已拒绝")
     @ApiModelProperty("审核状态（0未读 1待审核 2已同意 3已拒绝）")

ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzDailyClockMapper.java

@@ -1,13 +1,15 @@
 package com.ruoyi.wgz.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO;
+import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO;
+import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq;
-import com.ruoyi.wgz.bo.res.WgzAppLeaveHistoryListPageRes;
 import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
 import com.ruoyi.wgz.domain.WgzDailyClock;
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
-import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
 import org.apache.ibatis.annotations.CacheNamespace;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 日报打卡Mapper接口
@@ -24,4 +26,6 @@ public interface WgzDailyClockMapper extends BaseMapperPlus<WgzDailyClock> {
 	 * @return 分页查询结果
 	 */
 	Page<WgzAppUserDailyRecordRes> userDailyRecordListPage(Page<WgzAppDailyRecordReq> page);
+
+	Page<BgtDailyClockListVO> appQueryPageList(@Param("page") Page<BgtDailyClockListDTO> page, @Param("dto") BgtDailyClockListDTO dto);
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzPayCalculationMapper.java

@@ -1,13 +1,12 @@
 package com.ruoyi.wgz.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq;
-import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq;
-import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes;
-import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes;
-import com.ruoyi.wgz.domain.WgzPayCalculation;
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO;
 import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq;
+import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes;
+import com.ruoyi.wgz.domain.WgzPayCalculation;
 import org.apache.ibatis.annotations.CacheNamespace;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,4 +20,6 @@ import org.apache.ibatis.annotations.Param;
 @CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
 public interface WgzPayCalculationMapper extends BaseMapperPlus<WgzPayCalculation> {
 	Page<WgzAppApplyForPayrollSettlementListRes> userApplyForPayrollSettlementList (@Param("page") Page<WgzAppApplyForPayrollSettlementListReq> page);
+
+	Page<WgzAppApplyForPayrollSettlementListRes> appQueryPageList (@Param("page") Page<BgtPayCalculationListDTO> page, @Param("dto") BgtPayCalculationListDTO dto);
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzReissueacardMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.wgz.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.bgt.domain.dto.BgtReissueacardListDTO;
 import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
 import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes;
 import com.ruoyi.wgz.domain.WgzReissueacard;
@@ -24,4 +25,7 @@ public interface WgzReissueacardMapper extends BaseMapperPlus<WgzReissueacard> {
 	 * @return 分页查询结果
 	 */
 	Page<WgzReplacementCardRecordRes> userReplacementCardRecordListPage(@Param("page") Page<WgzAppReplacementCardRecordReq> page,@Param("userId") Long userId);
+
+	Page<WgzReplacementCardRecordRes> appQueryPageList(@Param("page") Page<BgtReissueacardListDTO> page,@Param("dto") BgtReissueacardListDTO dto);
+
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java

@@ -1,13 +1,17 @@
 package com.ruoyi.wgz.service;
 
+import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO;
+import com.ruoyi.bgt.domain.dto.BgtDailyClockUpdateDTO;
+import com.ruoyi.bgt.domain.vo.BgtDailyClockDetailVO;
+import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
 import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq;
 import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq;
 import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
 import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes;
 import com.ruoyi.wgz.domain.WgzDailyClock;
-import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.Collection;
@@ -79,4 +83,22 @@ public interface IWgzDailyClockService extends IServicePlus<WgzDailyClock> {
 	 * 日报日历·查看日报
 	 */
 	WgzDailyClock userCheckDailyNewspaper(Long id);
+
+
+	/**
+	 * 查询列表
+	 */
+	TableDataInfo<BgtDailyClockListVO> appQueryPageList(BgtDailyClockListDTO dto);
+
+
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	BgtDailyClockDetailVO appQueryById(Long id);
+
+	/**
+	 * 查看和审核
+	 */
+	Boolean appUpdate(BgtDailyClockUpdateDTO dto);
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java

@@ -1,12 +1,14 @@
 package com.ruoyi.wgz.service;
 
+import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO;
+import com.ruoyi.bgt.domain.dto.BgtPayCalculationUpdateDTO;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo;
 import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq;
 import com.ruoyi.wgz.bo.req.WgzApplyForPayrollSettlementAddReq;
 import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes;
 import com.ruoyi.wgz.domain.WgzPayCalculation;
-import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.Collection;
@@ -79,4 +81,20 @@ public interface IWgzPayCalculationService extends IServicePlus<WgzPayCalculatio
 	 * 根据务工者id和招工id，得到最新的数据
 	 */
 	WgzPayCalculation findByUserIdRecruitIdNewestData(Long userId, Long recruitId);
+
+	/**
+	 * 查询列表
+	 */
+	TableDataInfo<WgzAppApplyForPayrollSettlementListRes> appQueryPageList(BgtPayCalculationListDTO dto);
+
+	/**
+	 * 查询单个
+	 */
+	WgzAppApplyForPayrollSettlementListRes appQueryById(Long id);
+
+	/**
+	 * 审核工资结算
+	 */
+	Boolean appUpdate(BgtPayCalculationUpdateDTO dto);
+
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzReissueacardService.java

@@ -1,13 +1,14 @@
 package com.ruoyi.wgz.service;
 
-import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
-import com.ruoyi.wgz.bo.req.WgzAppCardReplacementApplicationReq;
-import com.ruoyi.wgz.bo.res.WgzAppCardReplacementApplicationRes;
-import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes;
-import com.ruoyi.wgz.domain.WgzReissueacard;
-import com.ruoyi.wgz.bo.WgzReissueacardQueryBo;
+import com.ruoyi.bgt.domain.dto.BgtReissueacardListDTO;
+import com.ruoyi.bgt.domain.dto.BgtReissueacardUpdateDTO;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.wgz.bo.WgzReissueacardQueryBo;
+import com.ruoyi.wgz.bo.req.WgzAppCardReplacementApplicationReq;
+import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
+import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes;
+import com.ruoyi.wgz.domain.WgzReissueacard;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -76,4 +77,14 @@ public interface IWgzReissueacardService extends IServicePlus<WgzReissueacard> {
 	 */
 	TableDataInfo<WgzReplacementCardRecordRes> userReplacementCardRecord(@Validated WgzAppReplacementCardRecordReq req);
 
+	/**
+	 * 补卡记录审核(分页)
+	 */
+	TableDataInfo<WgzReplacementCardRecordRes> appQueryPageList(BgtReissueacardListDTO dto);
+
+	/**
+	 * 审核
+	 */
+	Boolean appUpdate(BgtReissueacardUpdateDTO dto);
+
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java

@@ -2,27 +2,37 @@ package com.ruoyi.wgz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.bgt.domain.BgtProjectRecruit;
+import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO;
+import com.ruoyi.bgt.domain.dto.BgtDailyClockUpdateDTO;
+import com.ruoyi.bgt.domain.vo.BgtDailyClockDetailVO;
+import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO;
+import com.ruoyi.bgt.service.IBgtProjectRecruitService;
+import com.ruoyi.bgt.service.IBgtUserService;
+import com.ruoyi.common.core.domain.entity.BgtUser;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
 import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq;
 import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq;
 import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
 import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes;
 import com.ruoyi.wgz.bo.rests.WgzAppAttachmentAcquisitionTwo;
-import com.ruoyi.wgz.service.IWgzLeaveService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
 import com.ruoyi.wgz.domain.WgzDailyClock;
 import com.ruoyi.wgz.mapper.WgzDailyClockMapper;
 import com.ruoyi.wgz.service.IWgzDailyClockService;
+import com.ruoyi.wgz.service.IWgzLeaveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 
@@ -37,6 +47,12 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
     @Autowired
     private  IWgzLeaveService iWgzLeaveService;
 
+	@Autowired
+	private IBgtUserService userService;
+
+	@Autowired
+	private IBgtProjectRecruitService recruitService;
+
     @Override
     public WgzDailyClock queryById(Long id){
         return getById(id);
@@ -163,4 +179,33 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
 	public WgzDailyClock userCheckDailyNewspaper(Long id) {
 		return getById(id);
 	}
+
+	@Override
+	public TableDataInfo<BgtDailyClockListVO> appQueryPageList(BgtDailyClockListDTO dto) {
+		dto.setAuditorUserId(SecurityUtils.getAppUserId());
+		Page<BgtDailyClockListDTO> queryDTOPage = new Page<>();
+		queryDTOPage.setCurrent(dto.getPageNum());
+		queryDTOPage.setSize(dto.getPageSize());
+		Page<BgtDailyClockListVO> queryVOPage = baseMapper.appQueryPageList(queryDTOPage, dto);
+		return PageUtils.buildDataInfo(queryVOPage);
+	}
+
+	@Override
+	public BgtDailyClockDetailVO appQueryById(Long id) {
+		WgzDailyClock dailyClock = getById(id);
+		BgtDailyClockDetailVO detailVO = BeanUtil.copyProperties(dailyClock, BgtDailyClockDetailVO.class);
+		BgtUser bgtUser = userService.getById(dailyClock.getUserId());
+		detailVO.setUsername(bgtUser.getUsername());
+		detailVO.setAvatarName(bgtUser.getAvatarName());
+		BgtProjectRecruit recruit = recruitService.getById(dailyClock.getRecruitId());
+		detailVO.setRecruitName(recruit.getRecruitName());
+		return detailVO;
+	}
+
+	@Override
+	public Boolean appUpdate(BgtDailyClockUpdateDTO dto) {
+		WgzDailyClock dailyClock = BeanUtil.copyProperties(dto, WgzDailyClock.class);
+		dailyClock.setAuditorTime(LocalDateTime.now());
+		return updateById(dailyClock);
+	}
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java

@@ -2,41 +2,38 @@ package com.ruoyi.wgz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.bgt.domain.BgtProjectRecruit;
 import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
+import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO;
+import com.ruoyi.bgt.domain.dto.BgtPayCalculationUpdateDTO;
 import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
 import com.ruoyi.bgt.service.IBgtProjectRecruitService;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.domain.Annex;
-import com.ruoyi.common.domain.dto.AnnexDTO;
-import com.ruoyi.common.service.IAnnexService;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo;
 import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq;
-import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq;
 import com.ruoyi.wgz.bo.req.WgzApplyForPayrollSettlementAddReq;
 import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes;
+import com.ruoyi.wgz.domain.WgzPayCalculation;
+import com.ruoyi.wgz.domain.WgzPayCalculationFiles;
+import com.ruoyi.wgz.mapper.WgzPayCalculationMapper;
 import com.ruoyi.wgz.service.IWgzPayCalculationFilesService;
+import com.ruoyi.wgz.service.IWgzPayCalculationService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo;
-import com.ruoyi.wgz.domain.WgzPayCalculation;
-import com.ruoyi.wgz.mapper.WgzPayCalculationMapper;
-import com.ruoyi.wgz.service.IWgzPayCalculationService;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.reactive.TransactionalOperator;
 
-import java.util.ArrayList;
+import java.time.LocalDateTime;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 工资结算Service业务层处理
@@ -172,4 +169,28 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
 		return baseMapper.selectOne(eq);
 	}
 
+	@Override
+	public TableDataInfo<WgzAppApplyForPayrollSettlementListRes> appQueryPageList(BgtPayCalculationListDTO dto) {
+		dto.setAuditorUserId(SecurityUtils.getAppUserId());
+		Page<BgtPayCalculationListDTO> pe = new Page<>();
+		pe.setCurrent(dto.getPageNum());
+		pe.setSize(dto.getPageSize());
+		return PageUtils.buildDataInfo(baseMapper.appQueryPageList(pe,dto));
+	}
+
+	@Override
+	public WgzAppApplyForPayrollSettlementListRes appQueryById(Long id) {
+		WgzPayCalculation payCalculation = getById(id);
+		WgzAppApplyForPayrollSettlementListRes res = BeanUtil.copyProperties(payCalculation, WgzAppApplyForPayrollSettlementListRes.class);
+		List<WgzPayCalculationFiles> list = iWgzPayCalculationFilesService.list(Wrappers.<WgzPayCalculationFiles>lambdaQuery().eq(WgzPayCalculationFiles::getCalculationId, id));
+		res.setPayCalculation(list);
+		return res;
+	}
+
+	@Override
+	public Boolean appUpdate(BgtPayCalculationUpdateDTO dto) {
+		WgzPayCalculation payCalculation = BeanUtil.copyProperties(dto, WgzPayCalculation.class);
+		payCalculation.setAuditorTime(LocalDateTime.now());
+		return updateById(payCalculation);
+	}
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java

@@ -2,35 +2,36 @@ package com.ruoyi.wgz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.bgt.domain.BgtProjectRecruit;
 import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
+import com.ruoyi.bgt.domain.dto.BgtReissueacardListDTO;
+import com.ruoyi.bgt.domain.dto.BgtReissueacardUpdateDTO;
 import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
 import com.ruoyi.bgt.service.IBgtProjectRecruitService;
-import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
+import com.ruoyi.wgz.bo.WgzReissueacardQueryBo;
 import com.ruoyi.wgz.bo.req.WgzAppCardReplacementApplicationReq;
-import com.ruoyi.wgz.bo.res.WgzAppCardReplacementApplicationRes;
+import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
 import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes;
 import com.ruoyi.wgz.domain.WgzAttendance;
-import com.ruoyi.wgz.service.IWgzAttendanceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.wgz.bo.WgzReissueacardQueryBo;
 import com.ruoyi.wgz.domain.WgzReissueacard;
 import com.ruoyi.wgz.mapper.WgzReissueacardMapper;
+import com.ruoyi.wgz.service.IWgzAttendanceService;
 import com.ruoyi.wgz.service.IWgzReissueacardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.format.DateTimeFormatter;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 import java.util.Objects;
 
 /**
@@ -170,4 +171,17 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
 		return PageUtils.buildDataInfo(baseMapper.userReplacementCardRecordListPage(queryDTOPage,userId));
 	}
 
+	@Override
+	public TableDataInfo<WgzReplacementCardRecordRes> appQueryPageList(BgtReissueacardListDTO dto) {
+		dto.setAuditorUserId(SecurityUtils.getAppUserId());
+		Page<BgtReissueacardListDTO> queryDTOPage = new Page<>();
+		queryDTOPage.setCurrent(dto.getPageNum());
+		queryDTOPage.setSize(dto.getPageSize());
+		return PageUtils.buildDataInfo(baseMapper.appQueryPageList(queryDTOPage,dto));
+	}
+
+	@Override
+	public Boolean appUpdate(BgtReissueacardUpdateDTO dto) {
+		return updateById(BeanUtil.copyProperties(dto,WgzReissueacard.class));
+	}
 }

ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml

@@ -47,5 +47,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.id DESC
     </select>
 
+    <select id="appQueryPageList" resultType="com.ruoyi.bgt.domain.vo.BgtDailyClockListVO">
+        select wdc.id,
+               wdc.finish_today,
+               wdc.auditor_type,
+               wdc.dily_time,
+               wu.avatar_name,
+               wu.username
+        from wgz_daily_clock wdc
+                 left join wgz_user wu on wdc.user_id = wu.user_id
+        where wdc.auditor_user_id = #{dto.auditorUserId}
+        and wdc.recruit_id in (select id from bgt_project_recruit where task_id = #{dto.taskId})
+        <if test="dto.username != null and dto.username != ''">
+            and wu.username like concat('%', #{dto.username}, '%')
+        </if>
+        <if test="dto.auditorType != null and dto.auditorType != ''">
+            and wdc.auditor_type = #{dto.auditorType}
+        </if>
+        <if test="dto.recruit_id != null">
+            and DATE(wdc.dily_time) = #{dto.dilyTime}
+        </if>
+    </select>
+
 
 </mapper>

ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml

@@ -137,4 +137,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
+    <select id="appQueryPageList" resultMap="WgzAppApplyForPayrollSettlementListResResultMap">
+        SELECT
+            w.id,
+            w.task_id,
+            w.recruit_id,
+            w.user_id,
+            w.task_name,
+            w.task_address,
+            w.recruit_name,
+            w.user_name,
+            w.entry_time,
+            w.leave_time,
+            w.recruit_amount,
+            w.num,
+            w.working_state,
+            w.phone,
+            w.bank,
+            w.card_no,
+            w.auditor_user_id,
+            w.auditor_user_name,
+            w.auditor_type,
+            w.auditor_opinion,
+            w.auditor_time,
+            w.create_by,
+            w.create_time,
+            w.remark,
+            f.id AS file_id,
+            f.calculation_id,
+            f.type_of_attachment,
+            f.name,
+            f.type,
+            f.address,
+            f.del_flag,
+            f.create_by AS file_create_by,
+            f.create_time AS file_create_time,
+            f.update_by AS file_update_by,
+            f.update_time AS file_update_time,
+            f.remark AS file_remark
+        FROM
+            wgz_pay_calculation w
+                LEFT JOIN
+            wgz_pay_calculation_files f ON w.id = f.calculation_id
+        where w.auditor_user_id = #{dto.auditorUserId}
+        and a.task_id = #{dto.taskId}
+        <if test="dto.username != null and dto.username != ''">
+           and w.user_name like concat('%', #{dto.userName}, '%')
+        </if>
+        <if test="dto.auditorTypes != null and dto.auditorTypes.size() > 0">
+            AND bpra.auditor_type IN
+            <foreach collection="dto.auditorTypes" item="auditorType" open="(" separator="," close=")">
+                #{auditorType}
+            </foreach>
+        </if>
+    </select>
+
+
+
 </mapper>

ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml

@@ -42,4 +42,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.id DESC
     </select>
 
+
+    <select id="appQueryPageList" resultType="com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes">
+        SELECT
+            a.*,
+            b.username,
+            b.avatar_name,
+            c.username as userName
+        FROM
+            wgz_reissueacard a
+                LEFT JOIN bgt_user b ON (a.auditor_user_id = b.user_id and b.del_flag = 0)
+                LEFT JOIN wgz_user c ON (a.user_id = c.user_id and c.del_flag = 0)
+        WHERE
+            a.auditor_user_id = #{dto.auditorUserId}
+            and a.recruit_id in (select id from bgt_project_recruit where task_id = #{dto.taskId})
+        <if test="dto.auditorType != null and dto.auditorType != ''">
+            and w.auditor_type = #{dto.auditorType}
+        </if>
+        <if test="dto.nowTime != null">
+            and w.now_time = #{dto.nowTime}
+        </if>
+        ORDER BY
+            a.id DESC
+    </select>
+
 </mapper>