修改合同备案、初验备案列表查询

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java

@@ -390,19 +390,14 @@ public class ConstructionManage {
      */
     public PreInsVO detailPreInsByProjectId(Long projectId) {
         Project project = projectService.getById(projectId);
-
         PreInsVO vo = new PreInsVO();
         vo.setProjectId(projectId);
         vo.setPreliminaryInspectionMaterials(project.getPreliminaryInspectionMaterials());
-
-        List<PreInsAcceptancePerson> acceptancePersons = acceptancePersonService.list(Wrappers.lambdaQuery(PreInsAcceptancePerson.class)
+        LambdaQueryWrapper<PreInsAcceptancePerson> query = Wrappers.lambdaQuery(PreInsAcceptancePerson.class)
                 .eq(PreInsAcceptancePerson::getProjectId, projectId)
-                .orderByAsc(PreInsAcceptancePerson::getCreateOn));
-
-        if (CollUtil.isNotEmpty(acceptancePersons)) {
-            vo.setAcceptancePersons(convertPersons(acceptancePersons));
-        }
-
+                .orderByAsc(PreInsAcceptancePerson::getCreateOn);
+        List<PreInsAcceptancePerson> acceptancePersons = acceptancePersonService.list(query);
+        vo.setAcceptancePersons(convertPersons(acceptancePersons));
         return vo;
     }
 
@@ -410,8 +405,9 @@ public class ConstructionManage {
         if (CollUtil.isEmpty(acceptancePersons)) {
             return Collections.emptyList();
         }
-
-        return acceptancePersons.stream().map(u -> BeanUtil.copyProperties(u, PreInsAcceptancePersonVO.class)).collect(Collectors.toList());
+        return acceptancePersons.stream()
+                .map(u -> BeanUtil.copyProperties(u, PreInsAcceptancePersonVO.class))
+                .collect(Collectors.toList());
     }
 
     /**