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

优化

Browse Source
This commit is contained in:
zt
2025-05-20 09:19:16 +08:00
parent 9b1fc6fe99
commit bf9fd22327
11 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java
View File

@ -8,6 +8,9 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; 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 javax.validation.constraints.Pattern;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -84,6 +87,7 @@ public class BgtProjectRecruit implements Serializable {
*/ */
@Excel(name = "招工金额") @Excel(name = "招工金额")
@ApiModelProperty("招工金额") @ApiModelProperty("招工金额")
@DecimalMax(value = "99999999", message = "金额不能大于 99999999")
private BigDecimal recruitAmount; private BigDecimal recruitAmount;
/** /**
@ -147,6 +151,8 @@ public class BgtProjectRecruit implements Serializable {
private Double centralLatitude; private Double centralLatitude;
@ApiModelProperty("'半径'") @ApiModelProperty("'半径'")
@Min(value = 1, message = "半径不能小于 1")
@Max(value = 99999999, message = "半径不能大于 99999999")
private Double rangeRadius; private Double rangeRadius;
@ApiModelProperty("工种") @ApiModelProperty("工种")

3
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtProjectRecruitDetailVO.java
View File

@ -52,6 +52,9 @@ public class BgtProjectRecruitDetailVO implements Serializable {
@ApiModelProperty("任务名") @ApiModelProperty("任务名")
private String taskName; private String taskName;
@ApiModelProperty("任务状态（1进行中 2已完成）")
private String taskStatus;
@ApiModelProperty("招工名称") @ApiModelProperty("招工名称")
private String recruitName; private String recruitName;

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

@ -210,6 +210,7 @@ public class BgtProjectRecruitServiceImpl extends ServicePlusImpl<BgtProjectRecr
BgtProjectRecruitDetailVO vo = BeanUtil.toBean(recruit, BgtProjectRecruitDetailVO.class); BgtProjectRecruitDetailVO vo = BeanUtil.toBean(recruit, BgtProjectRecruitDetailVO.class);
FbsProjectTask task = fbsProjectTaskService.getById(vo.getTaskId()); FbsProjectTask task = fbsProjectTaskService.getById(vo.getTaskId());
vo.setTaskName(task.getTaskName()); vo.setTaskName(task.getTaskName());
vo.setTaskStatus(task.getStatus());
// int count = bgtProjectRecruitApplyService.count(Wrappers.<BgtProjectRecruitApply>lambdaQuery() // int count = bgtProjectRecruitApplyService.count(Wrappers.<BgtProjectRecruitApply>lambdaQuery()
// .eq(BgtProjectRecruitApply::getRecruitId, vo.getId()) // .eq(BgtProjectRecruitApply::getRecruitId, vo.getId())

2
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java
View File

@ -8,6 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -64,6 +65,7 @@ public class FbsProjectTask implements Serializable {
/** 任务金额 */ /** 任务金额 */
@Excel(name = "任务金额") @Excel(name = "任务金额")
@ApiModelProperty("任务金额") @ApiModelProperty("任务金额")
@DecimalMax(value = "99999999", message = "金额不能大于 99999999")
private BigDecimal taskAmount; private BigDecimal taskAmount;
/** 用工数量 */ /** 用工数量 */

3
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskSwitchListDTO.java
View File

@ -16,4 +16,7 @@ public class FbsTaskSwitchListDTO {
@ApiModelProperty("任务名") @ApiModelProperty("任务名")
private String taskName; private String taskName;
@ApiModelProperty("任务状态（1-已发布，2已完成）")
private String taskStatus;
} }

5
ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java
View File

@ -466,6 +466,11 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
LambdaQueryWrapper<FbsProjectTask> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<FbsProjectTask> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(FbsProjectTask::getCreateId,SecurityUtils.getAppUserId()); 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.like(StrUtil.isNotBlank(dto.getTaskName()),FbsProjectTask::getTaskName,dto.getTaskName());
wrapper.orderByDesc(FbsProjectTask::getId); wrapper.orderByDesc(FbsProjectTask::getId);
Page<FbsProjectTask> page = page(PageUtils.buildPage(), wrapper); Page<FbsProjectTask> page = page(PageUtils.buildPage(), wrapper);

31
ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java
View File

@ -95,25 +95,28 @@ public class BusinessTask
.lt(BgtProjectRecruit::getRecruitEndTime, LocalDate.now())); .lt(BgtProjectRecruit::getRecruitEndTime, LocalDate.now()));
if(CollectionUtil.isNotEmpty(recruitList)){ if(CollectionUtil.isNotEmpty(recruitList)){
List<Long> recruitIds = recruitList.stream().map(BgtProjectRecruit::getId).collect(Collectors.toList()); List<Long> recruitIds = recruitList.stream().map(BgtProjectRecruit::getId).collect(Collectors.toList());
recruitService.lambdaUpdate().in(BgtProjectRecruit::getId, recruitIds)
.set(BgtProjectRecruit::getStatus, RecruitStatus.OVERDUE.getCode()).update();
List<BgtProjectRecruitApply> list = recruitApplyService.list(Wrappers.<BgtProjectRecruitApply>lambdaQuery() List<BgtProjectRecruitApply> list = recruitApplyService.list(Wrappers.<BgtProjectRecruitApply>lambdaQuery()
.in(BgtProjectRecruitApply::getRecruitId, recruitIds) .in(BgtProjectRecruitApply::getRecruitId, recruitIds)
.in(BgtProjectRecruitApply::getStatus, status) .in(BgtProjectRecruitApply::getStatus, status)
); );
List<Long> recruitApplyIds = list.stream().map(BgtProjectRecruitApply::getId).collect(Collectors.toList()); if(CollectionUtil.isNotEmpty(list)){
recruitApplyService.lambdaUpdate() List<Long> recruitApplyIds = list.stream().map(BgtProjectRecruitApply::getId).collect(Collectors.toList());
.in(BgtProjectRecruitApply::getId, recruitApplyIds) recruitApplyService.lambdaUpdate()
.set(BgtProjectRecruitApply::getStatus,RecruitApplyStatus.BGT_REFUSE.getCode()) .in(BgtProjectRecruitApply::getId, recruitApplyIds)
.update(); .set(BgtProjectRecruitApply::getStatus,RecruitApplyStatus.BGT_REFUSE.getCode())
recruitService.lambdaUpdate().in(BgtProjectRecruit::getId, recruitIds) .update();
.set(BgtProjectRecruit::getStatus,RecruitStatus.OVERDUE.getCode()).update(); //处理消息操作状态
//处理消息操作状态 List<Long> bgtMessageHandleIds = list.stream().filter(vo->RecruitApplyStatus.SIGN_UP.getCode().equals(vo.getStatus())).map(BgtProjectRecruitApply::getId).collect(Collectors.toList());
List<Long> 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 );
iBgtMessageService.operationBatch(bgtMessageHandleIds,SqlHelper.table(BgtProjectRecruitApply.class).getTableName(), BgtMessageConstant.BGT_LARGE_OTHER, BgtMessageConstant.BGT_SMALL_SIGN_UP );
List<BgtProjectRecruitApply> wgzMessageList = list.stream().filter(vo->RecruitApplyStatus.BGT_PASS.getCode().equals(vo.getStatus())).collect(Collectors.toList());
iWgzMessageService.operationBatchSignUp(wgzMessageList);
//发送消息
iWgzMessageService.operationBatchReject(list);
}
List<BgtProjectRecruitApply> 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()); Console.log("招工拒绝任务结束，此次拒绝任务个数："+recruitList.size());
} }

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

@ -330,7 +330,8 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
.setSubheading(map.get(SUBHEADING)) .setSubheading(map.get(SUBHEADING))
.setTableId(recruitApply.getId()) .setTableId(recruitApply.getId())
.setTableName(SqlHelper.table(BgtProjectRecruitApply.class).getTableName()) .setTableName(SqlHelper.table(BgtProjectRecruitApply.class).getTableName())
.setMessageLargeType(LARGE_APPLY); .setMessageLargeType(LARGE_APPLY)
.setCreateBy("系统").setUpdateBy("系统");
wgzMessages.add(wgzMessage); wgzMessages.add(wgzMessage);
} }
if(CollectionUtil.isNotEmpty(wgzMessages)){ if(CollectionUtil.isNotEmpty(wgzMessages)){

2
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectSubcontractingAddDTO.java
View File

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.DecimalMax;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
@ -28,6 +29,7 @@ public class ZbfProjectSubcontractingAddDTO {
private String subDescribe; private String subDescribe;
@ApiModelProperty("分包金额") @ApiModelProperty("分包金额")
@DecimalMax(value = "99999999", message = "金额不能大于 99999999")
private BigDecimal subAmount; private BigDecimal subAmount;
@ApiModelProperty("资质要求") @ApiModelProperty("资质要求")

3
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectSwitchListDTO.java
View File

@ -16,4 +16,7 @@ public class ZbfProjectSwitchListDTO {
@ApiModelProperty("项目名称") @ApiModelProperty("项目名称")
private String projectName; private String projectName;
@ApiModelProperty("项目状态，1-在建，2-完成")
private String projectStatus;
} }

6
ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java
View File

@ -994,6 +994,12 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
@Override @Override
public TableDataInfo<ZbfProject> zbfSwitchList(ZbfProjectSwitchListDTO dto) { public TableDataInfo<ZbfProject> zbfSwitchList(ZbfProjectSwitchListDTO dto) {
LambdaQueryWrapper<ZbfProject> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ZbfProject> 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.eq(ZbfProject::getUserId, SecurityUtils.getAppUserId());
wrapper.like(StrUtil.isNotBlank(dto.getProjectName()), ZbfProject::getProjectName, dto.getProjectName()); wrapper.like(StrUtil.isNotBlank(dto.getProjectName()), ZbfProject::getProjectName, dto.getProjectName());
wrapper.orderByDesc(ZbfProject::getId); wrapper.orderByDesc(ZbfProject::getId);