diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/SpecialUserDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/SpecialUserDTO.java index bbf46ffe..d40dbfe4 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/SpecialUserDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/SpecialUserDTO.java @@ -149,4 +149,9 @@ public class SpecialUserDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file + /** + * 犯罪记录 + */ + private String corrector; + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/SpecialUserFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/SpecialUserFormDTO.java index bd355aab..c5f71456 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/SpecialUserFormDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/SpecialUserFormDTO.java @@ -68,4 +68,8 @@ public class SpecialUserFormDTO implements Serializable { * 分散五保补贴 0:未选中 1:选中 */ private String suFiveGuaranteesSubsidy; + /** + * 矫正人员 0:未选中 1:选中 + */ + private String corrector; } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/specialuser/entity/SpecialUserEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/specialuser/entity/SpecialUserEntity.java index e3455bdb..8bc0b426 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/specialuser/entity/SpecialUserEntity.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/specialuser/entity/SpecialUserEntity.java @@ -118,4 +118,9 @@ public class SpecialUserEntity extends BaseEpdcEntity { */ private String suIsPoor; -} \ No newline at end of file + /** + * 犯罪记录 + */ + private String corrector; + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/specialuser/excel/SpecialUserExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/specialuser/excel/SpecialUserExcel.java index af196fbf..5e49ed1c 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/specialuser/excel/SpecialUserExcel.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/specialuser/excel/SpecialUserExcel.java @@ -78,4 +78,7 @@ public class SpecialUserExcel { @Excel(name = "是否贫困户",replace = {"否_0","是_1"}) private String suIsPoor; -} \ No newline at end of file + + @Excel(name = "犯罪记录") + private String corrector; +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/excel/民政享受政策人员表-样表.xlsx b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/excel/民政享受政策人员表-样表.xlsx index 873bfbc7..34a940db 100644 Binary files a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/excel/民政享受政策人员表-样表.xlsx and b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/excel/民政享受政策人员表-样表.xlsx differ diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/specialuser/SpecialUserDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/specialuser/SpecialUserDao.xml index 4df8ee49..c99e7ab3 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/specialuser/SpecialUserDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/specialuser/SpecialUserDao.xml @@ -56,7 +56,8 @@ round(SU_ELDERLY_SUBSIDY,2)SU_ELDERLY_SUBSIDY, round(SU_CHILD_SUBSIDY,2)SU_CHILD_SUBSIDY, round(SU_FIVE_GUARANTEES_SUBSIDY,2)SU_FIVE_GUARANTEES_SUBSIDY, - if(SU_IS_POOR = '1','是','否') as SU_IS_POOR + if(SU_IS_POOR = '1','是','否') as SU_IS_POOR, + corrector from epdc_special_user where DEL_FLAG = '0' @@ -90,6 +91,9 @@ and SU_FIVE_GUARANTEES_SUBSIDY > 0 + + and corrector is not null and corrector ]]> '' + order by CREATED_TIME desc LIMIT #{pageIndex},#{pageSize} @@ -127,6 +131,9 @@ and SU_FIVE_GUARANTEES_SUBSIDY > 0 + + and corrector is not null and corrector ]]> '' + order by CREATED_TIME desc