Browse Source

修改方法名称,用于区分

master
gjh 3 months ago
parent
commit
63e0df9bf1
  1. 6
      huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
  2. 2
      huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ProjectManagerController.java
  3. 57
      huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/InformationMaterials.java
  4. 2
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
  5. 2
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

6
huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java

@ -127,10 +127,10 @@ public class HuzhouProjectController {
return Result.OK(projectInfo); return Result.OK(projectInfo);
} }
@GetMapping("/queryProjectWithFundPay") @GetMapping("/queryBoardInfo")
public Result<?> queryProjectWithFundPay(){ public Result<?> queryBoardInfo(){
//获取项目入库数据 //获取项目入库数据
List<HuzhouProjectinfo> rs = projectinfoService.queryProjectWithFundPay(); List<HuzhouProjectinfo> rs = projectinfoService.queryBoardInfo();
return Result.OK(rs); return Result.OK(rs);
} }

2
huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ProjectManagerController.java

@ -99,7 +99,7 @@ public class ProjectManagerController {
bodyStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); ; bodyStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); ;
bodyStyle.setVerticalAlignment(VerticalAlignment.CENTER); bodyStyle.setVerticalAlignment(VerticalAlignment.CENTER);
// 封装数据 // 封装数据
List<HuzhouProjectinfo> projectInfoList = projectinfoService.queryProjectWithFundPay(); List<HuzhouProjectinfo> projectInfoList = projectinfoService.queryBoardInfo();
List<ProjectinfoExportDTO> dtoList = projectInfoList.stream() List<ProjectinfoExportDTO> dtoList = projectInfoList.stream()
.map(projectInfo -> new ProjectinfoExportDTO(projectInfo.getProjectName(), .map(projectInfo -> new ProjectinfoExportDTO(projectInfo.getProjectName(),
projectInfo.getSuperiorFundPayRate(), projectInfo.getSuperiorFundPayRate(),

57
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;
}

2
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); HuzhouProjectinfoOV queryProjectFundPayRateById(String projectId);
List<HuzhouProjectinfo> queryProjectWithFundPay(); List<HuzhouProjectinfo> queryBoardInfo();
List<HuzhouProjectinfo> queryProjectTimeOutInfo(); List<HuzhouProjectinfo> queryProjectTimeOutInfo();
} }

2
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@ -2694,7 +2694,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
} }
@Override @Override
public List<HuzhouProjectinfo> queryProjectWithFundPay() { public List<HuzhouProjectinfo> queryBoardInfo() {
// 记录开始时间 // 记录开始时间
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
// 获取所有项目信息 // 获取所有项目信息

Loading…
Cancel
Save