修改证件号校验 , 人口录入页面布局 , 年龄解析

src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java

@@ -61,6 +61,16 @@ public class PopulationInfoBaseDTO {
     private String phone;
     @ApiModelProperty(name = "age", value = "年龄")
     private Integer age;
+    @ApiModelProperty(name = "创建人", value = "创建人")
+    private String creator;
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
 
     public String getHealthStatus() {
         return healthStatus;

src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoDTO.java

@@ -168,6 +168,16 @@ public class PopulationInfoDTO {
     @ApiModelProperty(name = "age", value = "年龄")
     @CheckEmptyAnnotation(name = "年龄")
     private Integer age;
+    @ApiModelProperty(name = "创建人", value = "创建人")
+    private String creator;
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
 
     public String getDepartmentType() {
         return departmentType == null ? "" : departmentType;

src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml

@@ -831,7 +831,8 @@
             t1.partyb_idcard,
             t1.partyb_name,
             t1.partyb_phone,
-            t1.dispute_id
+            t1.dispute_id,
+            t1.creator
         FROM
             population_dispute t1
         LEFT JOIN

src/main/resources/mybatis/mapper/petition/petition-mapper.xml

@@ -311,7 +311,8 @@
             t2.dictionary_name AS coordinate_name,
             t1.talk,
             t3.dictionary_name AS talk_name,
-            t1.petition_id
+            t1.petition_id,
+            t1.creator
         FROM
             population_petition t1
         LEFT JOIN

src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml

@@ -18,6 +18,7 @@
         <result column="is_military" property="isMilitary"/>
         <result column="is_succour" property="isSuccour"/>
         <result column="is_party" property="isParty"/>
+        <result column="creator" property="creator"/>
     </resultMap>
 
     <resultMap id="populationInfoDTO" type="com.cm.population.pojo.dtos.populationinfo.PopulationInfoDTO">
@@ -95,6 +96,7 @@
         <result column="party_organization" property="partyOrganization"/>
         <result column="party_time" property="partyTime"/>
         <result column="othertext" property="othertext"/>
+        <result column="creator" property="creator"/>
     </resultMap>
 
     <resultMap id="populationInfoBO" type="com.cm.population.pojo.bos.populationinfo.PopulationInfoBO">
@@ -663,7 +665,8 @@
             t1.is_disability,
             t1.is_military,
             t1.is_succour,
-            t1.is_party
+            t1.is_party,
+            t1.creator
         FROM
             population_population_info t1
         WHERE
@@ -1004,7 +1007,8 @@
         t1.is_party,
         t1.party_organization,
         t1.party_time,
-        t1.othertext
+        t1.othertext,
+        t1.creator
         FROM
         population_population_info t1
         WHERE

src/main/resources/mybatis/mapper/security/security-mapper.xml

@@ -322,7 +322,8 @@
             t1.handle_population_info_id,
             t1.handle_name,
             t1.handle_idcard,
-        t1.handle_phone
+            t1.handle_phone,
+            t1.creator
         FROM
             population_security t1
         WHERE