From 6c73edc6bf6a66785d7ce3eaa605a3d00ca6e4d8 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Wed, 16 Oct 2024 17:53:52 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E9=A6=96=E9=A1=B5=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hz/pm/api/projectlib/model/dto/ProjectApprovalAmountDTO.java | 2 -- hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java | 1 - .../src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectApprovalAmountDTO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectApprovalAmountDTO.java index 1a4e1d1..98df642 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectApprovalAmountDTO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectApprovalAmountDTO.java @@ -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; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java index 9e6ee76..c1b9391 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java @@ -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; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java index 2459dff..9ca8556 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java @@ -419,7 +419,7 @@ public class WorkbenchManage { } break; case PROJECT_APPROVAL: { - List projectCodes = getProjectCodes(allProjectCodes, ProjectStateChangeEvent.DECLARED_RECORD_SUBMIT); + List projectCodes = getProjectCodes(allProjectCodes, ProjectStateChangeEvent.DECLARED_RECORD_PASS); currStat.setProjectCount(projectCodes.size()); Pair 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);