zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
罗成
2025-03-11 11:24:59 +08:00
parent d48aa9aa67
commit e20c8da97c
76 changed files with 81 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppRegisteredProjectRes.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.wgz.bo.res;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -56,6 +57,10 @@ public class WgzAppRegisteredProjectRes implements Serializable {
@ApiModelProperty("已报名数量")
private Integer numberOfRegistered;
@ApiModelProperty("发布时间")
@JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
private LocalDateTime taskCreateTime;
@ApiModelProperty("工种")
private String typeOfWork;

10
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUnderwayRes.java
View File

@ -1,10 +1,12 @@
package com.ruoyi.wgz.bo.res;
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.io.Serializable;
import java.math.BigDecimal;
@ -27,6 +29,7 @@ public class WgzAppUnderwayRes implements Serializable {
private String recruitName;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
private LocalDateTime createTime;
@ApiModelProperty("封面图（多个逗号分隔）")
@ -51,6 +54,7 @@ public class WgzAppUnderwayRes implements Serializable {
private String recruitRequirement;
@ApiModelProperty("发布时间")
@JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
private LocalDateTime taskCreateTime;
@ApiModelProperty("进场时间")
@ -59,6 +63,12 @@ public class WgzAppUnderwayRes implements Serializable {
@ApiModelProperty("离场时间")
private LocalDate leaveTime;
@ApiModelProperty("工种")
private String typeOfWork;
@ApiModelProperty("工种名称")
private String typeOfWorkLabel;
// @ApiModelProperty("已报名数量")
// private Integer numberOfRegistered;

8
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
View File

@ -37,6 +37,7 @@ import com.ruoyi.wgz.service.IWgzAttendanceService;
import com.ruoyi.wgz.service.IWgzLeaveService;
import com.ruoyi.wgz.service.IWgzUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -61,19 +62,14 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
public static final String OffDuty = "1";
@Autowired
@Lazy
private IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService;
@Autowired
private IBgtProjectRecruitService iBgtProjectRecruitService;
@Autowired
private IWgzLeaveService iWgzLeaveService;
@Autowired
private IFbsProjectTaskService taskService;
@Autowired
private IWgzUserService wgzUserService;
@Override

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

@ -230,12 +230,15 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
if (req.getStatus().equals("1")){
now = req.getRqData();
}
// //3、判断当前时间的补卡是否存在，存在就不允许插入
// LambdaQueryWrapper<WgzDailyClock> apply = new LambdaQueryWrapper<WgzDailyClock>()
// .eq(WgzDailyClock::getUserId, appUserId)
// .eq(WgzDailyClock::getRecruitId, appById.getId())
// .eq(WgzDailyClock::getDilyTime, now);
// List<WgzDailyClock> wgzDailyClocks = baseMapper.selectList(apply);
//3、判断当前时间的补卡是否存在，存在就不允许插入
LambdaQueryWrapper<WgzDailyClock> apply = new LambdaQueryWrapper<WgzDailyClock>()
.eq(WgzDailyClock::getUserId, appUserId)
.eq(WgzDailyClock::getRecruitId, appById.getId())
.eq(WgzDailyClock::getDilyTime, now);
List<WgzDailyClock> wgzDailyClocks = baseMapper.selectList(apply);
if (!wgzDailyClocks.isEmpty()){
throw new RuntimeException("当前时间已存在补卡记录！");
}
//1、组装数据
WgzDailyClock dc = new WgzDailyClock();
BeanUtils.copyProperties(req,dc);