Browse Source

合同debug

master
PoffyZhang 11 months ago
parent
commit
0d918b98a4
2 changed files with 12 additions and 10 deletions
  1. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java
  2. +10
    -10
      pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java

+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java View File

@@ -112,6 +112,8 @@ public class WorkbenchManage {
if (userInfoHelper.isSuperOrRegionAdmin(user.getUserId())) { if (userInfoHelper.isSuperOrRegionAdmin(user.getUserId())) {
res.setRegionDeclared(WorkbenchConverter.convert(defaultDeclaredProjectManage res.setRegionDeclared(WorkbenchConverter.convert(defaultDeclaredProjectManage
.declaredProjectRegionStatistics(year, user),defaultDeclaredProjectManage.declaredProjectRegionStatistics(year - 1, user))); .declaredProjectRegionStatistics(year, user),defaultDeclaredProjectManage.declaredProjectRegionStatistics(year - 1, user)));
}else{
res.setRegionDeclared(new WorkbenchVO.DeclaredStatistics());
} }
stopWatch.stop(); stopWatch.stop();
log.info("项目统计数据 耗时,{} s",stopWatch.getTotalTimeSeconds()); log.info("项目统计数据 耗时,{} s",stopWatch.getTotalTimeSeconds());


+ 10
- 10
pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java View File

@@ -95,22 +95,22 @@ public class WorkbenchVO implements Serializable {
@Data @Data
public static class DeclaredStatistics { public static class DeclaredStatistics {
@ApiModelProperty("总项目数") @ApiModelProperty("总项目数")
private Integer totalNum;
private Integer totalNum = 0;
@ApiModelProperty("建设项目数") @ApiModelProperty("建设项目数")
private Integer buildNum;
private Integer buildNum = 0;
@ApiModelProperty("运维项目数") @ApiModelProperty("运维项目数")
private Integer operationNum;
private Integer operationNum = 0;


@ApiModelProperty("待立项数") @ApiModelProperty("待立项数")
private Integer notApprovedNum;
private Integer notApprovedNum = 0;
@ApiModelProperty("已立项数") @ApiModelProperty("已立项数")
private Integer approvedNum;
private Integer approvedNum = 0;
@ApiModelProperty("建设中数") @ApiModelProperty("建设中数")
private Integer constructionNum;
private Integer constructionNum = 0;
@ApiModelProperty("待验收数") @ApiModelProperty("待验收数")
private Integer tobeInspectedNum;
private Integer tobeInspectedNum = 0;
@ApiModelProperty("已归档数") @ApiModelProperty("已归档数")
private Integer archivedNum;
private Integer archivedNum = 0;


@ApiModelProperty("申报总金额") @ApiModelProperty("申报总金额")
private BigDecimal declaredAmount = BigDecimal.ZERO; private BigDecimal declaredAmount = BigDecimal.ZERO;
@@ -123,9 +123,9 @@ public class WorkbenchVO implements Serializable {
@ApiModelProperty("立项总金额-去年") @ApiModelProperty("立项总金额-去年")
private BigDecimal approvalAmountLastYear = BigDecimal.ZERO; private BigDecimal approvalAmountLastYear = BigDecimal.ZERO;
@ApiModelProperty("申报总金额-较去年 增长") @ApiModelProperty("申报总金额-较去年 增长")
private BigDecimal declaredAmountGrowthRate;
private BigDecimal declaredAmountGrowthRate = BigDecimal.ZERO;
@ApiModelProperty("立项总金额-较去年 增长") @ApiModelProperty("立项总金额-较去年 增长")
private BigDecimal approvalAmountGrowthRate;
private BigDecimal approvalAmountGrowthRate = BigDecimal.ZERO;


public BigDecimal getDeclaredAmountGrowthRate(){ public BigDecimal getDeclaredAmountGrowthRate(){
if(Objects.isNull(declaredAmount)){ if(Objects.isNull(declaredAmount)){


Loading…
Cancel
Save