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

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

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

@ -16,4 +16,7 @@ public class ZbfProjectSwitchListDTO {
@ApiModelProperty("项目名称")
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
public TableDataInfo<ZbfProject> zbfSwitchList(ZbfProjectSwitchListDTO dto) {
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.like(StrUtil.isNotBlank(dto.getProjectName()), ZbfProject::getProjectName, dto.getProjectName());
wrapper.orderByDesc(ZbfProject::getId);