From e5ee3903edcb8072ffda1b57421d0075c52e6991 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 20 Oct 2021 17:54:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B7=BB=E5=8A=A0=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/AdminFeignClient.java | 12 ++++++++++ .../fallback/AdminFeignClientFallback.java | 6 +++++ .../impl/AcitveProductInfoServiceImpl.java | 22 +++++++++++++++++++ .../resources/mapper/AcitveProductInfoDao.xml | 8 +++++++ 4 files changed, 48 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index e25093b97..e91dd4f55 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SysSimpleDictDTO; import com.elink.esua.epdc.dto.form.PointRuleFormDTO; @@ -41,5 +42,16 @@ public interface AdminFeignClient { @GetMapping("/sys/dept/getDeptInfoByDeptIdList/{deptId}") Result> getDeptInfoByDeptIdList(@PathVariable("deptId") String deptId); + /** + * 根据部门ID获取上级所有部门信息 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author wgf + * @date 2019-11-29 + */ + @GetMapping("/sys/dept/getParentAndAllDept/{deptId}") + Result getParentAndAllDept(@PathVariable("deptId") String deptId); + } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index a0b542525..f7f72c339 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SysSimpleDictDTO; @@ -30,4 +31,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result> getDeptInfoByDeptIdList(String deptId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptInfoByDeptIdList", deptId); } + + @Override + public Result getParentAndAllDept(String depId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId); + } } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java index 1d176c0ca..fb0b874ca 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java @@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; 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.content.dto.form.ParentAndAllDeptDTO; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.QRCodeGenerator; @@ -109,6 +111,7 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { IPage page = getPage(params); + params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); List list = baseDao.getPhrasePage(params); return new PageData<>(list, page.getTotal()); } @@ -142,6 +145,16 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl alldtoResult = adminFeignClient.getParentAndAllDept(dto.getDeptId()); + ParentAndAllDeptDTO parentAndAllDeptDTO = alldtoResult.getData(); + dto.setDeptName(parentAndAllDeptDTO.getGrid()); + dto.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds()); + dto.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames()); + dto.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); + dto.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames()); + AcitveProductInfoEntity entity = ConvertUtils.sourceToTarget(dto, AcitveProductInfoEntity.class); insert(entity); // 添加权限表数据 @@ -167,6 +180,15 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl alldtoResult = adminFeignClient.getParentAndAllDept(dto.getDeptId()); + ParentAndAllDeptDTO parentAndAllDeptDTO = alldtoResult.getData(); + dto.setDeptName(parentAndAllDeptDTO.getGrid()); + dto.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds()); + dto.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames()); + dto.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); + dto.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames()); + AcitveProductInfoEntity entity = ConvertUtils.sourceToTarget(dto, AcitveProductInfoEntity.class); updateById(entity); // 逻辑删除权限表该商品数据 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml index c87cd7577..44dcf3681 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml @@ -62,8 +62,16 @@ AND DATE_FORMAT( eapi.START_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + + and find_in_set(#{deptId},eapi.ALL_DEPT_IDS) + + and eapi.DEPT_ID IN + + #{deptId} + order by eapi.UPDATED_TIME desc + update epdc_acitve_product_dept set DEL_FLAG = '1' where PRODUCT_ID = #{productId}