From 7e6da0e86eea6b2c0992eb6ecb8b4a87447d5c63 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 20 Jul 2020 17:56:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/excel/PartyAnalysExcel.java | 30 +++++++++---------- .../elink/esua/epdc/excel/RegisterExcel.java | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/excel/PartyAnalysExcel.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/excel/PartyAnalysExcel.java index 11ca7c6..784d086 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/excel/PartyAnalysExcel.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/excel/PartyAnalysExcel.java @@ -15,25 +15,13 @@ public class PartyAnalysExcel { @Excel(name = "街道名称") private String streetName; - @Excel(name = "注册用户数") - private Integer userCount; +// @Excel(name = "注册用户数") +// private Integer userCount; @Excel(name = "注册党员数") private Integer partyMemberCount; - @Excel(name = "注册居民数") - private Integer residentCount; - - @Excel(name = "男") - private Integer maleCount; - - @Excel(name = "女") - private Integer femaleCount; - - @Excel(name = "其他") - private Integer unknownSexCount; - - @Excel(name = "超过50岁用户数量") + @Excel(name = "超过50岁党员数量") private Integer oldCount; @Excel(name = "老龄化比例") @@ -45,6 +33,18 @@ public class PartyAnalysExcel { @Excel(name = "年轻化比例") private BigDecimal youngPercent; +// @Excel(name = "注册居民数") +// private Integer residentCount; + + @Excel(name = "男") + private Integer maleCount; + + @Excel(name = "女") + private Integer femaleCount; + + @Excel(name = "未知性别") + private Integer unknownSexCount; + @Excel(name = "党员认证失败数") private Integer partyAuthFailureCount; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/excel/RegisterExcel.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/excel/RegisterExcel.java index 2f9ee8c..f61f4d1 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/excel/RegisterExcel.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/excel/RegisterExcel.java @@ -34,7 +34,7 @@ public class RegisterExcel { @Excel(name = "女") private Integer femaleCount; - @Excel(name = "其他") + @Excel(name = "未知性别") private Integer unknownSexCount; @Excel(name = "超过50岁用户数量")