户籍信息，流动人口功能修改。

src/main/java/com/cm/population/service/censusmsg/impl/CensusMsgServiceImpl.java

@@ -10,7 +10,9 @@ import com.cm.common.result.SuccessResultData;
 import com.cm.common.result.SuccessResultList;
 import com.cm.common.utils.HashMapUtil;
 import com.cm.common.utils.UUIDUtil;
+import com.cm.population.dao.basepopulationinfo.IBasePopulationInfoDao;
 import com.cm.population.dao.censusmsg.ICensusMsgDao;
+import com.cm.population.pojo.dtos.basepopulationinfo.BasePopulationInfoDTO;
 import com.cm.population.pojo.dtos.censusmsg.CensusMsgDTO;
 import com.cm.population.pojo.vos.censusmsg.CensusMsgVO;
 import com.cm.population.service.censusmsg.ICensusMsgService;
@@ -33,6 +35,8 @@ public class CensusMsgServiceImpl extends AbstractService implements ICensusMsgS
 
     @Autowired
     private ICensusMsgDao censusMsgDao;
+    @Autowired
+    private IBasePopulationInfoDao basePopulationInfoDao;
 
     @Override
     public SuccessResult saveCensusMsg(CensusMsgVO censusMsgVO) throws Exception {
@@ -170,6 +174,29 @@ public class CensusMsgServiceImpl extends AbstractService implements ICensusMsgS
     public SuccessResultList<List<CensusMsgDTO>> listPageCensusMsg(ListPage page) throws SearchException {
         PageHelper.startPage(page.getPage(), page.getRows());
         List<CensusMsgDTO> censusMsgDTOs = censusMsgDao.listCensusMsg(page.getParams());
+        if(null != censusMsgDTOs && censusMsgDTOs.size() > 0) {
+            for(CensusMsgDTO censusMsgDTO: censusMsgDTOs) {
+                page.getParams().put("basePopulationInfoId", censusMsgDTO.getBaseId());
+                BasePopulationInfoDTO basePopulationInfoDTO = basePopulationInfoDao.getBasePopulationInfo(page.getParams());
+                //查询数据字典用于比对字典数据值
+                List<Map<String, Object>> dicList = basePopulationInfoDao.listDictionaryAll();
+                if(null != basePopulationInfoDTO) {
+                    censusMsgDTO.setIdCardNumber(basePopulationInfoDTO.getIdCardNumber());
+                    censusMsgDTO.setFullName(basePopulationInfoDTO.getFullName());
+                    censusMsgDTO.setTelephone(basePopulationInfoDTO.getTelephone());
+                    censusMsgDTO.setNativePlace(basePopulationInfoDTO.getNativePlace());
+                    censusMsgDTO.setCurrentResidence(basePopulationInfoDTO.getCurrentResidence());
+                    for(Map<String, Object> dicItem :dicList) {
+                        String dicId = dicItem.get("dictionary_id").toString();
+                        //性别
+                        if(dicId.equals(basePopulationInfoDTO.getGender())){
+                            censusMsgDTO.setGender(dicItem.get("dictionary_name").toString());
+                            continue;
+                        }
+                    }
+                }
+            }
+        }
         PageInfo<CensusMsgDTO> pageInfo = new PageInfo<>(censusMsgDTOs);
         return new SuccessResultList<>(censusMsgDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
     }

src/main/java/com/cm/population/service/floatingpopulation/impl/FloatingPopulationServiceImpl.java

@@ -10,7 +10,9 @@ import com.cm.common.result.SuccessResultData;
 import com.cm.common.result.SuccessResultList;
 import com.cm.common.utils.HashMapUtil;
 import com.cm.common.utils.UUIDUtil;
+import com.cm.population.dao.basepopulationinfo.IBasePopulationInfoDao;
 import com.cm.population.dao.floatingpopulation.IFloatingPopulationDao;
+import com.cm.population.pojo.dtos.basepopulationinfo.BasePopulationInfoDTO;
 import com.cm.population.pojo.dtos.floatingpopulation.FloatingPopulationDTO;
 import com.cm.population.pojo.vos.floatingpopulation.FloatingPopulationVO;
 import com.cm.population.service.floatingpopulation.IFloatingPopulationService;
@@ -33,6 +35,8 @@ public class FloatingPopulationServiceImpl extends AbstractService implements IF
 
     @Autowired
     private IFloatingPopulationDao floatingPopulationDao;
+    @Autowired
+    private IBasePopulationInfoDao basePopulationInfoDao;
 
     @Override
     public SuccessResult saveFloatingPopulation(FloatingPopulationVO floatingPopulationVO) throws Exception {
@@ -170,6 +174,29 @@ public class FloatingPopulationServiceImpl extends AbstractService implements IF
     public SuccessResultList<List<FloatingPopulationDTO>> listPageFloatingPopulation(ListPage page) throws SearchException {
         PageHelper.startPage(page.getPage(), page.getRows());
         List<FloatingPopulationDTO> floatingPopulationDTOs = floatingPopulationDao.listFloatingPopulation(page.getParams());
+        if(null != floatingPopulationDTOs && floatingPopulationDTOs.size() > 0) {
+            for(FloatingPopulationDTO floatingPopulationDTO: floatingPopulationDTOs) {
+                page.getParams().put("basePopulationInfoId", floatingPopulationDTO.getBaseId());
+                BasePopulationInfoDTO basePopulationInfoDTO = basePopulationInfoDao.getBasePopulationInfo(page.getParams());
+                //查询数据字典用于比对字典数据值
+                List<Map<String, Object>> dicList = basePopulationInfoDao.listDictionaryAll();
+                if(null != basePopulationInfoDTO) {
+                    floatingPopulationDTO.setIdCardNumber(basePopulationInfoDTO.getIdCardNumber());
+                    floatingPopulationDTO.setFullName(basePopulationInfoDTO.getFullName());
+                    floatingPopulationDTO.setTelephone(basePopulationInfoDTO.getTelephone());
+                    floatingPopulationDTO.setNativePlace(basePopulationInfoDTO.getNativePlace());
+                    floatingPopulationDTO.setCurrentResidence(basePopulationInfoDTO.getCurrentResidence());
+                    for (Map<String, Object> dicItem : dicList) {
+                        String dicId = dicItem.get("dictionary_id").toString();
+                        //性别
+                        if (dicId.equals(basePopulationInfoDTO.getGender())) {
+                            floatingPopulationDTO.setGender(dicItem.get("dictionary_name").toString());
+                            continue;
+                        }
+                    }
+                }
+            }
+        }
         PageInfo<FloatingPopulationDTO> pageInfo = new PageInfo<>(floatingPopulationDTOs);
         return new SuccessResultList<>(floatingPopulationDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
     }

src/main/java/com/cm/population/service/homeperson/impl/HomePersonServiceImpl.java

@@ -10,7 +10,9 @@ import com.cm.common.result.SuccessResultData;
 import com.cm.common.result.SuccessResultList;
 import com.cm.common.utils.HashMapUtil;
 import com.cm.common.utils.UUIDUtil;
+import com.cm.population.dao.basepopulationinfo.IBasePopulationInfoDao;
 import com.cm.population.dao.homeperson.IHomePersonDao;
+import com.cm.population.pojo.dtos.basepopulationinfo.BasePopulationInfoDTO;
 import com.cm.population.pojo.dtos.homeperson.HomePersonDTO;
 import com.cm.population.pojo.vos.homeperson.HomePersonVO;
 import com.cm.population.service.homeperson.IHomePersonService;
@@ -33,6 +35,8 @@ public class HomePersonServiceImpl extends AbstractService implements IHomePerso
 
     @Autowired
     private IHomePersonDao homePersonDao;
+    @Autowired
+    private IBasePopulationInfoDao basePopulationInfoDao;
 
     @Override
     public SuccessResult saveHomePerson(HomePersonVO homePersonVO) throws Exception {
@@ -170,6 +174,29 @@ public class HomePersonServiceImpl extends AbstractService implements IHomePerso
     public SuccessResultList<List<HomePersonDTO>> listPageHomePerson(ListPage page) throws SearchException {
         PageHelper.startPage(page.getPage(), page.getRows());
         List<HomePersonDTO> homePersonDTOs = homePersonDao.listHomePerson(page.getParams());
+        if(null != homePersonDTOs && homePersonDTOs.size() > 0) {
+            for(HomePersonDTO homePersonDTO: homePersonDTOs) {
+                page.getParams().put("basePopulationInfoId", homePersonDTO.getBaseId());
+                BasePopulationInfoDTO basePopulationInfoDTO = basePopulationInfoDao.getBasePopulationInfo(page.getParams());
+                //查询数据字典用于比对字典数据值
+                List<Map<String, Object>> dicList = basePopulationInfoDao.listDictionaryAll();
+                if(null != basePopulationInfoDTO) {
+                    homePersonDTO.setIdCardNumber(basePopulationInfoDTO.getIdCardNumber());
+                    homePersonDTO.setFullName(basePopulationInfoDTO.getFullName());
+                    homePersonDTO.setTelephone(basePopulationInfoDTO.getTelephone());
+                    homePersonDTO.setNativePlace(basePopulationInfoDTO.getNativePlace());
+                    homePersonDTO.setCurrentResidence(basePopulationInfoDTO.getCurrentResidence());
+                    for (Map<String, Object> dicItem : dicList) {
+                        String dicId = dicItem.get("dictionary_id").toString();
+                        //性别
+                        if (dicId.equals(basePopulationInfoDTO.getGender())) {
+                            homePersonDTO.setGender(dicItem.get("dictionary_name").toString());
+                            continue;
+                        }
+                    }
+                }
+            }
+        }
         PageInfo<HomePersonDTO> pageInfo = new PageInfo<>(homePersonDTOs);
         return new SuccessResultList<>(homePersonDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
     }

src/main/resources/mybatis/mapper/censusmsg/censusmsg-mapper.xml

@@ -193,7 +193,7 @@
     </select>
 
     <!-- 户籍信息列表 -->
-    <select id="listCensusMsg" parameterType="map" resultMap="censusMsgDTO">
+    <!-- <select id="listCensusMsg" parameterType="map" resultMap="censusMsgDTO">
         SELECT
             t1.name_of_householder,
             t1.contact,
@@ -220,10 +220,8 @@
             OR
             t2.id_card_number LIKE CONCAT('%', #{keywords}, '%')
             OR
-            <!-- 全名 -->
             t2.full_name LIKE CONCAT('%', #{keywords}, '%')
             OR
-            <!-- 曾用名 -->
             t2.name_used_before LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
@@ -242,6 +240,41 @@
             #{censusMsgIds[${index}]}
             </foreach>
         </if>
+    </select> -->
+
+    <select id="listCensusMsg" parameterType="map" resultMap="censusMsgDTO">
+        SELECT
+        t1.name_of_householder,
+        t1.contact,
+        t1.census_number,
+        t1.id_card_of_householder,
+        t1.relationship_with_householder,
+        t1.people_same_census,
+        t1.census_msg_id,
+        t1.base_id
+        FROM
+        gen_census_msg t1
+        WHERE
+        t1.is_delete = 0
+        <if test="keywords != null and keywords != ''">
+            AND (
+            t1.name_of_householder LIKE CONCAT('%', #{keywords}, '%')
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="censusMsgIds != null and censusMsgIds.size > 0">
+            AND
+            t1.census_msg_id IN
+            <foreach collection="censusMsgIds" index="index" open="(" separator="," close=")">
+                #{censusMsgIds[${index}]}
+            </foreach>
+        </if>
     </select>
 
     <!-- 户籍信息统计  -->

src/main/resources/mybatis/mapper/floatingpopulation/floatingpopulation-mapper.xml

@@ -201,7 +201,7 @@
     </select>
 
     <!-- 流动人口列表 -->
-    <select id="listFloatingPopulation" parameterType="map" resultMap="floatingPopulationDTO">
+    <!-- <select id="listFloatingPopulation" parameterType="map" resultMap="floatingPopulationDTO">
         SELECT
             t1.card_expire_date,
             t1.residence_type,
@@ -229,10 +229,8 @@
             OR
             t2.id_card_number LIKE CONCAT('%', #{keywords}, '%')
             OR
-            <!-- 全名 -->
             t2.full_name LIKE CONCAT('%', #{keywords}, '%')
             OR
-            <!-- 曾用名 -->
             t2.name_used_before LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
@@ -251,6 +249,42 @@
             #{floatingPopulationIds[${index}]}
             </foreach>
         </if>
+    </select> -->
+    <select id="listFloatingPopulation" parameterType="map" resultMap="floatingPopulationDTO">
+        SELECT
+            t1.card_expire_date,
+            t1.residence_type,
+            t1.register_date,
+            t1.registration_type,
+            t1.key_of_follow,
+            t1.card_number,
+            t1.inflow_reason,
+            t1.floating_population_id,
+            t1.base_id
+        FROM
+            gen_floating_population t1
+        WHERE
+            t1.is_delete = 0
+        <if test="keywords != null and keywords != ''">
+            AND (
+                t1.card_number LIKE CONCAT('%', #{keywords}, '%')
+            )
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND
+            LEFT(t1.register_date, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND
+            LEFT(t1.card_expire_date, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="floatingPopulationIds != null and floatingPopulationIds.size > 0">
+            AND
+            t1.floating_population_id IN
+            <foreach collection="floatingPopulationIds" index="index" open="(" separator="," close=")">
+                #{floatingPopulationIds[${index}]}
+            </foreach>
+        </if>
     </select>
 
     <!-- 流动人口统计  -->

src/main/resources/mybatis/mapper/homeperson/homeperson-mapper.xml

@@ -256,7 +256,7 @@
     </select>
 
     <!-- 留守人员列表 -->
-    <select id="listHomePerson" parameterType="map" resultMap="homePersonDTO">
+    <!-- <select id="listHomePerson" parameterType="map" resultMap="homePersonDTO">
         SELECT
             t1.healthy,
             t1.relationship_with_home_people,
@@ -292,10 +292,8 @@
             OR
             t3.id_card_number LIKE CONCAT('%', #{keywords}, '%')
             OR
-            <!-- 全名 -->
             t3.full_name LIKE CONCAT('%', #{keywords}, '%')
             OR
-            <!-- 曾用名 -->
             t3.name_used_before LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
@@ -314,6 +312,50 @@
             #{homePersonIds[${index}]}
             </foreach>
         </if>
+    </select> -->
+    <select id="listHomePerson" parameterType="map" resultMap="homePersonDTO">
+        SELECT
+            t1.healthy,
+            t1.relationship_with_home_people,
+            t1.leading_healthy,
+            t1.annual_income_family,
+            t1.home_person_type,
+            t1.difficulty,
+            t1.leading_address,
+            t1.annual_income_self,
+            t1.base_id,
+            t1.leading_phone,
+            t1.leading_card,
+            t1.help_situation,
+            t1.people_same_census,
+            t1.leading_name,
+            t1.home_person_id
+        FROM
+            gen_home_person t1
+        WHERE
+        t1.is_delete = 0
+        <if test="keywords != null and keywords != ''">
+            AND (
+            t1.leading_name LIKE CONCAT('%', #{keywords}, '%')
+            OR
+            t1.leading_card LIKE CONCAT('%', #{keywords}, '%')
+            )
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="homePersonIds != null and homePersonIds.size > 0">
+            AND
+            t1.home_person_id IN
+            <foreach collection="homePersonIds" index="index" open="(" separator="," close=")">
+                #{homePersonIds[${index}]}
+            </foreach>
+        </if>
     </select>
 
     <!-- 留守人员统计  -->