优化

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

@@ -60,6 +60,9 @@ public class WgzAppCancelRegistrationProjectDetailsRes implements Serializable {
 	@ApiModelProperty("招工开始时间")
 	private String recruitBeginTime;
 
+	@ApiModelProperty("招工结束时间")
+	private String recruitEndTime;
+
 	@ApiModelProperty("开工日期")
 	private String recruitWorkBeginTime;
 

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppProjectDetailsRes.java

@@ -13,6 +13,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 
@@ -59,6 +60,9 @@ public class WgzAppProjectDetailsRes implements Serializable {
 	@ApiModelProperty("招工开始时间")
 	private String recruitBeginTime;
 
+	@ApiModelProperty("招工结束时间")
+	private String recruitEndTime;
+
 	@ApiModelProperty("开工日期")
 	private String recruitWorkBeginTime;
 
@@ -104,4 +108,5 @@ public class WgzAppProjectDetailsRes implements Serializable {
 	@ApiModelProperty("招工地址")
 	private String recruitAddress;
 
+
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java

@@ -57,6 +57,9 @@ public class WgzApplyForPayrollSettlementAddRes implements Serializable {
 	@ApiModelProperty("招工开始时间")
 	private String recruitBeginTime;
 
+	@ApiModelProperty("招工结束时间")
+	private String recruitEndTime;
+
 	@ApiModelProperty("开工日期")
 	private String recruitWorkBeginTime;
 

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java

@@ -239,11 +239,29 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
 	@Override
 	@Transactional
 	public Boolean userCancelLeave(WgzAppCancelLeaveReq req) {
+		//获取请假详情
+		WgzLeave we = baseMapper.selectById(req.getId());
+		BgtProjectRecruitApply recruitApply = iBgtProjectRecruitApplyService.getById(we.getApplyKey());
+		//取消请假
 		WgzLeave wgzLeave = new WgzLeave().
 			setId(req.getId()).
 			setAuditorType("4").
 			setCancelLeave(LocalDateTime.now());
-		return  baseMapper.updateById(wgzLeave)>0;
+		int i = baseMapper.updateById(wgzLeave);
+		if (i > 0) {
+			//状态取消成功需要把对应消息的状态变更为【不需要操作】
+			iBgtMessageService.operation(
+				USERTYPE_WGZ,
+				recruitApply.getUserId(),
+				USERTYPE_BGT,
+				SecurityUtils.getAppUserId(),
+				recruitApply.getId(),
+				SqlHelper.table(BgtProjectRecruitApply.class).getTableName()
+			);
+			return true;
+		}else{
+			return false;
+		}
 	}
 
 	@Override