Browse Source

年度计划列表修改

master
WendyYang 1 year ago
parent
commit
bac17f1c83
2 changed files with 5 additions and 6 deletions
  1. +4
    -4
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/enumeration/ProjectStatusEnum.java
  2. +1
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java

+ 4
- 4
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/enumeration/ProjectStatusEnum.java View File

@@ -56,10 +56,6 @@ public enum ProjectStatusEnum {
*/
ARCHIVED(30000, "已归档");

public static void main(String[] args) {
System.out.println(Arrays.stream(ProjectStatusEnum.values()).filter(w -> w.getCode() >= 10010).collect(Collectors.toList()));
}

private Integer code;
private String desc;

@@ -87,4 +83,8 @@ public enum ProjectStatusEnum {
return null;
}

public boolean eq(int code) {
return this.getCode().equals(code);
}

}

+ 1
- 2
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java View File

@@ -76,8 +76,7 @@ public class AnnualPlanLibManage {
item.setDeclaredAmount(w.getDeclareAmount());
item.setBuildOrg(w.getBuildOrgName());
item.setCreateOn(w.getCreateOn());
// TODO 是否开启项目申报
item.setIsStartDeclaredProject(true);
item.setIsStartDeclaredProject(!IN_THE_ANNUAL_PLAN.eq(w.getStatus()));
result.getRecords().add(item);
});
return result;


Loading…
Cancel
Save