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

111

Browse Source
This commit is contained in:
罗成
2025-03-12 16:29:54 +08:00
parent d5ab2aa26f
commit 330e4e5b8b
6 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java
View File

@ -390,6 +390,7 @@
return AjaxResult.success(iBgtProjectRecruitService.userCancelRegistrationProjectDetails(req));
}
/**
* 【首页】【项目进行中】 项目进行中（分页，但是理论上这里始终只会有一条数据）
* 【首页】【已完成项目】 已完成项目
@ -521,6 +522,8 @@
/**
* 通用接口
* =================================================================================================================

2
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java
View File

@ -278,12 +278,14 @@ public class BgtProjectRecruitServiceImpl extends ServicePlusImpl<BgtProjectRecr
.in(WgzMessage::getTableName, SqlHelper.table(BgtProjectRecruitApply.class).getTableName())
);
if (one !=null){
res.setMessageId(one.getId());
res.setIsOperation(one.getIsOperation());
}
res.setFull(wgzAppProjectDetailsRes.getStatus());
//5、获取当前申请人是否操作的对应状态
BgtProjectRecruitApply byId = bgtProjectRecruitApplyService.getById(req.getRecruitApplyId());
res.setStatus(byId.getStatus());
res.setRecruitApplyId(byId.getId());
return res;
}

8
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java
View File

@ -23,6 +23,9 @@ public class WgzAppCancelRegistrationProjectDetailsRes implements Serializable {
@ApiModelProperty("主键ID")
private Long id;
@ApiModelProperty("招工申请主键ID")
private Long recruitApplyId;
@ApiModelProperty("项目ID")
private Long projectId;
@ -105,10 +108,13 @@ public class WgzAppCancelRegistrationProjectDetailsRes implements Serializable {
//-----------
//-----------
//-----------
@ApiModelProperty("消息主键ID")
private Long messageId;
@ApiModelProperty("是否需要操作（0不需要 1需要 2已操作）")
private String isOperation;
@ApiModelProperty("招工是否正常（0正常 1已招满 2已失效）")
@ApiModelProperty("招工是否正常（1正常 2已招满 3已失效）")
private String full;
@ApiModelProperty("务工者状态：0报名 1包工同意 2包工头拒绝 3务工者同意 4务工者拒绝 5进场 6离场 7取消")

2
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppRegistrationInformationRes.java
View File

@ -82,7 +82,7 @@ public class WgzAppRegistrationInformationRes implements Serializable {
@ApiModelProperty("招工是否正常（0正常 1已招满 2已失效）")
private String full;
@ApiModelProperty("务工者同意拒绝状态：3务工者同意 4务工者拒绝")
@ApiModelProperty("务工者状态：0报名 1包工同意 2包工头拒绝 3务工者同意 4务工者拒绝 5进场 6离场 7取消")
private String status;
// @ApiModelProperty("附件实体数据")

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

@ -51,8 +51,7 @@ import java.time.LocalDateTime;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import static com.ruoyi.common.constants.BgtMessageConstant.BGT_SMALL_MAKE_UP;
import static com.ruoyi.common.constants.BgtMessageConstant.BGT_TYPE_SIGN_UP;
import static com.ruoyi.common.constants.BgtMessageConstant.*;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.*;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.USERTYPE_BGT;
@ -275,7 +274,7 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
setSubheading(WgzAndBgtMessageConstant.wgzMessage(mp,"212")).
setTableId(dc.getId()).
setTableName(SqlHelper.table(WgzDailyClock.class).getTableName()).
setMessageLargeType(BGT_TYPE_SIGN_UP).
setMessageLargeType(BGT_LARGE_OTHER).
setMessageSmallType(BGT_SMALL_MAKE_UP);
if (!iBgtMessageService.sendAMessage(bgtMessage)){
throw new RuntimeException("发送日报补卡消息失败！");

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

@ -237,7 +237,7 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
if(count == num){
return "1"; //已招满
}
if (!LocalDate.now().isBefore(recruitEndTime)){
if (LocalDate.now().isAfter(recruitEndTime)){
return "2"; //已失效
}
return "0";