diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserReplacementCardRecordDetailsRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserReplacementCardRecordDetailsRes.java index a12c2f5..e6b892d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserReplacementCardRecordDetailsRes.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserReplacementCardRecordDetailsRes.java @@ -41,7 +41,10 @@ public class WgzAppUserReplacementCardRecordDetailsRes implements Serializable { private String recruitName; @ApiModelProperty("原打卡时间") - private String rawTime; + private LocalDateTime rawTime; + + @ApiModelProperty("星期") + private String week; @ApiModelProperty("现补卡时间") private LocalDateTime nowTime; @@ -69,7 +72,6 @@ public class WgzAppUserReplacementCardRecordDetailsRes implements Serializable { @ApiModelProperty("同意|拒绝时间") private LocalDateTime auditorTime; - @ApiModelProperty("创建时间|申请时间") private LocalDateTime createTime; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzReissueacard.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzReissueacard.java index 7b47be7..a7f6271 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzReissueacard.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzReissueacard.java @@ -64,7 +64,7 @@ public class WgzReissueacard implements Serializable { /** 原打卡时间 */ @Excel(name = "原打卡时间") @ApiModelProperty("原打卡时间") - private String rawTime; + private LocalDateTime rawTime; /** 现补卡时间 */ @Excel(name = "现补卡时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java index 45de4f8..bd12859 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java @@ -330,7 +330,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpllambdaQuery(). eq(WgzReissueacard::getRecruitId, wgzAttendance.getRecruitId()). eq(WgzReissueacard::getUserId, wgzAttendance.getUserId()). eq(WgzReissueacard::getAttendanceId, wgzAttendance.getId()). eq(WgzReissueacard::getType, type == 1 || type == 3 ? 0 : 1). - ne(WgzReissueacard::getAuditorOpinion, "3") + ne(WgzReissueacard::getAuditorType, "3") ); if (count == 0){ list.add(two); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java index 4bce424..ea01ed6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java @@ -17,6 +17,7 @@ import com.ruoyi.bgt.service.IBgtProjectRecruitService; import com.ruoyi.common.constants.WgzAndBgtMessageConstant; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.util.LocalDateToChineseWeekday; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.wgz.bo.WgzReissueacardQueryBo; @@ -37,6 +38,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -159,11 +162,11 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl SELECT a.*, - b.username, - b.avatar_name, + b.username as auditorname, + b.avatar_name as auditorHead, c.username as userName FROM wgz_reissueacard a