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-13 11:13:20 +08:00
parent 29b14e4c1f
commit 4a1f10e488
10 changed files with 95 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ public class WgzAppRegisteredProjectRes implements Serializable {
private String recruitName;
@ApiModelProperty("创建时间/报名时间")
@JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
private LocalDateTime createTime;
@ApiModelProperty("封面图（多个逗号分隔）")

3
ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzMessageService.java
View File

@ -15,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
import java.time.LocalDate;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 消息Service接口
@ -91,7 +92,7 @@ public interface IWgzMessageService extends IServicePlus<WgzMessage> {
/**
* 判断招工是否已招满或已过期
*/
String JudgingRecruitment(Long recruitId, int num, LocalDate recruitEndTime);
Map<String, Object> JudgingRecruitment(Long recruitId, int num, LocalDate recruitEndTime);
/**
* 修改已读未读状态

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

@ -251,6 +251,7 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
if ( insert > 0 && req.getStatus().equals("1")){
WgzUser byId = wgzUserService.findByUserId(appUserId);
Map<String, String> mp = new HashMap<>();
mp.put("userName",byId.getUsername());
mp.put("data",String.valueOf(LocalDate.now()));
WgzMessage wgzMessage = new WgzMessage().
setSenderType(USERTYPE_SYSTEM).

20
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java
View File

@ -212,7 +212,8 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
//2、根据招工ID得到招工信息及附件
WgzAppRegistrationInformationRes byRecruitIdData = baseMapper.findByRecruitIdData(byId.getTableId());
byRecruitIdData.setMessageId(byId.getId()).setIsOperation(byId.getIsOperation());
byRecruitIdData.setFull(JudgingRecruitment(byId.getTableId(), Integer.parseInt(byRecruitIdData.getRecruitStaffNum()), byRecruitIdData.getRecruitEndTime()));
Map<String, Object> stringObjectMap = JudgingRecruitment(byId.getTableId(), Integer.parseInt(byRecruitIdData.getRecruitStaffNum()), byRecruitIdData.getRecruitEndTime());
byRecruitIdData.setFull(stringObjectMap.get("status").toString());
return byRecruitIdData;
}
@ -231,15 +232,20 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
* @return
*/
@Override
public String JudgingRecruitment(Long recruitId,int num,LocalDate recruitEndTime) {
public Map<String, Object> JudgingRecruitment(Long recruitId,int num,LocalDate recruitEndTime) {
Map<String, Object> mp = new HashMap<>();
//使用数据库行级锁
int count = baseMapper.countRecruitApply(recruitId);
if(count == num){
return "1"; //已招满
}
mp.put("count", count);
if (LocalDate.now().isAfter(recruitEndTime)){
return "2"; //已失效
mp.put("status", "2");
return mp; //已失效
}
return "0";
if(count == num){
mp.put("status", "1");
return mp; //已招满
}
mp.put("status", "0");
return mp;
}
}