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

Merge remote-tracking branch 'origin/upgrade' into upgrade

Browse Source
This commit is contained in:
TS-QD1 2023-11-04 16:14:14 +08:00
commit 78a039d21a
1 changed files with 80 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -934,85 +934,88 @@
<!-- 基础人口信息列表 -->
<select id="list" parameterType="map" resultMap="populationInfoDTO">
SELECT
t1.population_info_id,
t1.name,
t1.idcard,
t1.idcard_type,
t1.birthday,
t1.sex,
t1.nation,
t1.education,
t1.description,
t1.organization,
t1.religion,
t1.marriage_status,
t1.marriage_change_time,
t1.marriage_first_time,
t1.social_security,
t1.health_status,
t1.department_type,
t1.department,
t1.pastion,
t1.pastion_title,
t1.expertise,
t1.phone,
t1.father_id,
t1.father_name,
t1.father_idcard,
t1.father_phone,
t1.mother_id,
t1.mother_name,
t1.mother_idcard,
t1.mother_phone,
t1.relationship,
t1.domicile_address,
t1.domicile_address_type,
t1.domicile_area_code,
t1.domicile_area_name,
t1.origin_address,
t1.origin_area_code,
t1.origin_area_name,
t1.flow_time,
t1.flow_reason,
t1.flow_reasontext,
t1.is_oldage,
t1.oldage_type,
t1.oldage_department,
t1.oldage_lift,
t1.oldage_health_status,
t1.oldage_selfcare,
t1.oldage_live,
t1.is_disability,
t1.disability_type,
t1.disability_level,
t1.disability_number,
t1.disability_carnumber,
t1.disability_address,
t1.disability_area_code,
t1.disability_area_name,
t1.disability_income,
t1.disability_house,
t1.disability_time,
t1.disability_guardian,
t1.disability_guardian_phone,
t1.disability_guardian_relation,
t1.is_military,
t1.military_time,
t1.military_position,
t1.is_succour,
t1.succour_dibao,
t1.succour_help,
t1.succour_difficulty,
t1.succour_subsidy,
t1.is_party,
t1.party_organization,
t1.party_time,
t1.othertext,
t1.creator
t1.population_info_id,
t1.name,
t1.idcard,
t1.idcard_type,
t1.birthday,
t1.sex,
t1.nation,
t1.education,
t1.description,
t1.organization,
t1.religion,
t1.marriage_status,
t1.marriage_change_time,
t1.marriage_first_time,
t1.social_security,
t1.health_status,
t1.department_type,
t1.department,
t1.pastion,
t1.pastion_title,
t1.expertise,
t1.phone,
t1.father_id,
t1.father_name,
t1.father_idcard,
t1.father_phone,
t1.mother_id,
t1.mother_name,
t1.mother_idcard,
t1.mother_phone,
t1.relationship,
t1.domicile_address,
t1.domicile_address_type,
t1.domicile_area_code,
t1.domicile_area_name,
t1.origin_address,
t1.origin_area_code,
t1.origin_area_name,
t1.flow_time,
t1.flow_reason,
t1.flow_reasontext,
t1.is_oldage,
t1.oldage_type,
t1.oldage_department,
t1.oldage_lift,
t1.oldage_health_status,
t1.oldage_selfcare,
t1.oldage_live,
t1.is_disability,
t1.disability_type,
t1.disability_level,
t1.disability_number,
t1.disability_carnumber,
t1.disability_address,
t1.disability_area_code,
t1.disability_area_name,
t1.disability_income,
t1.disability_house,
t1.disability_time,
t1.disability_guardian,
t1.disability_guardian_phone,
t1.disability_guardian_relation,
t1.is_military,
t1.military_time,
t1.military_position,
t1.is_succour,
t1.succour_dibao,
t1.succour_help,
t1.succour_difficulty,
t1.succour_subsidy,
t1.is_party,
t1.party_organization,
t1.party_time,
t1.othertext,
t1.creator
FROM
population_population_info t1
population_population_info t1
WHERE
t1.is_delete = 0
t1.is_delete = 0
<if test="creator != null and creator != ''">
AND t1.creator = #{creator}
</if>
<if test="idcard != null and idcard != ''">
AND t1.idcard LIKE CONCAT('%', #{idcard}, '%')
</if>