From 5533a7429c8166c29ad9a7736252974b82192a8a Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Fri, 3 Dec 2021 14:41:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E4=BA=BA=E5=91=98=E7=8A=AF=E7=BD=AA?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/SpecialUserDTO.java | 7 ++++++- .../epdc/dto/form/SpecialUserFormDTO.java | 4 ++++ .../specialuser/entity/SpecialUserEntity.java | 7 ++++++- .../specialuser/excel/SpecialUserExcel.java | 5 ++++- .../民政享受政策人员表-样表.xlsx | Bin 10170 -> 11252 bytes .../mapper/specialuser/SpecialUserDao.xml | 11 +++++++++-- 6 files changed, 29 insertions(+), 5 deletions(-) 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 873bfbc7e8f75464e8cbc7ebe0306b28049461cf..34a940db9e12764cf3b6cb6ec81bee681b7bd66f 100644 GIT binary patch delta 6115 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 delta 5101 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 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