From bf9fd22327a024e9fbbcdbac0d30f9c9c532153e Mon Sep 17 00:00:00 2001 From: zt Date: Tue, 20 May 2025 09:19:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/bgt/domain/BgtProjectRecruit.java | 6 ++++ .../domain/vo/BgtProjectRecruitDetailVO.java | 3 ++ .../impl/BgtProjectRecruitServiceImpl.java | 1 + .../com/ruoyi/fbs/domain/FbsProjectTask.java | 2 ++ .../fbs/domain/dto/FbsTaskSwitchListDTO.java | 3 ++ .../impl/FbsProjectTaskServiceImpl.java | 5 +++ .../java/com/ruoyi/task/BusinessTask.java | 31 ++++++++++--------- .../service/impl/WgzMessageServiceImpl.java | 3 +- .../dto/ZbfProjectSubcontractingAddDTO.java | 2 ++ .../domain/dto/ZbfProjectSwitchListDTO.java | 3 ++ .../service/impl/ZbfProjectServiceImpl.java | 6 ++++ 11 files changed, 50 insertions(+), 15 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java index aab2536..3a9dba2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java @@ -8,6 +8,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; import javax.validation.constraints.Pattern; import java.io.Serializable; import java.math.BigDecimal; @@ -84,6 +87,7 @@ public class BgtProjectRecruit implements Serializable { */ @Excel(name = "招工金额") @ApiModelProperty("招工金额") + @DecimalMax(value = "99999999", message = "金额不能大于 99999999") private BigDecimal recruitAmount; /** @@ -147,6 +151,8 @@ public class BgtProjectRecruit implements Serializable { private Double centralLatitude; @ApiModelProperty("'半径'") + @Min(value = 1, message = "半径不能小于 1") + @Max(value = 99999999, message = "半径不能大于 99999999") private Double rangeRadius; @ApiModelProperty("工种") diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtProjectRecruitDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtProjectRecruitDetailVO.java index 0e36d2c..794538d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtProjectRecruitDetailVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtProjectRecruitDetailVO.java @@ -52,6 +52,9 @@ public class BgtProjectRecruitDetailVO implements Serializable { @ApiModelProperty("任务名") private String taskName; + @ApiModelProperty("任务状态（1进行中 2已完成）") + private String taskStatus; + @ApiModelProperty("招工名称") private String recruitName; diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java index a88d637..01f4e0d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java @@ -210,6 +210,7 @@ public class BgtProjectRecruitServiceImpl extends ServicePlusImpllambdaQuery() // .eq(BgtProjectRecruitApply::getRecruitId, vo.getId()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java index a6e63f0..ee008d3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import javax.validation.constraints.DecimalMax; import javax.validation.constraints.Pattern; import java.io.Serializable; import java.math.BigDecimal; @@ -64,6 +65,7 @@ public class FbsProjectTask implements Serializable { /** 任务金额 */ @Excel(name = "任务金额") @ApiModelProperty("任务金额") + @DecimalMax(value = "99999999", message = "金额不能大于 99999999") private BigDecimal taskAmount; /** 用工数量 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskSwitchListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskSwitchListDTO.java index 5b5f227..30d377d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskSwitchListDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskSwitchListDTO.java @@ -16,4 +16,7 @@ public class FbsTaskSwitchListDTO { @ApiModelProperty("任务名") private String taskName; + @ApiModelProperty("任务状态（1-已发布，2已完成）") + private String taskStatus; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java index 02f5f84..975dc42 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java @@ -466,6 +466,11 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(FbsProjectTask::getCreateId,SecurityUtils.getAppUserId()); + if("1".equals(dto.getTaskStatus())){ + wrapper.in(FbsProjectTask::getStatus,Arrays.asList(ProjectTaskStatus.APPLY.getCode(),ProjectTaskStatus.PROGRESS.getCode())); + }else if("2".equals(dto.getTaskStatus())){ + wrapper.eq(FbsProjectTask::getStatus,ProjectTaskStatus.COMPLETE.getCode()); + } wrapper.like(StrUtil.isNotBlank(dto.getTaskName()),FbsProjectTask::getTaskName,dto.getTaskName()); wrapper.orderByDesc(FbsProjectTask::getId); Page page = page(PageUtils.buildPage(), wrapper); diff --git a/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java b/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java index 9ad3e42..244aa56 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java +++ b/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java @@ -95,25 +95,28 @@ public class BusinessTask .lt(BgtProjectRecruit::getRecruitEndTime, LocalDate.now())); if(CollectionUtil.isNotEmpty(recruitList)){ List recruitIds = recruitList.stream().map(BgtProjectRecruit::getId).collect(Collectors.toList()); + recruitService.lambdaUpdate().in(BgtProjectRecruit::getId, recruitIds) + .set(BgtProjectRecruit::getStatus, RecruitStatus.OVERDUE.getCode()).update(); List list = recruitApplyService.list(Wrappers.lambdaQuery() .in(BgtProjectRecruitApply::getRecruitId, recruitIds) .in(BgtProjectRecruitApply::getStatus, status) ); - List recruitApplyIds = list.stream().map(BgtProjectRecruitApply::getId).collect(Collectors.toList()); - recruitApplyService.lambdaUpdate() - .in(BgtProjectRecruitApply::getId, recruitApplyIds) - .set(BgtProjectRecruitApply::getStatus,RecruitApplyStatus.BGT_REFUSE.getCode()) - .update(); - recruitService.lambdaUpdate().in(BgtProjectRecruit::getId, recruitIds) - .set(BgtProjectRecruit::getStatus,RecruitStatus.OVERDUE.getCode()).update(); - //处理消息操作状态 - List bgtMessageHandleIds = list.stream().filter(vo->RecruitApplyStatus.SIGN_UP.getCode().equals(vo.getStatus())).map(BgtProjectRecruitApply::getId).collect(Collectors.toList()); - iBgtMessageService.operationBatch(bgtMessageHandleIds,SqlHelper.table(BgtProjectRecruitApply.class).getTableName(), BgtMessageConstant.BGT_LARGE_OTHER, BgtMessageConstant.BGT_SMALL_SIGN_UP ); + if(CollectionUtil.isNotEmpty(list)){ + List recruitApplyIds = list.stream().map(BgtProjectRecruitApply::getId).collect(Collectors.toList()); + recruitApplyService.lambdaUpdate() + .in(BgtProjectRecruitApply::getId, recruitApplyIds) + .set(BgtProjectRecruitApply::getStatus,RecruitApplyStatus.BGT_REFUSE.getCode()) + .update(); + //处理消息操作状态 + List bgtMessageHandleIds = list.stream().filter(vo->RecruitApplyStatus.SIGN_UP.getCode().equals(vo.getStatus())).map(BgtProjectRecruitApply::getId).collect(Collectors.toList()); + iBgtMessageService.operationBatch(bgtMessageHandleIds,SqlHelper.table(BgtProjectRecruitApply.class).getTableName(), BgtMessageConstant.BGT_LARGE_OTHER, BgtMessageConstant.BGT_SMALL_SIGN_UP ); + + List wgzMessageList = list.stream().filter(vo->RecruitApplyStatus.BGT_PASS.getCode().equals(vo.getStatus())).collect(Collectors.toList()); + iWgzMessageService.operationBatchSignUp(wgzMessageList); + //发送消息 + iWgzMessageService.operationBatchReject(list); + } - List wgzMessageList = list.stream().filter(vo->RecruitApplyStatus.BGT_PASS.getCode().equals(vo.getStatus())).collect(Collectors.toList()); - iWgzMessageService.operationBatchSignUp(wgzMessageList); - //发送消息 - iWgzMessageService.operationBatchReject(list); } Console.log("招工拒绝任务结束，此次拒绝任务个数："+recruitList.size()); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java index 2a6df5e..ddb2e1c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java @@ -330,7 +330,8 @@ public class WgzMessageServiceImpl extends ServicePlusImpl zbfSwitchList(ZbfProjectSwitchListDTO dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if("1".equals(dto.getProjectStatus())){ + wrapper.in(ZbfProject::getProjectStatus, Arrays.asList(ProjectStatus.NOT_START.getCode(), ProjectStatus.START.getCode())); + }else if("2".equals(dto.getProjectStatus())){ + wrapper.eq(ZbfProject::getProjectStatus, ProjectStatus.COMPLETE.getCode()); + } + wrapper.eq(ZbfProject::getUserId, SecurityUtils.getAppUserId()); wrapper.like(StrUtil.isNotBlank(dto.getProjectName()), ZbfProject::getProjectName, dto.getProjectName()); wrapper.orderByDesc(ZbfProject::getId);