From e2ad26055e10ceb98dedd0ceb4041fa51ee5e011 Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Fri, 19 Mar 2021 11:19:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasePopulationInfoController.java | 5 +-- .../PopulationBaseInfoUploadListener.java | 42 ++++++++++--------- .../list-basepopulationinfo.html | 6 +-- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/cm/population/controller/apis/basepopulationinfo/BasePopulationInfoController.java b/src/main/java/com/cm/population/controller/apis/basepopulationinfo/BasePopulationInfoController.java index baa929a..4f11d5a 100644 --- a/src/main/java/com/cm/population/controller/apis/basepopulationinfo/BasePopulationInfoController.java +++ b/src/main/java/com/cm/population/controller/apis/basepopulationinfo/BasePopulationInfoController.java @@ -138,9 +138,8 @@ public class BasePopulationInfoController extends AbstractController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); List> listHeaders = new ArrayList<>(); String [] headers = { - "姓名","曾用名","性别","身份证号","出生日期","联系方式","籍贯","民族","宗教信仰","学历","政治面貌", - "婚姻情况","职业类别","职业","服务处所","户籍地(省)","市/直辖","区/县","详细地址","现住地(省)", - "市/直辖","区/县","详细地址" + "公民身份证","姓名","曾用名","性别","出生日期","民族","籍贯","婚姻情况","政治面貌","学历","宗教信仰","职业类别", + "职业","服务处所","联系方式","户籍地","户籍地门(楼)详址","现住地", "市/直辖","区/县","现住地门(楼)详址" }; List> listHeader = new ArrayList<>(); for (String item : headers){ diff --git a/src/main/java/com/cm/population/uploadexcellistener/populationbaseinfo/PopulationBaseInfoUploadListener.java b/src/main/java/com/cm/population/uploadexcellistener/populationbaseinfo/PopulationBaseInfoUploadListener.java index 3563f16..0bf722b 100644 --- a/src/main/java/com/cm/population/uploadexcellistener/populationbaseinfo/PopulationBaseInfoUploadListener.java +++ b/src/main/java/com/cm/population/uploadexcellistener/populationbaseinfo/PopulationBaseInfoUploadListener.java @@ -4,16 +4,16 @@ import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.cm.common.utils.UUIDUtil; import com.cm.population.service.basepopulationinfo.IBasePopulationInfoService; +import org.springframework.util.StringUtils; -import java.util.HashMap; -import java.util.Map; +import java.util.*; /** * @author xwangs * @create 2021-03-18 17:26 * @description */ -public class PopulationBaseInfoUploadListener extends AnalysisEventListener> { +public class PopulationBaseInfoUploadListener extends AnalysisEventListener> { private static final int BATCH_COUNT = 3000; private IBasePopulationInfoService service; @@ -24,27 +24,29 @@ public class PopulationBaseInfoUploadListener extends AnalysisEventListener data, AnalysisContext context) { + public void invoke(Map data, AnalysisContext context) { + int columnCount = 19; + for (int i = 0; i < columnCount; i++){ + data.put(i,StringUtils.isEmpty(data.get(i)) ? "" : data.get(i).toString().trim()); + } Map dataObj = new HashMap<>(32); - dataObj.put("fullName",data.get(0)); - dataObj.put("nameUsedBefore",data.get(1)); - dataObj.put("gender",data.get(2)); - dataObj.put("idCardNumber",data.get(3)); + dataObj.put("idCardNumber",data.get(0)); + dataObj.put("fullName",data.get(1)); + dataObj.put("nameUsedBefore",data.get(2)); + dataObj.put("gender",data.get(3)); dataObj.put("birthDate",data.get(4)); - dataObj.put("telephone",data.get(5)); + dataObj.put("nation",data.get(5)); dataObj.put("nativePlace",data.get(6)); - dataObj.put("nation",data.get(7)); - dataObj.put("religion",data.get(8)); + dataObj.put("maritalStatus",data.get(7)); + dataObj.put("politicalStatus",data.get(8)); dataObj.put("education",data.get(9)); - dataObj.put("politicalStatus",data.get(10)); - dataObj.put("maritalStatus",data.get(11)); - dataObj.put("occupationCategory",data.get(12)); - dataObj.put("occupation",data.get(13)); - dataObj.put("serviceSpace",data.get(14)); - dataObj.put("registeredResidence",data.get(15).toString() + data.get(16).toString() + data.get(17).toString()); - dataObj.put("registeredResidenceAddr",data.get(18)); - dataObj.put("currentResidence",data.get(19).toString() + data.get(20).toString() + data.get(21).toString()); - dataObj.put("currentResidenceAddr",data.get(22)); + dataObj.put("religion",data.get(10)); + dataObj.put("occupationCategory",data.get(11)); + dataObj.put("occupation",data.get(12)); + dataObj.put("serviceSpace",data.get(13)); + dataObj.put("telephone",data.get(14)); + dataObj.put("registeredResidenceAddr",data.get(15).toString() + data.get(16).toString()); + dataObj.put("currentResidenceAddr",data.get(17).toString() + data.get(18).toString()); service.saveBasePopulationInfoImport(dataObj); } diff --git a/src/main/resources/static/route/basepopulationinfo/list-basepopulationinfo.html b/src/main/resources/static/route/basepopulationinfo/list-basepopulationinfo.html index 53c3210..368dcef 100644 --- a/src/main/resources/static/route/basepopulationinfo/list-basepopulationinfo.html +++ b/src/main/resources/static/route/basepopulationinfo/list-basepopulationinfo.html @@ -77,7 +77,7 @@ reloadTable(1); } ,error: function(){ - console.log("erererer"); + console.log("error"); } }); @@ -175,7 +175,7 @@ templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; + return row['registeredResidenceAddr']; } return rowData + '-' + row['registeredResidenceAddr']; } @@ -184,7 +184,7 @@ templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; + return row['currentResidenceAddr']; } return rowData + '-' + row['currentResidenceAddr']; }