特殊人群管理新增人员犯罪记录

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;
 
-}
+    /**
+     * 犯罪记录
+     */
+    private String corrector;
+
+}

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

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;
 
-}
+	/**
+	 * 犯罪记录
+	 */
+    private String corrector;
+
+}

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;
-}
+
+    @Excel(name = "犯罪记录")
+    private String corrector;
+}

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'
         <if test="suName!=null and suName!=''">
@@ -90,6 +91,9 @@
         <if test="suFiveGuaranteesSubsidy == 1">
             and SU_FIVE_GUARANTEES_SUBSIDY > 0
         </if>
+        <if test="corrector == 1">
+            and corrector is not null and corrector <![CDATA[ <> ]]> ''
+        </if>
         order by CREATED_TIME desc
         LIMIT #{pageIndex},#{pageSize}
     </select>
@@ -127,6 +131,9 @@
         <if test="suFiveGuaranteesSubsidy == 1">
             and SU_FIVE_GUARANTEES_SUBSIDY > 0
         </if>
+        <if test="corrector == 1">
+            and corrector is not null and corrector <![CDATA[ <> ]]> ''
+        </if>
         order by CREATED_TIME desc
     </select>
     <select id="selectDisabilityType"
@@ -174,4 +181,4 @@
     </select>
 
 
-</mapper>
+</mapper>