diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ProjectManagerController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ExportController.java similarity index 74% rename from huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ProjectManagerController.java rename to huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ExportController.java index b7eec49..ae850a6 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ProjectManagerController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ExportController.java @@ -7,7 +7,8 @@ import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.easy.admin.common.api.vo.Result; import com.easy.admin.modules.huzhou.dto.ProjectTimeOutInfoExportDTO; -import com.easy.admin.modules.huzhou.dto.ProjectinfoExportDTO; +import com.easy.admin.modules.huzhou.dto.ProjectInfoExportDTO; +import com.easy.admin.modules.huzhou.dto.ProjectResultExportDTO; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.entity.ProjectManager; import com.easy.admin.modules.huzhou.handler.CustomMergeStrategy; @@ -27,6 +28,7 @@ import java.net.URLEncoder; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -37,9 +39,9 @@ import java.util.stream.Collectors; * @Description: 用于后台导入项目负责人信息 */ @Slf4j -@RequestMapping("/projectManager") +@RequestMapping("/export") @RestController -public class ProjectManagerController { +public class ExportController { @Resource private ProjectManagerService projectManagerService; @@ -89,8 +91,8 @@ public class ProjectManagerController { } - @GetMapping("/downloadRate") - public void downloadRate(HttpServletResponse response) throws IOException { + @GetMapping("/projectBoardInfo") + public void downProjectBoardInfo(HttpServletResponse response) throws IOException { // 设置表头样式 WriteCellStyle headStyle = new WriteCellStyle(); headStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); @@ -100,8 +102,8 @@ public class ProjectManagerController { bodyStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 封装数据 List projectInfoList = projectinfoService.queryBoardInfo(); - List dtoList = projectInfoList.stream() - .map(projectInfo -> new ProjectinfoExportDTO(projectInfo.getProjectName(), + List dtoList = projectInfoList.stream() + .map(projectInfo -> new ProjectInfoExportDTO(projectInfo.getProjectName(), projectInfo.getSuperiorFundPayRate(), projectInfo.getCurrentStage(), projectInfo.getTotalPercent(), @@ -115,7 +117,7 @@ public class ProjectManagerController { // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); - String preFileName = "项目看板"; + String preFileName = "晾晒看报"; // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 LocalDateTime currentDateTime = LocalDateTime.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -125,17 +127,17 @@ public class ProjectManagerController { .replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(response.getOutputStream(), ProjectinfoExportDTO.class) + EasyExcel.write(response.getOutputStream(), ProjectInfoExportDTO.class) .registerWriteHandler(new HorizontalCellStyleStrategy(headStyle, bodyStyle)) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .registerWriteHandler(new CustomMergeStrategy(Arrays.asList("superLeader","reformName"))) - .sheet("项目看板") + .sheet("晾晒看报") .doWrite(dtoList); } - @GetMapping("/timeOutInfoExport") + @GetMapping("/timeOutInfo") public void timeOutInfoExport(HttpServletResponse response) throws IOException { // 设置表头样式 WriteCellStyle headStyle = new WriteCellStyle(); @@ -155,13 +157,14 @@ public class ProjectManagerController { projectInfo.getSuperiorFundPayRate(), projectInfo.getTimeOutPayCount(), projectInfo.getTimeOutPaySituation(), - projectInfo.getUploadFileRate())) + projectInfo.getUploadFileRate(), + projectInfo.getProjectTimeOutSituation())) .collect(Collectors.toList()); // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); - String preFileName = "超时情况"; + String preFileName = "晾晒比分评分表"; // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 LocalDateTime currentDateTime = LocalDateTime.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -175,7 +178,41 @@ public class ProjectManagerController { .registerWriteHandler(new HorizontalCellStyleStrategy(headStyle, bodyStyle)) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) //.registerWriteHandler(new CustomMergeStrategy(Arrays.asList("superLeader","reformName"))) - .sheet("超时情况") + .sheet("晾晒比分评分表") + .doWrite(dtoList); + } + + + @GetMapping("/projectResult") + public void projectResultExport(HttpServletResponse response) throws IOException { + // 设置表头样式 + WriteCellStyle headStyle = new WriteCellStyle(); + headStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); + // 设置表格内容 + WriteCellStyle bodyStyle = new WriteCellStyle(); + bodyStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); ; + bodyStyle.setVerticalAlignment(VerticalAlignment.CENTER); + // 封装数据 + ProjectResultExportDTO projectResultExportDTO = projectinfoService.queryProjectResultCount(); + List dtoList = new ArrayList<>(); + dtoList.add(projectResultExportDTO); + // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + String preFileName = "项目成果表"; + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + LocalDateTime currentDateTime = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String formattedDateTime = currentDateTime.format(formatter); + System.out.println("当前日期: " + formattedDateTime); + String fileName = URLEncoder.encode( preFileName+formattedDateTime, "UTF-8") + .replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + + EasyExcel.write(response.getOutputStream(), ProjectResultExportDTO.class) + .registerWriteHandler(new HorizontalCellStyleStrategy(headStyle, bodyStyle)) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .sheet("项目成果") .doWrite(dtoList); } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java index 8e6f74f..a9d53ed 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java @@ -4,6 +4,7 @@ package com.easy.admin.modules.huzhou.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.easy.admin.common.core.annotation.ResponseResult; +import com.easy.admin.modules.huzhou.dto.ProjectResultExportDTO; import com.easy.admin.modules.huzhou.vo.*; import com.easy.admin.common.api.vo.Result; @@ -143,6 +144,13 @@ public class HuzhouProjectController { } + @GetMapping("/queryProjectResultCount") + public Result queryProjectResultCount(){ + //获取项目入库数据 + ProjectResultExportDTO rs = projectinfoService.queryProjectResultCount(); + return Result.OK(rs); + } + /** * 根据项目id获取项目信息 * @param projectid 项目id diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouInformationMaterialMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouInformationMaterialMapper.java index eab5880..7b2e38e 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouInformationMaterialMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouInformationMaterialMapper.java @@ -3,11 +3,19 @@ package com.easy.admin.modules.huzhou.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.easy.admin.modules.huzhou.entity.HuzhouInformationMaterial; import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; /** * @author gjh */ public interface HuzhouInformationMaterialMapper extends BaseMapper { + @Select("SELECT `type`, COUNT(*) AS count " + + "FROM huzhou_information_material " + + "GROUP BY `type`") + List> getTypeCount(); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java index 629cead..f9d6a95 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java @@ -53,4 +53,8 @@ public interface HuzhouPlaninfoMapper extends BaseMapper { ") t " + "WHERE rn = 1") String getCurrentPointName(@Param("projectId") String projectId); + + + @Select("SELECT task_level FROM huzhou_planinfo WHERE task_name = #{taskName}") + String getCurrentTaskLevel(@Param("taskName") String taskName); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectinfoExportDTO.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectInfoExportDTO.java similarity index 94% rename from huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectinfoExportDTO.java rename to huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectInfoExportDTO.java index 39837b3..e06fb66 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectinfoExportDTO.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectInfoExportDTO.java @@ -10,7 +10,7 @@ import com.easy.admin.modules.huzhou.converter.SuperLeaderConverter; import lombok.Data; @HeadStyle(fillForegroundColor = 44) @Data -public class ProjectinfoExportDTO { +public class ProjectInfoExportDTO { @ExcelProperty(value = {"任务名称"}, converter = ReformNameConverter.class) private String reformName; @@ -33,7 +33,7 @@ public class ProjectinfoExportDTO { @ExcelProperty("项目整体进度（%）") private String totalPercent; - public ProjectinfoExportDTO(String projectName, + public ProjectInfoExportDTO(String projectName, Double superiorFundPayRate, String currentStage, String totalPercent, diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectResultExportDTO.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectResultExportDTO.java new file mode 100644 index 0000000..4f90076 --- /dev/null +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectResultExportDTO.java @@ -0,0 +1,25 @@ +package com.easy.admin.modules.huzhou.dto; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import lombok.Data; + +/** + * 用于 项目成果显著性 导出 + */ +@HeadStyle(fillForegroundColor = 44) +@Data +public class ProjectResultExportDTO { + @ExcelProperty(value = {"机制建设", "配套工作制度"}) + private int count1; + @ExcelProperty(value = {"标志性成功", "宣传报道"}) + private int count2; + @ExcelProperty(value = {"标志性成功", "荣誉奖项"}) + private int count3; + @ExcelProperty(value = {"标志性成功", "专利、软件著作"}) + private int count4; + @ExcelProperty(value = {"标志性成功", "试点工作"}) + private int count5; + @ExcelProperty(value = {"标志性成功", "课题研究"}) + private int count6; +} diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectTimeOutInfoExportDTO.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectTimeOutInfoExportDTO.java index e7193fd..ab86210 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectTimeOutInfoExportDTO.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectTimeOutInfoExportDTO.java @@ -2,6 +2,7 @@ package com.easy.admin.modules.huzhou.dto; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.baomidou.mybatisplus.annotation.TableField; import com.easy.admin.modules.huzhou.converter.ReformNameConverter; import com.easy.admin.modules.huzhou.converter.SuperLeaderConverter; import lombok.Data; @@ -24,6 +25,10 @@ public class ProjectTimeOutInfoExportDTO { @ExcelProperty("当且所处节点") private String currentPointName; + @ExcelProperty("项目超时情况（天数）") + private String projectTimeOutSituation; + + //@NumberFormat("0.00%") @ExcelProperty("整体资金支付情况（%）") private Double superiorFundPayRate; @@ -46,7 +51,8 @@ public class ProjectTimeOutInfoExportDTO { Double superiorFundPayRate, int timeOutPayCount, String timeOutPaySituation, - Double uploadFileRate + Double uploadFileRate, + String projectTimeOutSituation ) { this.projectName = projectName; this.superiorFundPayRate = superiorFundPayRate; @@ -57,6 +63,7 @@ public class ProjectTimeOutInfoExportDTO { this.superLeader = superLeader; this.timeOutPaySituation = timeOutPaySituation; this.uploadFileRate = uploadFileRate; + this.projectTimeOutSituation = projectTimeOutSituation; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/projectResultExportDTO.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/projectResultExportDTO.java deleted file mode 100644 index b9233f4..0000000 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/projectResultExportDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.easy.admin.modules.huzhou.dto; - -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.HeadStyle; -import lombok.Data; - -/** - * 用于 项目成果显著性 导出 - */ -@HeadStyle(fillForegroundColor = 44) -@Data -public class projectResultExportDTO { - @ExcelProperty("配套工作制度") - private int count1; - @ExcelProperty("宣传报道") - private int count2; - @ExcelProperty("荣誉奖项") - private int count3; - @ExcelProperty("专利、软件著作") - private int count4; - @ExcelProperty("试点工作") - private int count5; - @ExcelProperty("课题研究") - private int count6; -} diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java index c322521..cf22e9a 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java @@ -2,7 +2,6 @@ package com.easy.admin.modules.huzhou.entity; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; -import com.easy.admin.modules.huzhou.dto.ProjectinfoExportDTO; import lombok.Data; /** @@ -208,11 +207,16 @@ public class HuzhouProjectinfo extends BaseEntity { */ @TableField(exist = false) private int timeOutPayCount; - /** * 项目超时情况(天数) */ @TableField(exist = false) + private String projectTimeOutSituation; + + /** + * 超时支付情况(天数) + */ + @TableField(exist = false) private String timeOutPaySituation; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java index 0ec7aa9..419991e 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java @@ -1,6 +1,7 @@ package com.easy.admin.modules.huzhou.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.easy.admin.modules.huzhou.dto.ProjectResultExportDTO; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.baomidou.mybatisplus.extension.service.IService; import com.easy.admin.modules.huzhou.vo.*; @@ -240,5 +241,8 @@ public interface IHuzhouProjectinfoService extends IService { List queryBoardInfo(); List queryProjectTimeOutInfo(); + + ProjectResultExportDTO queryProjectResultCount(); + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index 42a29be..efc832d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,6 +16,7 @@ import com.easy.admin.auth.service.SysUserService; import com.easy.admin.common.api.vo.Result; import com.easy.admin.common.core.exception.EasyException; import com.easy.admin.modules.huzhou.dao.HuzhouContractinfoMapper; +import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfoMapper; import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfofileMapper; import com.easy.admin.modules.huzhou.dao.HuzhouProjectinfoMoneyMapper; import com.easy.admin.modules.huzhou.entity.*; @@ -79,8 +81,11 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl planInfoList = planinfoService.getListByProjectId(projectId); + // 获取当前日期时间 + Date now = new Date(); double rate =0.0; int totalFileCount = 0; int unFinishFileCount = 0; + int currentNeedFileCount = 0; + + List planInfoList = planinfoService.getListByProjectId(projectId); + if (CollectionUtil.isNotEmpty(planInfoList)) { for (HuzhouPlaninfo planInfo : planInfoList) { String taskFile = planInfo.getTaskFile(); @@ -804,18 +814,31 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); qw.eq(HuzhouPlaninfo::getProjectId,projectId) .eq(HuzhouPlaninfo::getIsfinish,"0"); + List unFinishPlanInfoList = planinfoService.list(qw); for (HuzhouPlaninfo planInfo : unFinishPlanInfoList) { String taskFile = planInfo.getTaskFile(); if (StrUtil.isNotBlank(taskFile)){ - unFinishFileCount += countFiles(taskFile); + currentNeedFileCount += countFiles(taskFile); } } + // 当且节点已经上传文件数量 int uploadFileCount = totalFileCount - unFinishFileCount; - rate = (double) uploadFileCount / totalFileCount * 100; + + List currentPlanInfo = planInfoList.stream() + .filter(plan -> plan.getScheduledStartTime() != null + && (plan.getScheduledStartTime().before(now) || plan.getScheduledStartTime().equals(now))) + .collect(Collectors.toList()); + for (HuzhouPlaninfo planInfo : currentPlanInfo) { + String taskFile = planInfo.getTaskFile(); + // 当且节点需要上传的文件数量 + currentNeedFileCount += countFiles(taskFile); + } + + rate = (double) uploadFileCount / currentNeedFileCount * 100; //double roundedRate = Math.round(rate * 100.0) / 100.0; double roundedRate = Math.round(rate) ; - log.info("{}:上传文件比率为:{}---总数:{},完成:{}", projectId, roundedRate, totalFileCount, uploadFileCount); + log.info("{}:上传文件比率为:{}---当且节点需要上传总数:{},完成:{}", projectId, roundedRate, currentNeedFileCount, uploadFileCount); return roundedRate; } return rate; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index f557de3..ec44f11 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -21,6 +21,7 @@ import com.easy.admin.modules.huzhou.common.HuzhouCommonUtils; import com.easy.admin.modules.huzhou.common.TemplateExcelUtils; import com.easy.admin.modules.huzhou.dao.*; import com.easy.admin.modules.huzhou.dto.ContractPayInfoDTO; +import com.easy.admin.modules.huzhou.dto.ProjectResultExportDTO; import com.easy.admin.modules.huzhou.entity.*; import com.easy.admin.modules.huzhou.service.*; import com.easy.admin.modules.huzhou.vo.*; @@ -117,6 +118,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl 0) { - projectInfo.setTimeOutPaySituation(String.valueOf(daysBetween)); + projectInfo.setProjectTimeOutSituation(String.valueOf(daysBetween)); log.info("项目:{}->当且节点:{}->超时完成天数为:{}", projectInfo.getProjectName(),currentPointName, daysBetween); log.info("计划结束时间为:{}->实际开始提交时间为:{}", scheduledEndDate,realUpFileDate); }else { - projectInfo.setTimeOutPaySituation("未超时"); + projectInfo.setProjectTimeOutSituation("未超时"); } } } else { @@ -2822,7 +2826,40 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl> typeCounts = informationMaterialMapper.getTypeCount(); + for (Map row : typeCounts) { + String type = (String) row.get("type"); + Integer count = ((Number) row.get("count")).intValue(); + + switch (type) { + case "配套工作制度": + result.setCount1(count); + break; + case "宣传报道": + result.setCount2(count); + break; + case "荣誉奖项": + result.setCount3(count); + break; + case "专利和软著": + result.setCount4(count); + break; + case "试点工作": + result.setCount5(count); + break; + case "课题研究": + result.setCount6(count); + break; + default: + // 如果有未知的type类型，可以在这里处理 + break; + } + } + return result; + } private void fillSuperiorFundPayRate(HuzhouProjectinfo projectInfo) {