代码提交

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<String> engineeringIds;
 
+    @ApiModelProperty(value="工程id")
+    private String engineeringId;
+
     @ApiModelProperty(value="起始时间")
 //    @NotNull(message="起始时间不能为空！")
     private String startTime;

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<AppProjectMapper, AppProjectPO>
 //        if(Objects.equals(RequestUtil.getUsername(),"root")){
 //            userId = null;
 //        }
-        List<String> roleengineer = roleEngineerDevService.getRoleengineer();
+        /*如何为空前端没传，查询所有*/
-        if(CollectionUtils.isEmpty(roleengineer)){
+        if(StringUtils.isEmpty(appProjectQueryParm.getEngineeringId())){
-            return returnpage;
+            List<String> 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<CsLedger> queryWrapper = new QueryWrapper<>();
         returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm);
         List<AppProjectVO> collect = returnpage.getRecords().stream().map(temp -> {