优化
This commit is contained in:
@ -22,6 +22,7 @@ public class BgtProjectRecruitApplyConsentDTO{
|
||||
|
||||
/** 主键ID */
|
||||
@ApiModelProperty("主键ID")
|
||||
@NotNull(message = "主键ID不能为空")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("进场时间")
|
||||
|
@ -113,6 +113,10 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus<BgtProjectR
|
||||
*/
|
||||
Boolean quit(Long id);
|
||||
|
||||
/**
|
||||
* 取消选择
|
||||
*/
|
||||
Boolean cancel(Long id);
|
||||
/**
|
||||
* 批量退场
|
||||
*/
|
||||
|
@ -383,6 +383,35 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
|
||||
return updateById(recruitApply);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean cancel(Long id) {
|
||||
BgtProjectRecruitApply recruitApply = getById(id);
|
||||
BgtProjectRecruit recruit = iBgtProjectRecruitService.getById(recruitApply.getRecruitId());
|
||||
|
||||
//发消息
|
||||
HashMap<String, String> mp = new HashMap<>();
|
||||
mp.put("projectName", recruit.getRecruitName());
|
||||
mp.put("auditor", SecurityUtils.getUsername());
|
||||
Map<String, String> map = bgtMessage(mp, BGT_TYPE_CANSEL, true);
|
||||
WgzMessage wgzMessage = new WgzMessage()
|
||||
.setSenderType(USERTYPE_BGT)
|
||||
.setRecipientType(USERTYPE_WGZ)
|
||||
.setRecipientId(recruitApply.getUserId())
|
||||
.setHeadline(map.get(HEADLINE))
|
||||
.setSubheading(map.get(SUBHEADING))
|
||||
.setTableId(recruitApply.getId())
|
||||
.setTableName(SqlHelper.table(BgtProjectRecruitApply.class).getTableName())
|
||||
.setMessageLargeType(LARGE_OTHER)
|
||||
.setMessageSmallType(SMALL_CANCEL);
|
||||
iWgzMessageService.sendAMessage(wgzMessage);
|
||||
|
||||
recruitApply.setStatus(RecruitApplyStatus.BGT_REFUSE.getCode());
|
||||
if(RecruitApplyStatus.WORKING.getCode().equals(recruitApply.getStatus())){
|
||||
recruitApply.setLeaveTime(LocalDate.now());
|
||||
}
|
||||
return updateById(recruitApply);
|
||||
}
|
||||
|
||||
@Async
|
||||
@Override
|
||||
public void quitBatch(Long taskId) {
|
||||
|
@ -37,6 +37,10 @@ public class BgtMessageConstant {
|
||||
public static final String BGT_LEAVE_EXIT_HEADLINE = "您已从【%s】项目退场!";
|
||||
public static final String BGT_LEAVE_EXIT_SUBHEADING_ONE = "您已被【%s】指定从【%s】项目退场!";
|
||||
public static final String BGT_LEAVE_EXIT_SUBHEADING_TWO = "【%s】项目已完结,自动退场!";
|
||||
//取消选择
|
||||
public static final String BGT_LEAVE_CANSEL_HEADLINE = "您已从【%s】项目离开!";
|
||||
public static final String BGT_LEAVE_CANSEL_SUBHEADING_ONE = "您在【%s】项目中被【%s】拒绝!";
|
||||
|
||||
|
||||
//包工头->务工者 消息类型
|
||||
public static final String BGT_TYPE_SIGN_UP = "1"; //务工者报名
|
||||
@ -44,6 +48,7 @@ public class BgtMessageConstant {
|
||||
public static final String BGT_TYPE_LEAVE = "3"; //请假
|
||||
public static final String BGT_TYPE_MAKE_UP = "4"; //补卡
|
||||
public static final String BGT_TYPE_EXIT = "5"; //退场
|
||||
public static final String BGT_TYPE_CANSEL = "11"; //取消选择
|
||||
|
||||
|
||||
/**
|
||||
@ -146,6 +151,10 @@ public class BgtMessageConstant {
|
||||
map.put(HEADLINE, String.format(BGT_TO_FBG_SETTLEMENT_APPLY_HEADLINE, auditor));
|
||||
map.put(SUBHEADING, String.format(BGT_TO_FBG_SETTLEMENT_APPLY_SUBHEADING, auditor, amount));
|
||||
break;
|
||||
case "11":
|
||||
map.put(HEADLINE, String.format(BGT_LEAVE_CANSEL_HEADLINE, projectName));
|
||||
map.put(SUBHEADING, String.format(BGT_LEAVE_CANSEL_SUBHEADING_ONE, projectName,auditor));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -24,6 +24,7 @@ public class WgzAndBgtMessageConstant {
|
||||
public static final String SMALL_EXIT = "2"; //小类型-退场
|
||||
public static final String SMALL_LEAVE = "3"; //小类型-请假
|
||||
public static final String SMALL_DAILY = "4"; //小类型-日报补卡
|
||||
public static final String SMALL_CANCEL = "5"; //小类型-取消选择
|
||||
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user