diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java index f483e3c..3b8d14c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java @@ -23,10 +23,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.InputStream; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -154,8 +151,8 @@ public class ReviewReportImpl implements ExportService { //表五 价格评审数据 投标人,投标价,评审价格,价格得分 - map.put("bj", detail.getPrice() == null ? BigDecimal.ZERO : detail.getPrice()); - map.put("psjg", detail.getPriceReview() == null ? BigDecimal.ZERO : detail.getPriceReview()); + map.put("bj", detail.getPrice() == null ? BigDecimal.ZERO : detail.getPrice().stripTrailingZeros().toString()); + map.put("psjg", detail.getPriceReview() == null ? BigDecimal.ZERO : detail.getPriceReview().stripTrailingZeros().toString()); map.put("jgdf", StrUtil.isNotBlank(detail.getPriceScore()) ? detail.getPriceScore() : ""); @@ -167,10 +164,13 @@ public class ReviewReportImpl implements ExportService { String finalZbfs = zbfs; String finalPbwyhzz = pbwyhzz; + List> sortList3 = list3.stream().sorted(Comparator.comparing(m -> String.valueOf(m.get("bj")))).collect(Collectors.toList()); + List> list4 = list3.stream().sorted(Comparator.comparing(m -> String.valueOf(m.get("psjg")))).collect(Collectors.toList()); Map all = new HashMap() {{ put("table1", list1); put("table2", list2); - put("table3", list3); + put("table3", sortList3); + put("table4", list4); put("zbdljg", project.getTenderAgencyName()); put("zbbh", project.getEbpProjectNumber()); put("zbfs", finalZbfs); diff --git a/src/main/resources/model/评标报告.docx b/src/main/resources/model/评标报告.docx index 4013c2b..acaae67 100644 Binary files a/src/main/resources/model/评标报告.docx and b/src/main/resources/model/评标报告.docx differ