diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java index 27e3527..a2e5cb5 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java @@ -33,6 +33,9 @@ public class AppProjectQueryParm { @ApiModelProperty(value="工程id") private List engineeringIds; + @ApiModelProperty(value="工程id") + private String engineeringId; + @ApiModelProperty(value="起始时间") // @NotNull(message="起始时间不能为空!") private String startTime; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java index 66663bf..78cc42d 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java @@ -32,6 +32,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Description: @@ -259,11 +260,18 @@ class AppProjectServiceImpl extends ServiceImpl // if(Objects.equals(RequestUtil.getUsername(),"root")){ // userId = null; // } - List roleengineer = roleEngineerDevService.getRoleengineer(); - if(CollectionUtils.isEmpty(roleengineer)){ - return returnpage; + /*如何为空前端没传,查询所有*/ + if(StringUtils.isEmpty(appProjectQueryParm.getEngineeringId())){ + List roleengineer = roleEngineerDevService.getRoleengineer(); + appProjectQueryParm.setEngineeringIds(roleengineer); + + if(CollectionUtils.isEmpty(roleengineer)){ + return returnpage; + } + }else { + appProjectQueryParm.setEngineeringIds(Stream.of(appProjectQueryParm.getEngineeringId()).collect(Collectors.toList())); } - appProjectQueryParm.setEngineeringIds(roleengineer); + QueryWrapper queryWrapper = new QueryWrapper<>(); returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm); List collect = returnpage.getRecords().stream().map(temp -> {