diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/HuzhouProjectinfoExportDTO.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/HuzhouProjectinfoExportDTO.java index 8a46a47..e14fb1d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/HuzhouProjectinfoExportDTO.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/HuzhouProjectinfoExportDTO.java @@ -1,6 +1,8 @@ package com.easy.admin.modules.huzhou.dto; import com.alibaba.excel.annotation.ExcelProperty; + +import com.alibaba.excel.annotation.format.NumberFormat; import com.alibaba.excel.annotation.write.style.HeadStyle; import lombok.Data; @HeadStyle(fillForegroundColor = 44) @@ -9,10 +11,12 @@ public class HuzhouProjectinfoExportDTO { @ExcelProperty("项目名称") private String projectName; - @ExcelProperty("上级资金执行率") - private String superiorFundPayRate; - public HuzhouProjectinfoExportDTO(String projectName, String superiorFundPayRate) { + //@NumberFormat("0.00%") + @ExcelProperty("上级资金执行率%") + private Double superiorFundPayRate; + + public HuzhouProjectinfoExportDTO(String projectName, Double superiorFundPayRate) { this.projectName = projectName; this.superiorFundPayRate = superiorFundPayRate; } 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 4404948..663fd98 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 @@ -180,7 +180,7 @@ public class HuzhouProjectinfo extends BaseEntity { * 上级资金(中央资金+省级资金)使用率 */ @TableField(exist = false) - String superiorFundPayRate; + Double superiorFundPayRate; /** * 项目计划修改表示: 只允许修改一次 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 b93240d..22592ce 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 @@ -2659,7 +2659,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl new HuzhouProjectinfoExportDTO(projectInfo.getProjectName(), projectInfo.getSuperiorFundPayRate() )) .collect(Collectors.toList()); for (HuzhouProjectinfoExportDTO huzhouProjectinfoExportDTO : dtoList) { - log.info("项目名称:{}--->上级资金执行率为:{}", huzhouProjectinfoExportDTO.getProjectName(),huzhouProjectinfoExportDTO.getSuperiorFundPayRate()); + log.info("项目名称:{}--->上级资金执行率为:{}", huzhouProjectinfoExportDTO.getProjectName(),String.format("%.0f%%", huzhouProjectinfoExportDTO.getSuperiorFundPayRate())); } return projectInfoList; } @@ -2708,7 +2708,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl