@@ -69,7 +69,7 @@ public enum ExportOptionEnum { | |||||
projectIntroduction(24, "项目简介"), | projectIntroduction(24, "项目简介"), | ||||
buildBasis(25, "立项依据"), | |||||
baseBasisEstablish(25, "立项依据说明"), | |||||
buildLevel(26, "建设层级"), | buildLevel(26, "建设层级"), | ||||
@@ -217,7 +217,7 @@ public class ExcelDownUtil { | |||||
List<String> nameList = CollUtils.fieldList(fileArray, w -> w.getString(CommonConst.FILE_NAME)); | List<String> nameList = CollUtils.fieldList(fileArray, w -> w.getString(CommonConst.FILE_NAME)); | ||||
columnValue = String.join(StrPool.COMMA, nameList); | columnValue = String.join(StrPool.COMMA, nameList); | ||||
} else { | } else { | ||||
columnValue = String.valueOf(jsonObject.get(column.toString())); | |||||
columnValue = jsonObject.getString(column.toString()); | |||||
} | } | ||||
if (CommonConst.NULL.equals(columnValue)) { | if (CommonConst.NULL.equals(columnValue)) { | ||||
columnValue = ""; | columnValue = ""; | ||||
@@ -29,6 +29,8 @@ public class StatisticsController { | |||||
private final EarlyWarningStatisticsManage earlyWarningStatisticsManage; | private final EarlyWarningStatisticsManage earlyWarningStatisticsManage; | ||||
private final PerformanceStatisticsManage performanceStatisticsManage; | |||||
@GetMapping("/fund") | @GetMapping("/fund") | ||||
@ApiOperation("项目资金统计") | @ApiOperation("项目资金统计") | ||||
public FundStatisticsVO fund(@RequestParam(required = false) Integer year) { | public FundStatisticsVO fund(@RequestParam(required = false) Integer year) { | ||||
@@ -58,4 +60,16 @@ public class StatisticsController { | |||||
public EarlyWarningStatisticsVO earlyWarning(@RequestParam(required = false) Integer year) { | public EarlyWarningStatisticsVO earlyWarning(@RequestParam(required = false) Integer year) { | ||||
return earlyWarningStatisticsManage.statistics(year); | return earlyWarningStatisticsManage.statistics(year); | ||||
} | } | ||||
@GetMapping("/performance") | |||||
@ApiOperation("绩效统计") | |||||
public PerformanceStatisticsVO performance(@RequestParam(required = false) Integer year) { | |||||
return performanceStatisticsManage.statistics(year); | |||||
} | |||||
@GetMapping("/project") | |||||
@ApiOperation("项目统计") | |||||
public EarlyWarningStatisticsVO project(@RequestParam(required = false) Integer year) { | |||||
return earlyWarningStatisticsManage.statistics(year); | |||||
} | |||||
} | } |
@@ -0,0 +1,33 @@ | |||||
package com.ningdatech.pmapi.dashboard.manage; | |||||
import com.google.common.collect.Lists; | |||||
import com.ningdatech.pmapi.dashboard.model.vo.PerformanceStatisticsVO; | |||||
import com.ningdatech.pmapi.performance.service.IPerformanceAppraisalProjectService; | |||||
import lombok.RequiredArgsConstructor; | |||||
import lombok.extern.slf4j.Slf4j; | |||||
import org.springframework.stereotype.Component; | |||||
import java.time.LocalDateTime; | |||||
import java.util.List; | |||||
/** | |||||
* @Classname PerformanceStatisticsManage | |||||
* @Description | |||||
* @Date 2023/12/05 17:44 | |||||
* @Author PoffyZhang | |||||
*/ | |||||
@Component | |||||
@RequiredArgsConstructor | |||||
@Slf4j | |||||
public class PerformanceStatisticsManage { | |||||
private final IPerformanceAppraisalProjectService performanceAppraisalProjectService; | |||||
List<Integer> thisTwoYears = Lists.newArrayList(LocalDateTime.now().getYear() - 1 | |||||
,LocalDateTime.now().getYear()); | |||||
public PerformanceStatisticsVO statistics(Integer year) { | |||||
PerformanceStatisticsVO res = new PerformanceStatisticsVO(); | |||||
return res; | |||||
} | |||||
} |
@@ -0,0 +1,40 @@ | |||||
package com.ningdatech.pmapi.dashboard.model.vo; | |||||
import com.ningdatech.pmapi.common.model.entity.DataDTO; | |||||
import io.swagger.annotations.ApiModel; | |||||
import io.swagger.annotations.ApiModelProperty; | |||||
import lombok.Data; | |||||
import java.io.Serializable; | |||||
import java.math.BigDecimal; | |||||
import java.util.List; | |||||
@Data | |||||
@ApiModel(value = "绩效统计", description = "") | |||||
public class PerformanceStatisticsVO implements Serializable { | |||||
private static final long serialVersionUID = 1L; | |||||
@ApiModelProperty("当前已完成项目总数") | |||||
private Integer finishedTotalNow = 0; | |||||
@ApiModelProperty("当前已完成自评总数") | |||||
private Integer finishedSelfNow = 0; | |||||
@ApiModelProperty("当前已完成复评总数") | |||||
private Integer finishedReAppraisalNow = 0; | |||||
@ApiModelProperty("当前需整改项目总数") | |||||
private Integer rectifyTotalNow = 0; | |||||
@ApiModelProperty("是否评价") | |||||
private List<DataDTO> regionMeetings; | |||||
@ApiModelProperty("预审/验收 会议情况") | |||||
private List<DataDTO> meetingTypes; | |||||
@ApiModelProperty("各区县不通过率") | |||||
private List<DataDTO> notPassRegionMeetings; | |||||
@ApiModelProperty("各部门不通过top10") | |||||
private List<DataDTO> notPassTop10; | |||||
} |