From 987313b87af9657e5a89826195eb19beb3295c7b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 15 Dec 2022 13:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=8C=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../indexcollect/form/HistoryScoreListFormDTO.java | 10 ++++------ .../controller/ScreenPyHistoryScoreController.java | 2 +- .../java/com/epmet/excel/HistoryScoreDetailExcel.java | 11 ++--------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/HistoryScoreListFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/HistoryScoreListFormDTO.java index dd55b7d679..0e61017efe 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/HistoryScoreListFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/HistoryScoreListFormDTO.java @@ -1,10 +1,8 @@ package com.epmet.dto.indexcollect.form; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; -import java.util.Date; @Data public class HistoryScoreListFormDTO implements Serializable { @@ -19,14 +17,14 @@ public class HistoryScoreListFormDTO implements Serializable { /** * 起始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startTime; + //@JsonFormat(pattern = "yyyy-MM-dd") + private String startTime; /** * 截止时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endTime; + //@JsonFormat(pattern = "yyyy-MM-dd") + private String endTime; /** * 当前页 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenPyHistoryScoreController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenPyHistoryScoreController.java index 56a1a2f853..8c3e16bae9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenPyHistoryScoreController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenPyHistoryScoreController.java @@ -122,7 +122,7 @@ public class ScreenPyHistoryScoreController { for (HistoryScoreDetailResultDTO d : data.getList()){ list = ConvertUtils.sourceToTarget(d.getDetailList(), HistoryScoreDetailExcel.class); //一条主表记录一个sheet页 - WriteSheet writeSheet = EasyExcel.writerSheet(d.getTitle()).registerWriteHandler(new CustomerTitleHandler(d.getTime())).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("（" + d.getTitle() + "）").registerWriteHandler(new CustomerTitleHandler(d.getTime())).build(); excelWriter.write(list, writeSheet); } formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/excel/HistoryScoreDetailExcel.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/excel/HistoryScoreDetailExcel.java index 6ed3d58446..e086132a19 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/excel/HistoryScoreDetailExcel.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/excel/HistoryScoreDetailExcel.java @@ -2,7 +2,7 @@ package com.epmet.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; import lombok.Data; @@ -16,47 +16,40 @@ import java.math.BigDecimal; * @author generator generator@elink-cn.com */ @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@HeadRowHeight(40) @Data public class HistoryScoreDetailExcel implements Serializable { private static final long serialVersionUID = -12110233388005838L; - //@ExcelProperty(value = "下级单位") @ExcelProperty(value = {"平阴县街道（镇）政法能力得分排行", "${title}", "下级单位"}) @ColumnWidth(15) @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) private String agencyName; - //@ExcelProperty(value = "网格活跃度") @ExcelProperty(value = {"平阴县街道（镇）政法能力得分排行", "${title}", "网格活跃度"}) @ColumnWidth(15) private BigDecimal wghyd; - //@ExcelProperty(value = "事件赋值得分") @ExcelProperty(value = {"平阴县街道（镇）政法能力得分排行", "${title}", "事件赋值得分"}) @ColumnWidth(20) private BigDecimal sjff; - //@ExcelProperty(value = "雪亮工程") @ExcelProperty(value = {"平阴县街道（镇）政法能力得分排行", "${title}", "雪亮工程"}) @ColumnWidth(15) private BigDecimal xlgc; - //@ExcelProperty(value = "日核周调") @ExcelProperty(value = {"平阴县街道（镇）政法能力得分排行", "${title}", "日核周调"}) @ColumnWidth(15) private BigDecimal rhzt; - //@ExcelProperty(value = "亮点工作") @ExcelProperty(value = {"平阴县街道（镇）政法能力得分排行", "${title}", "亮点工作"}) @ColumnWidth(15) private BigDecimal ldgz; - //@ExcelProperty(value = "其他工作") @ExcelProperty(value = {"平阴县街道（镇）政法能力得分排行", "${title}", "其他工作"}) @ColumnWidth(15) private BigDecimal qtgz; - //@ExcelProperty(value = "能力得分") @ExcelProperty(value = {"平阴县街道（镇）政法能力得分排行", "${title}", "能力得分"}) @ColumnWidth(15) private BigDecimal nldf;