续建项目 能关联的项目

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

@@ -135,11 +135,13 @@ public class ConstructionManage {
         VUtils.isTrue(Objects.isNull(user)).throwMessage("获取登录用户失败!");
         LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req);
         //建设中状态以后的 都是
-        query.gt(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
+        query.and(q1 -> q1.gt(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode())
+                .or(q2 -> q2.eq(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode())
+                        .isNotNull(Project::getContractAmount)));
         query.eq(Project::getNewest, Boolean.TRUE);
         //只能看自己单位的
         query.eq(Project::getBuildOrgCode,user.getEmpPosUnitCode());
-        query.orderByAsc(Project::getTransactionTime);
+        query.orderByAsc(Project::getUpdateOn);
         Page<Project> page = projectService.page(req.page(), query);
 
         if (CollUtil.isEmpty(page.getRecords())) {