Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
java_cuibaocheng@163.com 2023-11-04 15:48:05 +08:00
parent 38af70dc8b
commit 9d24b9e6ce
8 changed files with 106 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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

@ -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;

3
src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml
View File

@ -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

34
src/main/resources/mybatis/mapper/drug/drug-mapper.xml
View File

@ -79,23 +79,23 @@
gmt_modified,
is_delete
) VALUES(
#{drugId},
#{populationInfoId},
#{startTime},
#{control},
#{controlPhone},
#{help},
#{helpPhone},
#{charge},
#{reason},
#{reasonOther},
#{consequence},
#{creator},
#{gmtCreate},
#{modifier},
#{gmtModified},
#{isDelete}
)
#{drugId},
#{populationInfoId},
#{startTime},
#{control},
#{controlPhone},
#{help},
#{helpPhone},
#{charge},
#{reason},
#{reasonOther},
#{consequence},
#{creator},
#{gmtCreate},
#{modifier},
#{gmtModified},
#{isDelete}
)
</insert>
<!-- 删除信访管理-吸毒人员 -->

3
src/main/resources/mybatis/mapper/petition/petition-mapper.xml
View File

@ -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

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

@ -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

64
src/main/resources/mybatis/mapper/release/release-mapper.xml
View File

@ -71,21 +71,21 @@
gmt_modified,
is_delete
) VALUES(
#{releaseId},
#{populationInfoId},
#{charge},
#{prisonTerm},
#{type},
#{organization},
#{superviseTime},
#{isRelease},
#{releaseTime},
#{creator},
#{gmtCreate},
#{modifier},
#{gmtModified},
#{isDelete}
)
#{releaseId},
#{populationInfoId},
#{charge},
#{prisonTerm},
#{type},
#{organization},
#{superviseTime},
#{isRelease},
#{releaseTime},
#{creator},
#{gmtCreate},
#{modifier},
#{gmtModified},
#{isDelete}
)
</insert>
<!-- 删除特殊人口-刑满释放 -->
@ -229,25 +229,25 @@
<!-- 特殊人口-刑满释放列表 -->
<select id="list" parameterType="map" resultMap="releaseDTO">
SELECT
t1.release_id,
t1.population_info_id,
t1.charge,
t1.prison_term,
t1.type,
t1.organization,
t1.supervise_time,
t1.is_release,
t1.release_time,
t1.creator,
t1.gmt_create,
t1.modifier,
t1.gmt_modified,
t1.is_delete,
1
t1.release_id,
t1.population_info_id,
t1.charge,
t1.prison_term,
t1.type,
t1.organization,
t1.supervise_time,
t1.is_release,
t1.release_time,
t1.creator,
t1.gmt_create,
t1.modifier,
t1.gmt_modified,
t1.is_delete,
1
FROM
population_release t1
population_release t1
WHERE
t1.is_delete = 0
t1.is_delete = 0
<if test="charge != null and charge != ''">
AND t1.charge = #{charge}
</if>

53
src/main/resources/mybatis/mapper/security/security-mapper.xml
View File

@ -299,34 +299,35 @@
<!-- 信访管理-社会治安列表 -->
<select id="list" parameterType="map" resultMap="securityDTO">
SELECT
t1.security_id,
t1.population_info_id,
t1.charge,
t1.time,
t1.security_address,
t1.security_area_code,
t1.security_area_name,
t1.lat,
t1.lng,
t1.map_address,
t1.degree,
t1.creator,
t1.gmt_create,
t1.modifier,
t1.gmt_modified,
t1.is_delete,
t1.acceptance_population_info_id,
t1.acceptance_name,
t1.acceptance_idcard,
t1.acceptance_phone,
t1.handle_population_info_id,
t1.handle_name,
t1.handle_idcard,
t1.handle_phone
t1.security_id,
t1.population_info_id,
t1.charge,
t1.time,
t1.security_address,
t1.security_area_code,
t1.security_area_name,
t1.lat,
t1.lng,
t1.map_address,
t1.degree,
t1.creator,
t1.gmt_create,
t1.modifier,
t1.gmt_modified,
t1.is_delete,
t1.acceptance_population_info_id,
t1.acceptance_name,
t1.acceptance_idcard,
t1.acceptance_phone,
t1.handle_population_info_id,
t1.handle_name,
t1.handle_idcard,
t1.handle_phone,
t1.creator
FROM
population_security t1
population_security t1
WHERE
t1.is_delete = 0
t1.is_delete = 0
<if test="degree != null and degree != ''">
AND t1.degree = #{degree}
</if>