常住人口导入

boman-api/boman-domain/src/main/java/com/boman/domain/CzrkJzdz.java

@@ -39,7 +39,7 @@ public class CzrkJzdz {
     /**
      * 身份证号码
      */
-    @Excel(name = "身份证号码",type = IMPORT)
+    @Excel(name = "身份证",type = IMPORT)
     private String idCard;
 
     /**
@@ -99,25 +99,25 @@ public class CzrkJzdz {
     /**
      * 居住地的镇
      */
-    @Excel(name = "居住地的镇Id",type = IMPORT)
+    @Excel(name = "乡镇id",type = IMPORT)
     private String townId;
 
     /**
      * 居住地的镇
      */
-    @Excel(name = "居住地的镇",type = IMPORT)
+    @Excel(name = "乡镇",type = IMPORT)
     private String town;
 
     /**
      * 居住地的村
      */
-    @Excel(name = "居住地的村Id",type = IMPORT)
+    @Excel(name = "村居id",type = IMPORT)
     private String villageId;
 
     /**
      * 居住地的村
      */
-    @Excel(name = "居住地的村",type = IMPORT)
+    @Excel(name = "村居",type = IMPORT)
     private String village;
 
     /**

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkJzdzServiceImpl.java

@@ -249,6 +249,7 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
                 czrkJzdz.setVillagerGroup(villagerGroup);
             }
             czrkJzdz.setStatus("Y");
+            czrkJzdz.setIdCard((czrkJzdz.getIdCard()).replaceAll("\\s*|\r|\n|\t",""));
             int i = czrkJzdzMapper.updateByIdCard(czrkJzdz);
             if (i == 0){
                 sb.append(czrkJzdz.getIdCard()).append("---");
@@ -257,7 +258,7 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
         if (sb.length() > 0){
             sb.append("不存在或者信息无需修改");
         }else {
-            sb.append("处理完成:").append(czrkJzdzList.size()).append("条");
+            return AjaxResult.success("导入成功");
         }
         return AjaxResult.success(sb.toString());
     }