diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitImportExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitImportExcel.java index 13e8f27c6a..0644af0d69 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitImportExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitImportExcel.java @@ -30,33 +30,34 @@ import lombok.Data; @Data public class IcPartyUnitImportExcel extends ExcelVerifyInfo { - @Excel(name = "单位名称") + @Excel(name = "单位名称*") private String unitName; - @Excel(name = "分类") + @Excel(name = "分类*") private String type; - @Excel(name = "服务事项") - private String serviceMatter; + // @Excel(name = "服务事项") + // private String serviceMatter; - @Excel(name = "联系人") + @Excel(name = "联系人*") private String contact; - @Excel(name = "联系电话") + @Excel(name = "联系电话*") private String contactMobile; - @Excel(name = "在职党员") + @Excel(name = "在职党员*") private Integer memberCount; - @Excel(name = "地址") - private String address; - - @Excel(name = "中心位置经度") - private String longitude; - - @Excel(name = "中心位置纬度") - private String latitude; - @Excel(name = "备注") private String remark; + + @Excel(name = "详细地址*") + private String address; + + // + // @Excel(name = "中心位置经度") + // private String longitude; + // + // @Excel(name = "中心位置纬度") + // private String latitude; } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitImportFailedExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitImportFailedExcel.java index 2cd7e44e2a..fe47433803 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitImportFailedExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitImportFailedExcel.java @@ -30,9 +30,27 @@ import lombok.Data; @Data public class IcPartyUnitImportFailedExcel extends ExcelVerifyInfo { - @Excel(name = "单位名称", width = 40) + @Excel(name = "单位名称*", width = 40) private String unitName; + @Excel(name = "分类*",width = 20) + private String type; + + @Excel(name = "联系人*",width = 20) + private String contact; + + @Excel(name = "联系电话*",width = 20) + private String contactMobile; + + @Excel(name = "在职党员*",width = 10) + private Integer memberCount; + + @Excel(name = "备注",width = 30) + private String remark; + + @Excel(name = "详细地址*",width = 50) + private String address; + @Excel(name = "错误信息", width = 50) private String errorInfo; } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index f430f2b711..326212a645 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -450,7 +450,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl matters = Arrays.asList(obj.getServiceMatter().split(StrConstant.COLON)); matters.forEach(item -> { if (null == categoryMap.get(item)) { @@ -461,7 +461,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl%s", obj.getRowNum())); - } else if (StringUtils.isBlank(obj.getLatitude())) { + } /*else if (StringUtils.isBlank(obj.getLatitude())) { IcPartyUnitImportFailedExcel failed = ConvertUtils.sourceToTarget(obj, IcPartyUnitImportFailedExcel.class); failed.setErrorInfo("中心位置纬度为空"); fileList.add(failed); @@ -494,7 +494,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl%s", obj.getRowNum())); - } + }*/ } if (CollectionUtils.isNotEmpty(result)) { @@ -505,14 +505,14 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl