From 111000bbbdf8a16d8b803900a96dc8e441a191e6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 1 Nov 2022 15:04:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=AF=BC=E5=85=A5=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=8F=98=E5=8C=96=E5=BC=95=E8=B5=B7=E7=9A=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 4 +++ .../epmet/dto/form/IcTripReportFormDTO.java | 4 +++ .../entity/IcTripReportRecordEntity.java | 4 +++ .../excel/IcPsTripReportRecordExcel.java | 29 ++++++++++++++----- .../impl/IcTripReportRecordServiceImpl.java | 19 ++++-------- 5 files changed, 39 insertions(+), 21 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 63d5d28ffa..21b26ce7be 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -254,6 +254,10 @@ public class IcTripReportRecordDTO implements Serializable { * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 户籍地 【磐石】 + */ + private String registeredResidence; /** * 年龄【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 6160420fee..aae545ab01 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -196,6 +196,10 @@ public class IcTripReportFormDTO implements Serializable { * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 户籍地 【磐石】 + */ + private String registeredResidence; /** * 年龄【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index ffbfa4fe1f..5feb599051 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -135,6 +135,10 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 户籍地 【磐石】 + */ + private String registeredResidence; /** * 年龄【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 011757b7d6..1f4bd6814d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -29,14 +29,19 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { @Excel(name = "户籍地（省市县区）", needMerge = true) @NotBlank(message = "不能为空") - private String presentAddress; + private String registeredResidence; @Excel(name = "手机号", needMerge = true) @NotBlank(message = "不能为空") private String mobile; - @ExcelCollection(name = "来源地") - private List source; + /* @ExcelCollection(name = "来源地") + private List source;*/ + @Excel(name = "来自地区（格式：省-市-区-街道-社区）") + @NotBlank(message = "不能为空") + private String sourceAddress; + @Excel(name = "来自地区详细地址") + private String sourceDetailAddress; @Excel(name = "来曹事由（100字以内）", needMerge = true) @NotBlank(message = "不能为空") @@ -50,11 +55,21 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { @NotBlank(message = "不能为空") private String arriveDate; - @ExcelCollection(name = "在曹居住地点") - private List present; + /*@ExcelCollection(name = "在曹居住地点") + private List present;*/ + @Excel(name = "现居地") + @NotBlank(message = "不能为空") + private String presentAddress; + @Excel(name = "现居地详细地址") + private String detailAddress; - @ExcelCollection(name = "返回方式") - private List traffic; + /*@ExcelCollection(name = "返回方式") + private List traffic;*/ + @Excel(name = "返回方式") + @NotBlank(message = "不能为空") + private String trafficType; + @Excel(name = "其他返回方式") + private String trafficTypeExplain; @Excel(name = "7天内旅居史情况", needMerge = true) private String sojournHistory; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 37e6df0dad..0b97b0d90d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -497,7 +497,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl fileList = new ArrayList<>(); IcPsTripReportRecordErrorExcel excel = null; //1.读取Excel数据 - ExcelImportResult testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 3, IcPsTripReportRecordExcel.class); + ExcelImportResult testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 2, IcPsTripReportRecordExcel.class); //2.存在错误行数据时存入错误数据集合中 if (CollectionUtils.isNotEmpty(testExcelImportResult.getFailList())) { for (IcPsTripReportRecordExcel entity : testExcelImportResult.getFailList()) { @@ -522,8 +522,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl