From f6ea95db952358ee38a4c30f4250f4d5b89ee6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?niohe=C2=B7erbao?= Date: Fri, 4 Aug 2023 15:09:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E9=A2=86=E5=9F=9F=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=8A=95=E8=B5=84=E6=83=85=E5=86=B5=EF=BC=8C=E5=90=84=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E9=A1=B9=E7=9B=AE=E6=8A=95=E8=B5=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/manage/DashboardProjectManage.java | 37 ---------------------- 1 file changed, 37 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java index 3930c50..92f9392 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java @@ -6,7 +6,6 @@ import com.ningdatech.pmapi.dashboard.constant.ChartTypeEnum; import com.ningdatech.pmapi.dashboard.helper.DashboardChartAssembler; import com.ningdatech.pmapi.dashboard.helper.DashboardHelper; import com.ningdatech.pmapi.dashboard.model.basic.AnalysisChart; -import com.ningdatech.pmapi.dashboard.model.basic.QueryTimeYearBO; import com.ningdatech.pmapi.dashboard.model.po.QueryYearPO; import com.ningdatech.pmapi.dashboard.model.vo.DashboardInvestmentSummaryVO; import com.ningdatech.pmapi.dashboard.model.vo.DashboardProjectCntSummaryVO; @@ -20,11 +19,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; -import java.time.temporal.TemporalAdjusters; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -45,37 +39,6 @@ public class DashboardProjectManage { private final INdProjectDelayApplyService iProjectDelayApplyService; private final DashboardHelper dashboardHelper; - - /** - * 查询年份BO 装配 - * - * @param year - * @return - */ - private QueryTimeYearBO getQueryTimeYearBO(Integer year) { - QueryTimeYearBO queryTimeYearBO = new QueryTimeYearBO(); - if (year == null) { - //获取今年第一天 - LocalDate lastYearStrDay = LocalDate.of(LocalDate.now().minusYears(1).getYear(), 1, 1); - LocalDate firstDayOfYear = lastYearStrDay.with(TemporalAdjusters.firstDayOfYear()); - LocalDate lastDayOfYear = lastYearStrDay.with(TemporalAdjusters.lastDayOfYear()); - //获取今年第一天 - LocalDateTime firstDateOfYear = LocalDateTime.of(firstDayOfYear, LocalTime.MIN); - //获取今年最后一天 - LocalDateTime lastDateOfYear = LocalDateTime.of(lastDayOfYear, LocalTime.MAX); - - queryTimeYearBO.setStartYearTime(firstDateOfYear); - queryTimeYearBO.setEndYearTime(lastDateOfYear); - } else { - String startTimeStr = String.format(timeFormat, year); - String endTimeStr = String.format(timeFormat, year + 1); - queryTimeYearBO.setStartYearTime(LocalDateTime.parse(startTimeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); - queryTimeYearBO.setEndYearTime(LocalDateTime.parse(endTimeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); - } - return queryTimeYearBO; - } - - public DashboardProjectSummaryVO getProjectSummary(QueryYearPO queryYearPO) { // 预算年度 Integer year = queryYearPO.getYear();