From ea9769f2aa7a50d15551a4dc47125043231fcbd0 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 19 Jul 2022 13:47:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EpidemicBuildingUnitServiceImpl.java | 1 - .../resources/mapper/personroom/EpidemicUnitOwnerDao.xml | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java index 5a9a9f3..01955ab 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java @@ -56,7 +56,6 @@ import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExce import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicBuildingUnitDao; import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; -import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicBuildingUnitRedis; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml index 0a1b52a..a678125 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml @@ -113,10 +113,11 @@ select un.ROOM_CODE from epidemic_unit_owner ow - left join epidemic_building_unit un on ow.UNIT_ID = un.ID and un.DEL_FLAG = '0' + left join epidemic_building_unit un on ow.UNIT_ID = un.ID where ow.DEL_FLAG = '0' + and un.DEL_FLAG = '0' and ow.ID_CARD = #{idCard} - order by ow.CREATED_TIME + order by ow.CREATED_TIME DESC limit 1 From 1a1b961c6cd39dfd7dce921119033a3d8c873aaa Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 25 Jul 2022 15:47:21 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpidemicUserInfoAuditController.java | 6 ++-- .../dao/EpidemicUserInfoAuditDao.java | 5 +++- .../service/EpidemicUserInfoAuditService.java | 4 ++- .../EpidemicUserInfoAuditServiceImpl.java | 9 +++++- .../epidemic/EpidemicUserInfoAuditDao.xml | 28 ++++++++++++++++++- 5 files changed, 45 insertions(+), 7 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java index f6f3049..ec11167 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java @@ -43,13 +43,13 @@ import java.util.Map; @RestController @RequestMapping("epidemicuserinfoaudit") public class EpidemicUserInfoAuditController { - + @Autowired private EpidemicUserInfoAuditService epidemicUserInfoAuditService; @GetMapping("page") public Result> page(@RequestParam Map params){ - PageData page = epidemicUserInfoAuditService.page(params); + PageData page = epidemicUserInfoAuditService.getPageList(params); return new Result>().ok(page); } @@ -91,4 +91,4 @@ public class EpidemicUserInfoAuditController { return new Result(); } -} \ No newline at end of file +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java index 2e54303..82f49f3 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java @@ -25,6 +25,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 疫情防控信息表 @@ -55,4 +56,6 @@ public interface EpidemicUserInfoAuditDao extends BaseDao listByUnitId(@Param("unitId") Long unitId, @Param("existIdCard") List existIdCard); -} \ No newline at end of file + + List getPageList(Map params); +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java index 57e4767..8f43b11 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java @@ -126,4 +126,6 @@ public interface EpidemicUserInfoAuditService extends BaseService getPageList(Map params); +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java index 36c1386..7037a67 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java @@ -163,4 +163,11 @@ public class EpidemicUserInfoAuditServiceImpl extends BaseServiceImpl getPageList(Map params) { + IPage page = getPage(params); + List list = baseDao.getPageList(params); + return new PageData<>(list, page.getTotal()); + } + +} diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml index 6f88f27..4249491 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml @@ -75,4 +75,30 @@ - \ No newline at end of file + + From fc623edd720711eda07c9a2c456503e4cb239899 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 26 Jul 2022 09:37:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=B6=E5=BA=AD=E6=88=90=E5=91=98=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EpidemicUserInfoServiceImpl.java | 31 +++++++++- .../epdc/vaccine/feign/AdminFeignClient.java | 58 +++++++++++++++++++ .../fallback/AdminFeignClientFallback.java | 38 ++++++++++++ 3 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/AdminFeignClient.java create mode 100644 epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/AdminFeignClientFallback.java diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index 4e2cf47..a30df47 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -45,10 +45,12 @@ import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoAuditEntity; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInoutRecordEntity; import com.elink.esua.epdc.vaccine.epidemic.service.*; +import com.elink.esua.epdc.vaccine.feign.AdminFeignClient; import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient; import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExcel; import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicBuildingUnitDao; import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicUnitOwnerService; @@ -122,6 +124,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl getWrapper(Map params) { String id = (String) params.get("id"); @@ -1660,12 +1665,13 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl().ok(dto); } + @Transactional @Override public Result addFamilyMember(FamilyMemberInfoFormDTO formDTO) { - // 获取房屋网格ID if (formDTO.getUnitId() == null) { return new Result().error("unitId不能为空"); } + // 获取房屋网格ID EpidemicBuildingUnitDetailResultDTO entity = epidemicBuildingUnitDao.selectDetailById(formDTO.getUnitId().toString()); String gridId = entity.getGridId(); // 查询父部门信息 @@ -1680,6 +1686,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(unit.getGridId()); + if (!parentAndAllDeptDTOResult.success()) { + throw new RenException("获取部门信息失败"); + } + + epidemicUserInfoAuditEntity.setDeptId(parentAndAllDeptDTOResult.getData().getGridId()); + epidemicUserInfoAuditEntity.setDeptName(parentAndAllDeptDTOResult.getData().getGrid()); + epidemicUserInfoAuditEntity.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds()); + epidemicUserInfoAuditEntity.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames()); + epidemicUserInfoAuditEntity.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds()); + epidemicUserInfoAuditEntity.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); + } + @Override public Result updateFamilyMember(FamilyMemberInfoFormDTO formDTO) { + if (formDTO.getUnitId() == null) { + return new Result().error("unitId不能为空"); + } // 需要审核 if (YesOrNoEnum.YES.value().equals(formDTO.getNeedAudit())) { EpidemicUserInfoAuditEntity epidemicUserInfoAuditEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInfoAuditEntity.class); + //组装部门信息 + setApplyDeptInfo(epidemicUserInfoAuditEntity,formDTO.getUnitId()); epidemicUserInfoAuditEntity.setAuditType(NumConstant.ONE_STR); epidemicUserInfoAuditEntity.setAuditState(NumConstant.ZERO_STR); epidemicUserInfoAuditService.insert(epidemicUserInfoAuditEntity); diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/AdminFeignClient.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/AdminFeignClient.java new file mode 100644 index 0000000..edeb6f5 --- /dev/null +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/AdminFeignClient.java @@ -0,0 +1,58 @@ +package com.elink.esua.epdc.vaccine.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; +import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO; +import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO; +import com.elink.esua.epdc.vaccine.feign.fallback.AdminFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/5 14:44 + */ +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class) +public interface AdminFeignClient { + + /** + * 根据部门ID，获取下属所有网格ID + * + * @param pid + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author yujintao + * @date 2019/9/5 14:49 + */ + @GetMapping("/sys/dept/listGridId/{pid}") + Result> listGridIdByDeptPid(@PathVariable("pid") Long pid); + + /** + * 根据部门ID获取上级所有部门信息 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author gp + * @date 2019-11-29 + */ + @GetMapping("/sys/dept/getParentAndAllDept/{deptId}") + Result getParentAndAllDept(@PathVariable("deptId") String deptId); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 获取多个字典值列表 + * @Author songyunpeng + * @Date 2020/8/31 + * @Param [sysPopulationSimpleDictFormDTO] + **/ + @PostMapping("sys/dict/listPopulationSimple") + Result> listPopulationSimple(@RequestBody SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO); + + +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/AdminFeignClientFallback.java new file mode 100644 index 0000000..151b152 --- /dev/null +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/AdminFeignClientFallback.java @@ -0,0 +1,38 @@ +package com.elink.esua.epdc.vaccine.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; +import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO; +import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO; +import com.elink.esua.epdc.vaccine.feign.AdminFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/5 14:44 + */ +@Component +public class AdminFeignClientFallback implements AdminFeignClient { + + @Override + public Result> listGridIdByDeptPid(Long pid) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listGridIdByDeptPid", pid); + } + + @Override + public Result getParentAndAllDept(String depId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId); + } + + @Override + public Result> listPopulationSimple(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listPopulationSimple", sysPopulationSimpleDictFormDTO); + } + + +} From 408aa64084b8d248f36684dc26f6ff91304ea7f2 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 26 Jul 2022 10:47:52 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feign=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EpidemicUserInfoServiceImpl.java | 3 +- .../epdc/vaccine/feign/AdminFeignClient.java | 58 ------------------- .../fallback/AdminFeignClientFallback.java | 38 ------------ 3 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/AdminFeignClient.java delete mode 100644 epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/AdminFeignClientFallback.java diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index a30df47..f9de358 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -45,7 +45,6 @@ import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoAuditEntity; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInoutRecordEntity; import com.elink.esua.epdc.vaccine.epidemic.service.*; -import com.elink.esua.epdc.vaccine.feign.AdminFeignClient; import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient; import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExcel; import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicBuildingUnitDao; @@ -125,7 +124,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl getWrapper(Map params) { diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/AdminFeignClient.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/AdminFeignClient.java deleted file mode 100644 index edeb6f5..0000000 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/AdminFeignClient.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.elink.esua.epdc.vaccine.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO; -import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO; -import com.elink.esua.epdc.vaccine.feign.fallback.AdminFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; - -/** - * @author yujintao - * @email yujintao@elink-cn.com - * @date 2019/9/5 14:44 - */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class) -public interface AdminFeignClient { - - /** - * 根据部门ID，获取下属所有网格ID - * - * @param pid - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author yujintao - * @date 2019/9/5 14:49 - */ - @GetMapping("/sys/dept/listGridId/{pid}") - Result> listGridIdByDeptPid(@PathVariable("pid") Long pid); - - /** - * 根据部门ID获取上级所有部门信息 - * - * @param deptId - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author gp - * @date 2019-11-29 - */ - @GetMapping("/sys/dept/getParentAndAllDept/{deptId}") - Result getParentAndAllDept(@PathVariable("deptId") String deptId); - - /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Description 获取多个字典值列表 - * @Author songyunpeng - * @Date 2020/8/31 - * @Param [sysPopulationSimpleDictFormDTO] - **/ - @PostMapping("sys/dict/listPopulationSimple") - Result> listPopulationSimple(@RequestBody SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO); - - -} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/AdminFeignClientFallback.java deleted file mode 100644 index 151b152..0000000 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/AdminFeignClientFallback.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.elink.esua.epdc.vaccine.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO; -import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO; -import com.elink.esua.epdc.vaccine.feign.AdminFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @author yujintao - * @email yujintao@elink-cn.com - * @date 2019/9/5 14:44 - */ -@Component -public class AdminFeignClientFallback implements AdminFeignClient { - - @Override - public Result> listGridIdByDeptPid(Long pid) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listGridIdByDeptPid", pid); - } - - @Override - public Result getParentAndAllDept(String depId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId); - } - - @Override - public Result> listPopulationSimple(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listPopulationSimple", sysPopulationSimpleDictFormDTO); - } - - -} From 6272d9811be1f928633ce4ea4bf6d718dc0f9f9b Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 27 Jul 2022 10:44:47 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EpidemicUserInfoAuditServiceImpl.java | 12 ++++++++++++ .../mapper/epidemic/EpidemicUserInfoAuditDao.xml | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java index 7037a67..c65be82 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java @@ -22,7 +22,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; +import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO; import com.elink.esua.epdc.dto.epidemic.result.EpidemicUserInfoAuditResultDTO; @@ -165,6 +169,14 @@ public class EpidemicUserInfoAuditServiceImpl extends BaseServiceImpl getPageList(Map params) { + UserDetail user = SecurityUser.getUser(); + if (user == null) { + throw new RenException("用户未登录"); + } + // 街道和超管有权查看所有数据 + if (NumConstant.ZERO == user.getSuperAdmin() && !user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)) { + params.put("deptIdList", user.getDeptIdList()); + } IPage page = getPage(params); List list = baseDao.getPageList(params); return new PageData<>(list, page.getTotal()); diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml index 4249491..83616b5 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml @@ -99,6 +99,12 @@ and find_in_set(#{gridId},ALL_DEPT_IDS) + + and dept_id in + + #{id} + + order by CREATED_TIME desc From 47f4ad95ff8832c63f2b1cc46362f82e7a2f932b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Aug 2022 10:08:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AF=BC=E5=87=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EpidemicUserInfoExportServer.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java index bc947d3..22a965b 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java @@ -41,13 +41,14 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer { String grids = (String) params.get("deptIdList"); String agencyList = (String) params.get("agencyList"); - if(StringUtils.isNotBlank(grids)){ + if (StringUtils.isNotBlank(grids)) { List gridList = Arrays.asList(grids.split(",")); - params.put("gridList",gridList); + params.put("gridList", gridList); } - if(StringUtils.isNotBlank(agencyList)){ + params.put("deptIdList", null); + if (StringUtils.isNotBlank(agencyList)) { List agencyIdList = Arrays.asList(agencyList.split(",")); - params.put("agencyIdList",agencyIdList); + params.put("agencyIdList", agencyIdList); } UserDetail user = SecurityUser.getUser(); if (user == null) { @@ -59,8 +60,8 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer { } List recordList = epidemicUserInfoDao.getEpidemicUserRecordList(params); - params.put("deptIdList",null); - params.put("agencyList",null); + params.put("deptIdList", null); + params.put("agencyList", null); List targetList = new ArrayList<>(); if (CollUtil.isNotEmpty(recordList)) {