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

优化

Browse Source
This commit is contained in:
zt
2025-03-05 16:08:51 +08:00
parent e1ced7e274
commit f12f252904
9 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java
View File

@ -144,6 +144,9 @@ public class BgtProjectRecruit implements Serializable {
@ApiModelProperty("创建者ID")
private Long userId;
@ApiModelProperty("招工状态(1-进行中，2-已招满，3-已过期)")
private String status;
/**
* 删除标志（0代表存在 2代表删除）
*/

2
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendanceVO.java
View File

@ -48,4 +48,6 @@ public class BgtAttendanceVO {
@ApiModelProperty("申请者列表")
List<BgtProjectRecruitApplyVO> applyList;
@ApiModelProperty("到岗率")
private Integer reportToDutyRate= 0;
}

7
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtProjectRecruitApplyVO.java
View File

@ -31,6 +31,10 @@ public class BgtProjectRecruitApplyVO implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate entryTime;
@ApiModelProperty("离场时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate leaveTime;
@ApiModelProperty("务工者用户ID")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long userId;
@ -65,4 +69,7 @@ public class BgtProjectRecruitApplyVO implements Serializable {
@ApiModelProperty("打卡状态")
private String attendanceStatus;
@ApiModelProperty("已打分数")
private Double hasScore;
}

11
ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java
View File

@ -59,6 +59,13 @@ public class BusinessTask
@Autowired
private IWgzLeaveService iWgzLeaveService;
public void ryNoParams()
{
Console.log("-------------------------------------------------------------------------");
Console.log("测试任务执行了");
Console.log("-------------------------------------------------------------------------");
}
/**
* 招工任务招工时间结束自动拒绝未选择的务工者
*/
@ -143,7 +150,7 @@ public class BusinessTask
//添加消息提醒
WgzMessage wgzMessage = new WgzMessage().
setSenderType(USERTYPE_SYSTEM).
setRecipientType(USERTYPE_WGZ).
setRecipientType(WgzAndBgtMessageConstant.USERTYPE_WGZ).
setRecipientId(by.getUserId()).
setHeadline(WgzAndBgtMessageConstant.wgzMessage(mp,"113")).
setSubheading(WgzAndBgtMessageConstant.wgzMessage(mp,"114")).
@ -267,7 +274,7 @@ public class BusinessTask
//组装请假超时的消息
WgzMessage wgzMessage = new WgzMessage().
setSenderType(USERTYPE_SYSTEM).
setRecipientType(USERTYPE_WGZ).
setRecipientType(WgzAndBgtMessageConstant.USERTYPE_WGZ).
setRecipientId(wgzLeave.getUserId()).
setHeadline(WgzAndBgtMessageConstant.wgzMessage(mp,"117")).
setSubheading(WgzAndBgtMessageConstant.wgzMessage(mp,"118")).

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

@ -42,6 +42,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.*;
@ -425,6 +427,11 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
bgtAttendanceVO.setReportToDutyNum(countVO.getReportToDutyNum());
bgtAttendanceVO.setTotalNum(countVO.getTotalNum());
bgtAttendanceVO.setAbsenceDutyNum(countVO.getTotalNum()-countVO.getReportToDutyNum());
if(bgtAttendanceVO.getTotalNum()!=0){
int rate = new BigDecimal(bgtAttendanceVO.getReportToDutyNum()).divide(new BigDecimal(bgtAttendanceVO.getTotalNum()), 2, RoundingMode.HALF_UP)
.multiply(new BigDecimal(100)).intValue();
bgtAttendanceVO.setReportToDutyRate(rate);
}
}
}