From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 0cfe29a..b769e6a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -33,9 +33,7 @@
import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
import java.util.Date;
import java.util.List;
@@ -155,6 +153,7 @@
"cmp.label, " +
"cmp.marriage, " +
"cmp.culture_level, " +
+ "cmp.profession, " +
"cmp.out_or_local, " +
"cmp.census_register, " +
"cmp.healthy, " +
@@ -207,6 +206,9 @@
"<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageStartTime == comMngPopulationVO.ageEndTime'>" +
"AND cmp.birthday BETWEEN #{comMngPopulationVO.ageStartTimeEnd} and #{comMngPopulationVO.ageEndTime}" +
" </if> " +
+ "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageStartTime != comMngPopulationVO.ageEndTime'>" +
+ "AND cmp.birthday BETWEEN #{comMngPopulationVO.ageEndTimeEnd} and #{comMngPopulationVO.ageStartTime}" +
+ " </if> " +
"<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != ""'>" +
"AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " +
" </if> " +
@@ -221,9 +223,6 @@
" </if> " +
"<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != ""'>" +
"AND cmp.remark = #{comMngPopulationVO.remark} " +
- " </if> " +
- "<if test='comMngPopulationVO.address != null and comMngPopulationVO.address != ""'>" +
- "AND cmp.address like concat('%', #{comMngPopulationVO.address}, '%') " +
" </if> " +
" </where>" +
" order by cmp.create_at desc" +
@@ -276,6 +275,15 @@
",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " +
",(select count(id) from com_mng_population where act_id = #{communityId} and label is not null) as specialTotal " +
",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','刑满释放','%')) as rehabilitationTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal " +
" from com_mng_population as cmp where act_id = #{communityId}")
ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
@@ -1044,6 +1052,7 @@
" cmp.card_no, " +
" cmp.label, " +
" cmp.address, " +
+ " cmp.culture_level, " +
" cmp.nation, " +
" cmp.political_outlook, " +
" cmp.sex, " +
@@ -1091,7 +1100,7 @@
" FROM " +
" com_mng_population AS cmp where 1=1 " +
"<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != ""'>" +
- "AND (cmp.name like concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%') or cmp.address like concat (#{populationListDTO.keyWord},'%')) " +
+ "AND (cmp.name like concat (#{populationListDTO.keyWord},'%') or cmp.card_no = #{populationListDTO.cardNo} or cmp.address like concat (#{populationListDTO.keyWord},'%')) " +
" </if> " +
"<if test='populationListDTO.label != null and populationListDTO.label != ""'>" +
"AND cmp.label like concat ('%',#{populationListDTO.label},'%') " +
@@ -1246,5 +1255,32 @@
" </script>")
IPage<ComMngVillagePopulationListVO> getVillagePopulationAdmin(Page page, @Param("villagePopulationDTO") PageComMngVillagePopulationDTO villagePopulationDTO);
+ @Insert("<script> " +
+ "insert into com_mng_population(`id`,`street_id`,`act_id`,`village_id`,`name`,`sex`,`certificate_type`,`card_no`" +
+ ",`card_no_expiration_date`,`card_no_str`,`road`,`door_no`,`floor`,`unit_no`,`house_no`,`political_outlook`" +
+ ",`work_company`,`special_situation`,`phone`,`out_or_local`,`census_register`,`person_type`,`country`" +
+ ",`date_of_departure`,`native_place`,`nation_code`,`nation`,`is_rent`,`culture_level`,`marriage`,`healthy`" +
+ ",`blood_type`,`religion`,`profession`,`person_status`,`death`,`head_portrait`,`monthly_income`,`family_status`" +
+ ",`birthday`,`goal_in_china`,`date_of_arrival`,`label`,`card_photo_front`,`card_photo_back`,`family_book`" +
+ ",`delete_flag`,`remark`,`create_at`,`update_at`,`residence`,`address`,`house_id`) values " +
+ "<foreach collection=\"populationList\" item=\"item\" index=\"index\" separator=\",\">\n" +
+ " (#{item.id},#{item.streetId},#{item.actId},#{item.villageId}" +
+ ",#{item.name},#{item.sex},#{item.certificateType},#{item.cardNo}" +
+ ",#{item.cardNoExpirationDate},#{item.cardNoStr},#{item.road},#{item.doorNo}" +
+ ",#{item.floor},#{item.unitNo},#{item.houseNo},#{item.politicalOutlook}" +
+ ",#{item.workCompany},#{item.specialSituation},#{item.phone},#{item.outOrLocal}" +
+ ",#{item.censusRegister},#{item.personType},#{item.country},#{item.dateOfDeparture}" +
+ ",#{item.nativePlace},#{item.nationCode},#{item.nation},#{item.isRent},#{item.cultureLevel}" +
+ ",#{item.marriage},#{item.healthy},#{item.bloodType},#{item.religion},#{item.profession}" +
+ ",#{item.personStatus},#{item.death},#{item.headPortrait},#{item.monthlyIncome},#{item.familyStatus}" +
+ ",#{item.birthday},#{item.goalInChina},#{item.dateOfArrival},#{item.label},#{item.cardPhotoFront}" +
+ ",#{item.cardPhotoBack},#{item.familyBook},#{item.deleteFlag},#{item.remark},now(),#{item.updateAt}" +
+ ",#{item.residence},#{item.address},#{item.houseId})" +
+ " </foreach>" +
+ " </script>")
+ void insertAll(@Param("populationList") List<ComMngPopulationDO> populationList);
+
+ void updateAll(@Param("populationList") List<ComMngPopulationDO> populationList);
+
}
--
Gitblit v1.7.1