项目相关实体

src/main/java/com/migao/entity/po/Project.java

@@ -29,6 +29,9 @@ public class Project implements Serializable {
     @Column(name = "id", columnDefinition = "int COMMENT '主键'")
     private Integer id;
 
+    @Column(name = "parent_id", columnDefinition = "int comment '父级id'")
+    private Integer parentId;
+
     @Column(name = "content", columnDefinition = "varchar(255) comment '项目内容'")
     private String content;
 

src/main/java/com/migao/entity/vo/req/ProjectPageQueryReq.java

@@ -15,40 +15,15 @@ import java.time.LocalDateTime;
 @Data
 public class ProjectPageQueryReq extends BasePageRequest {
 
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-    @ApiModelProperty(value = "资本性(万元)")
-    private String capital;
-    @ApiModelProperty(value = "项目内容")
-    private String content;
-    @ApiModelProperty(value = "成本性(万元)")
-    private String cost;
     @ApiModelProperty(value = "储备年份")
     private LocalDateTime createTime;
-    @ApiModelProperty(value = "")
-    private Integer createUserId;
-    @ApiModelProperty(value = "逻辑删除 0未删除 1已删除")
-    private Integer deleted;
-    @ApiModelProperty(value = "重要等级")
-    private String level;
+
     @ApiModelProperty(value = "项目名称")
     private String name;
-    @ApiModelProperty(value = "可研情况")
-    private String progress;
-    @ApiModelProperty(value = "项目分类")
-    private String projectClassify;
-    @ApiModelProperty(value = "项目专业分类")
-    private String specialtyClassify;
-    @ApiModelProperty(value = "合计(万元)")
-    private String total;
-    @ApiModelProperty(value = "总投资(万元)")
-    private String totalInvestment;
-    @ApiModelProperty(value = "二级分类")
-    private String twoClassify;
-    @ApiModelProperty(value = "填报单位")
-    private String unit;
+
     @ApiModelProperty(value = "下达状态")
     private String orderStatus;
+
     @ApiModelProperty(value = "储备状态")
     private String reserveStatus;
 

src/main/java/com/migao/service/impl/ProjectServiceImpl.java

@@ -64,58 +64,13 @@ public class ProjectServiceImpl implements ProjectService {
         PageRequest pageRequest = PageRequest.of(page - 1, size);
         Specification<Project> projectSpecification = (root, criteriaQuery, criteriaBuilder) -> {
             List<Predicate> predicateList = new ArrayList<>();
-                    if (projectPageQueryReq.getId()!=null) {
-                    Predicate equal = criteriaBuilder.equal(root.get("id").as(Integer.class),
-                    projectPageQueryReq.getId()
-                    );
-                    predicateList.add(equal);
-                    }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getCapital())) {
-                        Predicate like = criteriaBuilder.like(root.get("capital").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getCapital(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getContent())) {
-                        Predicate like = criteriaBuilder.like(root.get("content").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getContent(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getCost())) {
-                        Predicate like = criteriaBuilder.like(root.get("cost").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getCost(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
+
                     if (projectPageQueryReq.getCreateTime()!=null) {
                     Predicate equal = criteriaBuilder.equal(root.get("createTime").as(LocalDateTime.class),
                     projectPageQueryReq.getCreateTime()
                     );
                     predicateList.add(equal);
                     }
-                    if (projectPageQueryReq.getCreateUserId()!=null) {
-                    Predicate equal = criteriaBuilder.equal(root.get("createUserId").as(Integer.class),
-                    projectPageQueryReq.getCreateUserId()
-                    );
-                    predicateList.add(equal);
-                    }
-                    if (projectPageQueryReq.getDeleted()!=null) {
-                    Predicate equal = criteriaBuilder.equal(root.get("deleted").as(Integer.class),
-                    projectPageQueryReq.getDeleted()
-                    );
-                    predicateList.add(equal);
-                    }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getLevel())) {
-                        Predicate like = criteriaBuilder.like(root.get("level").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getLevel(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
                     if (StringUtils.isNotBlank(projectPageQueryReq.getName())) {
                         Predicate like = criteriaBuilder.like(root.get("name").as(String.class),
                         StringUtils.join(
@@ -123,55 +78,6 @@ public class ProjectServiceImpl implements ProjectService {
                         ));
                         predicateList.add(like);
                     }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getProgress())) {
-                        Predicate like = criteriaBuilder.like(root.get("progress").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getProgress(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getProjectClassify())) {
-                        Predicate like = criteriaBuilder.like(root.get("projectClassify").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getProjectClassify(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getSpecialtyClassify())) {
-                        Predicate like = criteriaBuilder.like(root.get("specialtyClassify").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getSpecialtyClassify(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getTotal())) {
-                        Predicate like = criteriaBuilder.like(root.get("total").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getTotal(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getTotalInvestment())) {
-                        Predicate like = criteriaBuilder.like(root.get("totalInvestment").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getTotalInvestment(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getTwoClassify())) {
-                        Predicate like = criteriaBuilder.like(root.get("twoClassify").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getTwoClassify(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
-                    if (StringUtils.isNotBlank(projectPageQueryReq.getUnit())) {
-                        Predicate like = criteriaBuilder.like(root.get("unit").as(String.class),
-                        StringUtils.join(
-                        "%", projectPageQueryReq.getUnit(), "%"
-                        ));
-                        predicateList.add(like);
-                    }
                     if (StringUtils.isNotBlank(projectPageQueryReq.getOrderStatus())) {
                         Predicate like = criteriaBuilder.like(root.get("orderStatus").as(String.class),
                         StringUtils.join(