From 63e0df9bf10f032b6cd51505fedc8ae047d3994c Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Sun, 16 Mar 2025 21:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0,=E7=94=A8=E4=BA=8E=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HuzhouProjectController.java   |  6 +-
 .../controller/ProjectManagerController.java  |  2 +-
 .../huzhou/entity/InformationMaterials.java   | 57 +++++++++++++++++++
 .../service/IHuzhouProjectinfoService.java    |  2 +-
 .../impl/HuzhouProjectinfoServiceImpl.java    |  2 +-
 5 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/InformationMaterials.java

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<HuzhouProjectinfo> rs = projectinfoService.queryProjectWithFundPay();
+        List<HuzhouProjectinfo> 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<HuzhouProjectinfo> projectInfoList = projectinfoService.queryProjectWithFundPay();
+        List<HuzhouProjectinfo> projectInfoList = projectinfoService.queryBoardInfo();
         List<ProjectinfoExportDTO> 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<HuzhouProjectinfo> {
 
     HuzhouProjectinfoOV queryProjectFundPayRateById(String projectId);
 
-    List<HuzhouProjectinfo> queryProjectWithFundPay();
+    List<HuzhouProjectinfo> queryBoardInfo();
 
     List<HuzhouProjectinfo> 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<HuzhouProjectinfoM
     }
 
     @Override
-    public List<HuzhouProjectinfo> queryProjectWithFundPay() {
+    public List<HuzhouProjectinfo> queryBoardInfo() {
         // 记录开始时间
         long startTime = System.currentTimeMillis();
         // 获取所有项目信息