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 9952d5b..8e6f74f 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 @@ -127,10 +127,10 @@ public class HuzhouProjectController { return Result.OK(projectInfo); } - @GetMapping("/queryProjectWithFundPay") - public Result queryProjectWithFundPay(){ + @GetMapping("/queryBoardInfo") + public Result queryBoardInfo(){ //获取项目入库数据 - List rs = projectinfoService.queryProjectWithFundPay(); + List rs = projectinfoService.queryBoardInfo(); return Result.OK(rs); } 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/ProjectManagerController.java index d0da412..b7eec49 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/ProjectManagerController.java @@ -99,7 +99,7 @@ public class ProjectManagerController { bodyStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); ; bodyStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 封装数据 - List projectInfoList = projectinfoService.queryProjectWithFundPay(); + List projectInfoList = projectinfoService.queryBoardInfo(); List dtoList = projectInfoList.stream() .map(projectInfo -> new ProjectinfoExportDTO(projectInfo.getProjectName(), projectInfo.getSuperiorFundPayRate(), diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/InformationMaterials.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/InformationMaterials.java new file mode 100644 index 0000000..b4c13a4 --- /dev/null +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/InformationMaterials.java @@ -0,0 +1,57 @@ +package com.easy.admin.modules.huzhou.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +public class InformationMaterials { + + private static final long serialVersionUID = -50005828024123796L; + /** + * 期刊名称 + */ + private String name; + /** + * 文件类型 + */ + private String type; + /** + + * 发布日期 + */ + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") +// @JSONField(format="yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date publishTime; + /** + + * id + */ + private String id; + /** + * 文件名称 + */ + private String documentName; + /** + * 文件类型 + */ + private String documentType; + /** + * 文件位置 + */ + private String documentPath; + /** + * 文件尺寸 + */ + private Long size; + /** + * 文件状态 + */ + private String status; + + /** + * 责任单位 + */ + private String dutyWorkplace; +} 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 e99da86..0ec7aa9 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 @@ -237,7 +237,7 @@ public interface IHuzhouProjectinfoService extends IService { HuzhouProjectinfoOV queryProjectFundPayRateById(String projectId); - List queryProjectWithFundPay(); + List queryBoardInfo(); List queryProjectTimeOutInfo(); } 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 6a4c578..76848eb 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 @@ -2694,7 +2694,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl queryProjectWithFundPay() { + public List queryBoardInfo() { // 记录开始时间 long startTime = System.currentTimeMillis(); // 获取所有项目信息