From a1dae4054d90128e3a0d1789210964badfb5afe2 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 16 Sep 2020 18:14:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AE=A1=E5=B0=8F=E5=B8=A6=E4=B8=AA?= =?UTF-8?q?=E9=95=BF=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=81=8C=E8=B4=A3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/events/service/impl/EpdcEventsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 721523c9..8df7d456 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -765,7 +765,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl Date: Thu, 17 Sep 2020 14:19:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=87=87=E9=9B=86-=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/HousingInformationDTO.java | 2 +- .../epdc/dto/PopulationInformationDTO.java | 4 +- .../epdc/entity/HousingInformationEntity.java | 4 +- .../entity/PopulationInformationEntity.java | 4 +- .../impl/HousingInformationServiceImpl.java | 98 +++---------------- 5 files changed, 18 insertions(+), 94 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/HousingInformationDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/HousingInformationDTO.java index 26d4507e..bc3a9007 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/HousingInformationDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/HousingInformationDTO.java @@ -48,7 +48,7 @@ public class HousingInformationDTO implements Serializable { /** * 购房时间 */ - private Date buyingTime; + private String buyingTime; /** * 房屋面积 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PopulationInformationDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PopulationInformationDTO.java index 0200d7bb..a7160631 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PopulationInformationDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PopulationInformationDTO.java @@ -73,7 +73,7 @@ public class PopulationInformationDTO implements Serializable { /** * 入党时间 */ - private Date joinTime; + private String joinTime; /** * 组织关系所在地 @@ -148,7 +148,7 @@ public class PopulationInformationDTO implements Serializable { /** * 失业登记时间 */ - private Date unemploymentRegisterTime; + private String unemploymentRegisterTime; /** * 家庭类别 (0：普通家庭 1：五好家庭 2：军烈家庭 3：优抚家庭 4：单亲家庭 5：空巢老人 6：困难家庭) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/HousingInformationEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/HousingInformationEntity.java index 0443174d..d0f8fa7b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/HousingInformationEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/HousingInformationEntity.java @@ -18,13 +18,11 @@ package com.elink.esua.epdc.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; -import java.util.Date; /** * 房屋信息表 @@ -47,7 +45,7 @@ public class HousingInformationEntity extends BaseEpdcEntity { /** * 购房时间 */ - private Date buyingTime; + private String buyingTime; /** * 房屋面积 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PopulationInformationEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PopulationInformationEntity.java index 0449ce9d..23c8638c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PopulationInformationEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PopulationInformationEntity.java @@ -71,7 +71,7 @@ public class PopulationInformationEntity extends BaseEpdcEntity { /** * 入党时间 */ - private Date joinTime; + private String joinTime; /** * 组织关系所在地 @@ -146,7 +146,7 @@ public class PopulationInformationEntity extends BaseEpdcEntity { /** * 失业登记时间 */ - private Date unemploymentRegisterTime; + private String unemploymentRegisterTime; /** * 家庭类别 (0：普通家庭 1：五好家庭 2：军烈家庭 3：优抚家庭 4：单亲家庭 5：空巢老人 6：困难家庭) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java index 57fe575e..4fae4175 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java @@ -26,10 +26,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.config.StreamUtils; import com.elink.esua.epdc.constant.HouseUseConstant; import com.elink.esua.epdc.constant.PopulationDictConstant; @@ -446,9 +443,6 @@ public class HousingInformationServiceImpl extends BaseServiceImpl32){ - errorLineInfoDto = new EpdcPopulationErrorResultDTO(); - errorLineInfoDto.setErrorLine((i + 2) + ""); - errorLineInfoDto.setErrorInfo("产权人身份证号不能大于32个字符"); - errorLineInfoDto.setSheetName("房屋信息和户主信息"); - errorLineInfoList.add(errorLineInfoDto); - } + if(StringUtils.isNotBlank((propertyOwnerIdentityNo))){ + if(propertyOwnerIdentityNo.length()>32){ + errorLineInfoDto = new EpdcPopulationErrorResultDTO(); + errorLineInfoDto.setErrorLine((i + 2) + ""); + errorLineInfoDto.setErrorInfo("产权人身份证号不能大于32个字符"); + errorLineInfoDto.setSheetName("房屋信息和户主信息"); + errorLineInfoList.add(errorLineInfoDto); + } basePopulationInformationExcel.setPropertyOwnerIdentityNo(propertyOwnerIdentityNo); } - if (StringUtils.isBlank(propertyOwnerMobile)) { - errorLineInfoDto = new EpdcPopulationErrorResultDTO(); - errorLineInfoDto.setErrorLine((i + 2) + ""); - errorLineInfoDto.setErrorInfo("产权人电话为空"); - errorLineInfoDto.setSheetName("房屋信息和户主信息"); - errorLineInfoList.add(errorLineInfoDto); - }else if(StringUtils.isNotBlank((propertyOwnerMobile))){ + if(StringUtils.isNotBlank((propertyOwnerMobile))){ if(propertyOwnerMobile.length()>32){ errorLineInfoDto = new EpdcPopulationErrorResultDTO(); errorLineInfoDto.setErrorLine((i + 2) + ""); @@ -1004,21 +959,6 @@ public class HousingInformationServiceImpl extends BaseServiceImpl