|
@@ -26,6 +26,7 @@ import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectRenewalDeclareExpor |
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectRenewalApprovalStatusEnum; |
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectRenewalApprovalStatusEnum; |
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; |
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; |
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; |
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; |
|
|
|
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum; |
|
|
import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalExportDTO; |
|
|
import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalExportDTO; |
|
|
import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalFundDeclarationDTO; |
|
|
import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalFundDeclarationDTO; |
|
|
import com.ningdatech.pmapi.projectlib.model.entity.Project; |
|
|
import com.ningdatech.pmapi.projectlib.model.entity.Project; |
|
@@ -373,7 +374,7 @@ public class ProjectRenewalFundManage { |
|
|
List<ProjectRenewalExportDTO> collect = records.stream().map(r -> { |
|
|
List<ProjectRenewalExportDTO> collect = records.stream().map(r -> { |
|
|
ProjectRenewalExportDTO exportDTO = new ProjectRenewalExportDTO(); |
|
|
ProjectRenewalExportDTO exportDTO = new ProjectRenewalExportDTO(); |
|
|
BeanUtils.copyProperties(r, exportDTO); |
|
|
BeanUtils.copyProperties(r, exportDTO); |
|
|
exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType())); |
|
|
|
|
|
|
|
|
exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType())); |
|
|
if (ProjectRenewalApprovalStatusEnum.PENDING.name().equals(r.getApprovalStatus())) { |
|
|
if (ProjectRenewalApprovalStatusEnum.PENDING.name().equals(r.getApprovalStatus())) { |
|
|
exportDTO.setApprovalStatusName(ProjectRenewalApprovalStatusEnum.PENDING.getDesc()); |
|
|
exportDTO.setApprovalStatusName(ProjectRenewalApprovalStatusEnum.PENDING.getDesc()); |
|
|
} else if (ProjectRenewalApprovalStatusEnum.PASS.name().equals(r.getApprovalStatus())) { |
|
|
} else if (ProjectRenewalApprovalStatusEnum.PASS.name().equals(r.getApprovalStatus())) { |
|
@@ -415,7 +416,7 @@ public class ProjectRenewalFundManage { |
|
|
List<ProjectRenewalDeclareExportDTO> collect = records.stream().map(r -> { |
|
|
List<ProjectRenewalDeclareExportDTO> collect = records.stream().map(r -> { |
|
|
ProjectRenewalDeclareExportDTO exportDTO = new ProjectRenewalDeclareExportDTO(); |
|
|
ProjectRenewalDeclareExportDTO exportDTO = new ProjectRenewalDeclareExportDTO(); |
|
|
BeanUtils.copyProperties(r, exportDTO); |
|
|
BeanUtils.copyProperties(r, exportDTO); |
|
|
exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType())); |
|
|
|
|
|
|
|
|
exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType())); |
|
|
if (ProjectRenewalApprovalStatusEnum.PENDING.name().equals(r.getApprovalStatus())) { |
|
|
if (ProjectRenewalApprovalStatusEnum.PENDING.name().equals(r.getApprovalStatus())) { |
|
|
exportDTO.setApprovalStatusName(ProjectRenewalApprovalStatusEnum.PENDING.getDesc()); |
|
|
exportDTO.setApprovalStatusName(ProjectRenewalApprovalStatusEnum.PENDING.getDesc()); |
|
|
} else if (ProjectRenewalApprovalStatusEnum.PASS.name().equals(r.getApprovalStatus())) { |
|
|
} else if (ProjectRenewalApprovalStatusEnum.PASS.name().equals(r.getApprovalStatus())) { |
|
|