diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ExportController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ExportController.java index 81a1393..2f55b14 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ExportController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ExportController.java @@ -263,18 +263,28 @@ public class ExportController { List projectInfoList = projectinfoService.queryTempInfo(); List dtoList = projectInfoList.stream() + .filter(projectInfo-> !"2".equals(projectInfo.getStage())) .map(projectInfo -> new ProjectInfoTempDTO(projectInfo.getProjectName(), projectInfo.getCurrentPointName(), projectInfo.getTotalCentralMoney(), projectInfo.getTotalProvincialMoney(), - projectInfo.getHasSub())) + projectInfo.getHasSub(), + projectInfo.getAdminDivision(), + projectInfo.getSuperLeader(), + projectInfo.getApprovalTotalMoney(), + projectInfo.getApprovalCentralMoney(), + projectInfo.getApprovalProvincialMoney(), + projectInfo.getApprovalCityMoney(), + projectInfo.getApprovalCountyMoney(), + projectInfo.getApprovalSelfMoney() + )) .collect(Collectors.toList()); // 这里注意 有同学反应使用swagger 会导致各种问题,请直接用浏览器或者用postman response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); - String flag = "项目信息"; + String flag = "项目信息(cf)"; // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 LocalDate currentDate = LocalDate.now(); System.out.println("当前日期: " + currentDate); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectInfoTempDTO.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectInfoTempDTO.java index e92a948..e217a0e 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectInfoTempDTO.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectInfoTempDTO.java @@ -3,6 +3,7 @@ package com.easy.admin.modules.huzhou.dto; import com.alibaba.excel.annotation.ExcelIgnore; 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; @@ -26,16 +27,66 @@ public class ProjectInfoTempDTO { @ExcelProperty("是否存在子项目") private String hasSub; + /** + * 行政区划 + */ + @ExcelProperty("行政区划") + private String adminDivision; + + + @ExcelProperty(value = {"指导处室"}, converter = SuperLeaderConverter.class) + private String superLeader; + + + + @ExcelProperty("立项总金额(元)") + private Double approvalTotalMoney; + + + @ExcelProperty("立项中央资金(元)") + private Double approvalCentralMoney; + + @ExcelProperty("立项省级资金(元)") + private Double approvalProvincialMoney; + + + @ExcelProperty("立项市级资金(元)") + private Double approvalCityMoney; + + + @ExcelProperty("立项区县级资金(元)") + private Double approvalCountyMoney; + + @ExcelProperty("立项自筹资金(元)") + private Double approvalSelfMoney; + + public ProjectInfoTempDTO(String projectName, String currentPointName, Double totalCentralMoney, Double totalProvincialMoney, - String hasSub + String hasSub, + String adminDivision, + String superLeader, + Double approvalTotalMoney, + Double approvalCentralMoney, + Double approvalProvincialMoney, + Double approvalCityMoney, + Double approvalCountyMoney, + Double approvalSelfMoney ) { this.projectName = projectName; this.currentPointName = currentPointName; this.totalCentralMoney = totalCentralMoney; this.totalProvincialMoney = totalProvincialMoney; this.hasSub = hasSub; + this.adminDivision = adminDivision; + this.superLeader = superLeader; + this.approvalTotalMoney = approvalTotalMoney; + this.approvalCentralMoney = approvalCentralMoney; + this.approvalProvincialMoney = approvalProvincialMoney; + this.approvalCityMoney = approvalCityMoney; + this.approvalCountyMoney = approvalCountyMoney; + this.approvalSelfMoney = approvalSelfMoney; } } \ No newline at end of file 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 3c929af..7513832 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 @@ -301,5 +301,29 @@ public class HuzhouProjectinfo extends BaseEntity { * 是否完成归档 false:0 1:true */ private Boolean isArchiveFinish; + + // 立项总金额(元) + @TableField(exist = false) + private Double approvalTotalMoney; + + // 中央资金(元) + @TableField(exist = false) + private Double approvalCentralMoney; + + // 省级资金(元) + @TableField(exist = false) + private Double approvalProvincialMoney; + + // 市级资金(元) + @TableField(exist = false) + private Double approvalCityMoney; + + // 区县级资金(元) + @TableField(exist = false) + private Double approvalCountyMoney; + + // 自筹资金(元) + @TableField(exist = false) + private Double approvalSelfMoney; } 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 e96287b..799dad0 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 @@ -3165,7 +3165,13 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl