springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageInputUserDTO.java
@@ -27,10 +27,10 @@ private String areaName; @ApiModelProperty(value = "分页-当前页数",example = "1") private Long pageNum; private Long pageNum = 1L; @ApiModelProperty(value = "分页-每页记录数",example = "10") private Long pageSize; private Long pageSize = 10L; @ApiModelProperty("标签") private String tags; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java
@@ -1,6 +1,10 @@ package com.panzhihua.common.model.vos.user; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField; import com.panzhihua.common.model.helper.sensitive.Sensitive; import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy; import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -17,6 +21,7 @@ */ @Data @ApiModel(value = "居民数据信息") @EncryptDecryptClass public class InputUserInfoVO implements Serializable { @ApiModelProperty("用户编号") @@ -45,6 +50,8 @@ private Integer maritalStatus; @ApiModelProperty("联系方式") @EncryptDecryptField @Sensitive(strategy = SensitiveStrategy.PHONE) private String phone; @ApiModelProperty("文化程度") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -9,6 +9,7 @@ import com.panzhihua.common.model.dtos.shop.*; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.dtos.user.PageInputUserDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; @@ -2162,4 +2163,12 @@ */ @PostMapping("deletemicrowish") R deletemicrowish(@RequestParam("id")Long id); /** * 基础数据》特殊群体》分页查询 * @param pageInputUserDTO * @return */ @PostMapping("common/data/special/page") R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -613,7 +613,7 @@ * @return */ @PostMapping("common/data/special/tags/page") R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO); R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO); /** * 新增或修改特殊群体标签 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
@@ -336,7 +336,7 @@ public R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) { Long communityId = this.getCommunityId(); pageInputUserDTO.setCommunityId(communityId); return userService.specialInputUser(pageInputUserDTO); return communityService.specialInputUser(pageInputUserDTO); } @ApiOperation(value = "特殊群体/删除", response = InputUserInfoVO.class) @@ -402,7 +402,7 @@ @ApiOperation(value = "特殊群体/分页查询标签列表", response = ComMngTagVO.class) @PostMapping("/special/tags/page") public R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO) { public R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO) { Long communityId = this.getCommunityId(); comMngUserTagDTO.setCommunityId(communityId); return userService.specialInputUserTags(comMngUserTagDTO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.user.PageInputUserDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.service_community.service.*; @@ -350,4 +351,14 @@ R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO,@RequestParam("communityId") Long communityId){ return comMngPopulationService.editPopulation(editComMngPopulationVO, communityId); } /** * 分页查询特殊群体 * @param pageInputUserDTO 请求参数 * @return 特殊群体列表 */ @PostMapping("/special/page") public R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) { return comMngPopulationService.specialInputUser(pageInputUserDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO; import com.panzhihua.common.model.dtos.user.PageInputUserDTO; import com.panzhihua.common.model.vos.community.ComActMessageVO; import com.panzhihua.common.model.vos.community.ComMngPopulationVO; import com.panzhihua.common.model.vos.community.PageComActMessageVO; import com.panzhihua.common.model.vos.user.ComHouseMemberVo; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.InputUserInfoVO; import com.panzhihua.service_community.model.dos.ComMngPopulationDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -168,7 +170,21 @@ "</script>") IPage<ComMngPopulationVO> pagePopulation(Page page, @Param("comMngPopulationVO") ComMngPopulationDTO comMngPopulationVO); @Select("<script> " + "select cmp.id,cmv.`alley` as areaName,cmp.`name`,cmp.phone,cmp.label as tags,cmp.create_at from com_mng_population as cmp " + "left join com_mng_village as cmv on cmv.village_id = cmp.village_id where cmp.act_id = #{pageInputUserDTO.communityId} " + "<if test='pageInputUserDTO.name != null and pageInputUserDTO.name != ""'>" + " AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%') " + " </if> " + "<if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName != ""'>" + " AND cmv.`alley` LIKE concat(#{pageInputUserDTO.areaName},'%') " + " </if> " + "<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags != ""'>" + " AND cmp.label LIKE concat(#{pageInputUserDTO.tags},'%') " + " </if> " + " order by cmp.create_at desc " + "</script>") IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO; import com.panzhihua.common.model.dtos.user.PageInputUserDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationVO; @@ -106,4 +107,11 @@ * @return */ R editPopulation(EditComMngPopulationVO editComMngPopulationVO, Long communityId); /** * 分页查询特殊群体 * @param pageInputUserDTO 请求参数 * @return 特殊群体列表 */ R specialInputUser(PageInputUserDTO pageInputUserDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -10,12 +10,14 @@ import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO; import com.panzhihua.common.model.dtos.user.PageInputUserDTO; import com.panzhihua.common.model.helper.AESUtil; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.helper.AESUtil; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.user.ComHouseMemberVo; import com.panzhihua.common.model.vos.user.InputUserInfoVO; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComActVillageDAO; import com.panzhihua.service_community.dao.ComMngPopulationDAO; @@ -232,6 +234,9 @@ comMngPopulationDO.setActId(comActDO.getCommunityId()); comMngPopulationDO.setStreetId(comActDO.getStreetId()); comMngPopulationDO.setLabel(Joiner.on(",").join(userTag)); if(!userTag.isEmpty()){ //特殊群体插入 } comMngPopulationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDOList.add(comMngPopulationDO); index++; @@ -424,4 +429,11 @@ this.updateById(populationDO); return R.ok(); } @Override public R specialInputUser(PageInputUserDTO pageInputUserDTO){ IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(new Page<>(pageInputUserDTO.getPageNum() ,pageInputUserDTO.getPageSize()), pageInputUserDTO); return R.ok(iPage); } }
