Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -343,4 +343,19 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
                 .build();
         return Result.success(querySelectRspDTO);
     }
+    //标准评估流程 查询项目群接口
+    @GetMapping("/queryProjectGroup")
+    @ApiOperation("查询项目群")
+    public ResponseMessage queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary){
+        return Result.success( sarStandProjectLibraryService.queryProjectGroup(sarStandProjectLibrary));
+    }
+    //标准评估流程根据项目群查项目接口
+    @GetMapping("/queryProjects")
+    @ApiOperation("查询项目群下的项目")
+    public ResponseMessage queryProjects(SarStandProjectLibrary sarStandProjectLibrary){
+        return Result.success( sarStandProjectLibraryService.queryProjects(sarStandProjectLibrary));
+    }
+
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java

@@ -33,4 +33,7 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         void deleteByProjectId(@Param("projectId")String projectId);
 
         List<String> selectListByids(@Param("ids") List<String> ids);
+        List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+
+        List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List<String> strings);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java

@@ -29,5 +29,8 @@ public interface SarStandProjectLibraryService {
     void batchInsertAdd(@Param("ids") List<StandProjectRelationDto> list);
     List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId);
     public Head AnalysisJsonAndStorage(String jsonStr);
+    public List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+
+    public List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -126,6 +126,24 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         return head;
     }
 
+    @Override
+    public List<SarStandProjectLibrary> queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) {
+        return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary);
+    }
+
+    @Override
+    public List<SarStandProjectLibrary> queryProjects(SarStandProjectLibrary sarStandProjectLibrary) {
+        List<String> ids=new ArrayList<>();
+        if (null!=sarStandProjectLibrary.getProjectGroup() && !"".equals(sarStandProjectLibrary.getProjectGroup())){
+            if (sarStandProjectLibrary.getProjectGroup().contains(",")){
+                ids.addAll(new ArrayList<>(Arrays.asList(sarStandProjectLibrary.getProjectGroup().split(","))));
+            }else {
+                ids.add(sarStandProjectLibrary.getProjectGroup());
+            }
+        }
+        return sarStandProjectLibraryDao.queryProjects(sarStandProjectLibrary,ids);
+    }
+
     @Override
     public IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize,
                                                                  SarStandProjectLibraryDto sarDto) {