diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java index 9ef4082..2b1e928 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java +++ b/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; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppProjectDetailsRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppProjectDetailsRes.java index fb17441..725e65f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppProjectDetailsRes.java +++ b/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; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java index 9d4d1c0..63488c2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java +++ b/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; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java index 9db0572..a19ed98 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java @@ -239,11 +239,29 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl0; + 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 diff --git a/ruoyi/uploadPath/upload/2025/03/25/06af7df3-4eb3-43e7-8e4a-db79c7e84276.jpg b/ruoyi/uploadPath/upload/2025/03/25/06af7df3-4eb3-43e7-8e4a-db79c7e84276.jpg deleted file mode 100644 index 2d595bf..0000000 Binary files a/ruoyi/uploadPath/upload/2025/03/25/06af7df3-4eb3-43e7-8e4a-db79c7e84276.jpg and /dev/null differ diff --git a/ruoyi/uploadPath/upload/2025/03/26/65d4fd8d-3509-45a4-a23f-9d1490a0ce3c.pdf b/ruoyi/uploadPath/upload/2025/03/26/65d4fd8d-3509-45a4-a23f-9d1490a0ce3c.pdf deleted file mode 100644 index b91e9f3..0000000 Binary files a/ruoyi/uploadPath/upload/2025/03/26/65d4fd8d-3509-45a4-a23f-9d1490a0ce3c.pdf and /dev/null differ