Browse Source

modify:

1. 首页项目数量统计修改
tags/24101601^0
WendyYang 2 months ago
parent
commit
6c73edc6bf
3 changed files with 2 additions and 5 deletions
  1. +0
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectApprovalAmountDTO.java
  2. +0
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java
  3. +2
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java

+ 0
- 2
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectApprovalAmountDTO.java View File

@@ -1,7 +1,5 @@
package com.hz.pm.api.projectlib.model.dto;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;



+ 0
- 1
hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java View File

@@ -49,7 +49,6 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class UserInfoManage {

private final MhUnitCache mhUnitCache;
private final UserAuthManage userAuthManage;
private final IUserInfoService userInfoService;
private final IRoleService roleService;


+ 2
- 2
hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java View File

@@ -419,7 +419,7 @@ public class WorkbenchManage {
}
break;
case PROJECT_APPROVAL: {
List<String> projectCodes = getProjectCodes(allProjectCodes, ProjectStateChangeEvent.DECLARED_RECORD_SUBMIT);
List<String> projectCodes = getProjectCodes(allProjectCodes, ProjectStateChangeEvent.DECLARED_RECORD_PASS);
currStat.setProjectCount(projectCodes.size());
Pair<Integer, Integer> systemReplaceCount = countReplaceSystemByProjectCodes(projectCodes);
currStat.setSourceCount(systemReplaceCount.getKey());
@@ -597,7 +597,7 @@ public class WorkbenchManage {
query.isNotNull(Project::getApprovalAmount).gt(Project::getApprovalAmount, BigDecimal.ZERO);
break;
case PROJECT_APPROVAL:
projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.DECLARED_RECORD_SUBMIT);
projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.DECLARED_RECORD_PASS);
break;
case PROJECT_PURCHASE:
projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.SUBMIT_PURCHASE_CONTRACT_RECORD);


Loading…
Cancel
Save