From b1cc339b40d0b44e84352bb01d48b5f948f0ffb9 Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 28 Jun 2023 20:58:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E9=9A=94?= =?UTF-8?q?=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PovertyManageController.java | 5 ++-- .../java/com/epmet/dao/PovertyCondoleDao.java | 2 +- .../java/com/epmet/dao/PovertyManageDao.java | 2 +- .../epmet/entity/PovertyCondoleEntity.java | 5 ++++ .../com/epmet/entity/PovertyManageEntity.java | 27 ++++++++++--------- .../impl/PovertyCondoleServiceImpl.java | 15 ++++++++++- .../impl/PovertyManageServiceImpl.java | 12 ++++++++- .../resources/mapper/PovertyCondoleDao.xml | 3 ++- .../resources/mapper/PovertyManageDao.xml | 4 ++- 9 files changed, 54 insertions(+), 21 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java index b27484e4bc..365b077378 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java @@ -16,7 +16,6 @@ import com.epmet.dto.PovertyManageDTO; import com.epmet.dto.form.povertyManage.PovertyManageFormDto; import com.epmet.excel.PovertyManageExcel; import com.epmet.feign.EpmetAdminOpenFeignClient; -import com.epmet.remote.EpmetUserRemoteService; import com.epmet.service.PovertyManageService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -42,8 +41,8 @@ public class PovertyManageController { @Autowired private EpmetAdminOpenFeignClient adminOpenFeignClient; - @Autowired - private EpmetUserRemoteService userRemoteService; +// @Autowired +// private EpmetUserRemoteService userRemoteService; @RequestMapping("page") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleDao.java index 9b6e5b9c04..d026bb439f 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleDao.java @@ -20,5 +20,5 @@ public interface PovertyCondoleDao extends BaseDao { List search(@Param("userName") String userName, @Param("idCard") String idCard, @Param("condoleStaff") String condoleStaff, @Param("povertyType") String povertyType, @Param("povertyStatus") String povertyStatus, @Param("content") String content, - @Param("startTime") String startTime, @Param("endTime") String endTime); + @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("orgIdPath") String orgIdPath); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyManageDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyManageDao.java index 55dfffc54b..93dacaa310 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyManageDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyManageDao.java @@ -17,7 +17,7 @@ public interface PovertyManageDao extends BaseDao { List search(@Param("userName") String userName, @Param("mobile") String mobile, @Param("idCard") String idCard, @Param("povertyType") String povertyType, - @Param("povertyStatus") Integer povertyStatus); + @Param("povertyStatus") Integer povertyStatus, @Param("orgIdPath") String orgPath); Boolean isExist(@Param("resiUserId") String resiUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleEntity.java index 25b177160e..a8f4ffcf7f 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleEntity.java @@ -55,4 +55,9 @@ public class PovertyCondoleEntity extends BaseEpmetEntity { */ private String remark; + /** + * 组织ID路径 + */ + private String orgIdPath; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyManageEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyManageEntity.java index 2d24de8d23..8552ecca2f 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyManageEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyManageEntity.java @@ -6,56 +6,59 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * - * * @author generator generator@elink-cn.com * @since v1.0.0 2023-06-16 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("poverty_manage") public class PovertyManageEntity extends BaseEpmetEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** * 居民ID */ - private String resiUserId; + private String resiUserId; /** * 组织ID */ - private String agencyId; + private String agencyId; /** * 网格ID */ - private String gridId; + private String gridId; + + /** + * 行政组织ID路径 + */ + private String orgIdPath; /** * 姓名 */ - private String userName; + private String userName; /** * 电话 */ - private String mobile; + private String mobile; /** * 身份证号码 */ - private String idCard; + private String idCard; /** * 贫困属性 */ - private String povertyType; + private String povertyType; /** * 脱贫状态 */ - private Integer povertyStatus; + private Integer povertyStatus; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleServiceImpl.java index 5a4275f3e8..ea07f41c75 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleServiceImpl.java @@ -12,8 +12,10 @@ import com.epmet.dao.PovertyCondoleDao; import com.epmet.dto.PovertyCondoleDTO; import com.epmet.dto.form.povertyManage.PovertyCondoleAttrDTO; import com.epmet.dto.form.povertyManage.PovertyCondoleFormDto; +import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.entity.PovertyCondoleAttrEntity; import com.epmet.entity.PovertyCondoleEntity; +import com.epmet.remote.EpmetUserRemoteService; import com.epmet.service.PovertyCondoleService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -40,6 +42,9 @@ import java.util.Map; public class PovertyCondoleServiceImpl extends BaseServiceImpl implements PovertyCondoleService { + @Resource + private EpmetUserRemoteService remoteService; + @Resource private PovertyCondoleAttrDao attrDao; @@ -60,8 +65,11 @@ public class PovertyCondoleServiceImpl extends BaseServiceImpl getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); + LoginUserDetailsResultDTO userDetails = remoteService.getLoginUserDetails(); + String orgIdPath = userDetails.getOrgIdPath();//社区级别的orgIdPath QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.likeRight(StringUtils.isNotBlank(orgIdPath), "ORG_ID_PATH", orgIdPath); return wrapper; } @@ -78,6 +86,9 @@ public class PovertyCondoleServiceImpl extends BaseServiceImpl search(PovertyCondoleFormDto formDto) { + LoginUserDetailsResultDTO userDetails = remoteService.getLoginUserDetails(); + String orgIdPath = userDetails.getOrgIdPath();//社区级别的orgIdPath PageInfo pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage()) .doSelectPageInfo(() -> baseDao.search(formDto.getUserName(), formDto.getIdCard(), formDto.getCondoleStaff(), formDto.getPovertyType(), - formDto.getPovertyStatus(), formDto.getContent(), formDto.getStartTime(), formDto.getEndTime())); + formDto.getPovertyStatus(), formDto.getContent(), formDto.getStartTime(), formDto.getEndTime(), orgIdPath)); return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal()); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyManageServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyManageServiceImpl.java index 32a92c3059..338e1ca4dd 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyManageServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyManageServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.dao.PovertyManageDao; import com.epmet.dto.PovertyManageDTO; import com.epmet.dto.form.povertyManage.PovertyManageFormDto; import com.epmet.entity.PovertyManageEntity; +import com.epmet.remote.EpmetUserRemoteService; import com.epmet.service.PovertyManageService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -17,6 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -29,6 +31,9 @@ import java.util.Map; @Service public class PovertyManageServiceImpl extends BaseServiceImpl implements PovertyManageService { + @Resource + private EpmetUserRemoteService remoteService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -46,8 +51,10 @@ public class PovertyManageServiceImpl extends BaseServiceImpl getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); + String orgPath = remoteService.getLoginUserDetails().getOrgIdPath(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.likeRight(StringUtils.isNotBlank(orgPath), "ORG_ID_PATH", orgPath); return wrapper; } @@ -60,7 +67,9 @@ public class PovertyManageServiceImpl extends BaseServiceImpl search(PovertyManageFormDto formDto) { + String orgPath = remoteService.getLoginUserDetails().getOrgIdPath(); PageInfo pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage()) - .doSelectPageInfo(() -> baseDao.search(formDto.getUserName(), formDto.getMobile(), formDto.getIdCard(), formDto.getPovertyType(), formDto.getPovertyStatus())); + .doSelectPageInfo(() -> baseDao.search(formDto.getUserName(), formDto.getMobile(), formDto.getIdCard(), formDto.getPovertyType(), formDto.getPovertyStatus(), orgPath)); return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal()); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyCondoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyCondoleDao.xml index ca317e853c..35b185f1e9 100755 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyCondoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyCondoleDao.xml @@ -12,6 +12,7 @@ + @@ -38,7 +39,7 @@ FROM poverty_condole pc LEFT JOIN poverty_manage pm ON pc.POVERTY_ID = pm.ID - pc.DEL_FLAG = 0 + pc.DEL_FLAG = 0 AND pc.ORG_ID_PATH LIKE concat(#{orgIdPath},'%') AND pc.CONTENT LIKE concat( '%', #{content}, '%') diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyManageDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyManageDao.xml index f7557fb0ee..bcbfe9b825 100755 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyManageDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyManageDao.xml @@ -8,6 +8,7 @@ + @@ -36,7 +37,7 @@ FROM poverty_manage pm - pm.DEL_FLAG = 0 + pm.DEL_FLAG = 0 AND pm.ORG_ID_PATH LIKE concat(#{orgIdPath}, '%') AND pm.USER_NAME LIKE concat( '%', #{userName}, '%') @@ -54,6 +55,7 @@ +