From ab6072c1ce6e9e46a48b320115dbc389cd3ecebf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 14:06:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/excel/MemberProjectInfoExcel.java | 8 ++++---- .../epmet/dataaggre/excel/OrgProjectDetailExcel.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java index 58a5d8014e..e7b5e2045c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java @@ -22,19 +22,19 @@ public class MemberProjectInfoExcel { @ColumnWidth(30) @ExcelProperty(value = "网格员",order = 2) - private String name; + private String staffName; @ColumnWidth(40) @ExcelProperty(value = "所属组织",order = 3) - private String idCard; + private String orgName; @ColumnWidth(20) @ExcelProperty(value = "上报数量",order = 4) - private String mobile; + private Integer projectCount; @ColumnWidth(20) @ExcelProperty(value = "办结数",order = 5) - private String rdsj; + private Integer closedCount; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java index e7c5ba3d91..91b30e0e89 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java @@ -26,22 +26,22 @@ public class OrgProjectDetailExcel { @ColumnWidth(20) @ExcelProperty(value = "网格员数",order = 3) - private String memberCount; + private Integer memberCount; @ColumnWidth(20) @ExcelProperty(value = "上报数量",order = 4) - private String projectCount; + private Integer projectCount; @ColumnWidth(20) @ExcelProperty(value = "办结数",order = 5) - private String closedCount; + private Integer closedCount; @ColumnWidth(20) @ExcelProperty(value = "人均上报",order = 6) - private String projectAve; + private Integer projectAve; @ColumnWidth(20) @ExcelProperty(value = "人均办结",order = 7) - private String closedAve; + private Integer closedAve; } \ No newline at end of file