磐石导入模板变化引起的调整

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;
     /**
      * 年龄【磐石】
      */

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;
     /**
      * 年龄【磐石】
      */

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;
 	/**
      * 年龄【磐石】
      */

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 = "来源地")
+   /* @ExcelCollection(name = "来源地")
-    private List<Source> source;
+    private List<Source> 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 = "在曹居住地点")
+    /*@ExcelCollection(name = "在曹居住地点")
-    private List<Present> present;
+    private List<Present> present;*/
+    @Excel(name = "现居地")
+    @NotBlank(message = "不能为空")
+    private String presentAddress;
+    @Excel(name = "现居地详细地址")
+    private String detailAddress;
 
-    @ExcelCollection(name = "返回方式")
+    /*@ExcelCollection(name = "返回方式")
-    private List<Traffic> traffic;
+    private List<Traffic> traffic;*/
+    @Excel(name = "返回方式")
+    @NotBlank(message = "不能为空")
+    private String trafficType;
+    @Excel(name = "其他返回方式")
+    private String trafficTypeExplain;
 
     @Excel(name = "7天内旅居史情况", needMerge = true)
     private String sojournHistory;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@@ -497,7 +497,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
             List<IcPsTripReportRecordErrorExcel> fileList = new ArrayList<>();
             IcPsTripReportRecordErrorExcel excel = null;
             //1.读取Excel数据
-            ExcelImportResult<IcPsTripReportRecordExcel> testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 3, IcPsTripReportRecordExcel.class);
+            ExcelImportResult<IcPsTripReportRecordExcel> 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<IcTripReportR
                     StringBuffer errMsg = new StringBuffer("");
                     IcPsTripReportRecordExcel obj = iterator.next();
                     //返回方式为其他时需要填写"其他返回方式"
-                    if (CollectionUtils.isEmpty(obj.getTraffic()) ||
+                    if ("其他".equals(obj.getTrafficType()) && StringUtils.isBlank(obj.getTrafficTypeExplain())) {
-                            ("其他".equals(obj.getTraffic().get(0).getTrafficType()) && StringUtils.isBlank(obj.getTraffic().get(0).getTrafficTypeExplain()))) {
                         errMsg.append("返回方式为其他时，请补充“其他返回方式”;");
                         bl.set(true);
                     }
@@ -567,17 +566,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
                     e.setAgencyId(staffInfo.getAgencyId());
                     e.setPids(staffInfo.getAgencyPIds());
                     e.setUserType(IcResiUserConstant.USER_TYPE_IMPORT);
-                    if (!CollectionUtils.isEmpty(l.getSource())) {
+                    if (trafficTypeMap.getData().containsKey(l.getTrafficType())) {
-                        e.setSourceAddress(l.getSource().get(0).getSourceAddress());
+                        e.setTrafficType(trafficTypeMap.getData().get(l.getTrafficType()));
-                        e.setSourceDetailAddress(l.getSource().get(0).getSourceDetailAddress());
+                        e.setTrafficTypeExplain(l.getTrafficTypeExplain());
-                    }
-                    if (!CollectionUtils.isEmpty(l.getPresent())) {
-                        e.setPresentAddress(l.getPresent().get(0).getPresentAddress());
-                        e.setDetailAddress(l.getPresent().get(0).getDetailAddress());
-                    }
-                    if (!CollectionUtils.isEmpty(l.getTraffic()) && trafficTypeMap.getData().containsKey(l.getTraffic().get(0).getTrafficType())) {
-                        e.setTrafficType(trafficTypeMap.getData().get(l.getTraffic().get(0).getTrafficType()));
-                        e.setTrafficTypeExplain(l.getTraffic().get(0).getTrafficTypeExplain());
                     }
                     if (StringUtils.isNotBlank(l.getSojournHistory())) {
                         e.setSojournHistory(sojournHistoryMap.getData().get(l.getSojournHistory()));