java/zhihuishenqu.git

			@@ -55,4 +55,7 @@
			@ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
			private Long userId;

			@ApiModelProperty(value = "身份证号码", hidden = true, example = "1")
			private String cardNo;

			}

			@@ -1094,7 +1094,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},'%') " +

			@@ -55,6 +55,7 @@
			import com.panzhihua.service_community.service.ComMngPopulationService;
			import com.panzhihua.service_community.service.ComMngVillageService;
			import com.panzhihua.service_community.service.EventResourceService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;
			@@ -71,6 +72,7 @@
			/**
			* 实有人口Service实现类
			*/
			@Slf4j
			@Service
			public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO> implements ComMngPopulationService {
			@Resource
			@@ -1727,6 +1729,14 @@
			*/
			@Override
			public R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO){
			if(StringUtils.isNotEmpty(populationListDTO.getKeyWord())){
			try {
			populationListDTO.setCardNo(AESUtil.encrypt128(populationListDTO.getKeyWord(),aesKey));
			}catch (Exception e){
			log.error("转换身份证号码失败");
			}
			}

			IPage<ComMngPopulationListVO> populationListIPage = this.baseMapper.getGridPopulationAdminList(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
			if(!populationListIPage.getRecords().isEmpty()){
			populationListIPage.getRecords().forEach(population -> {

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationListDTO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史