From c22104afab7b96f03f66f340f16b38240f5d84aa Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 11 Apr 2022 16:22:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsInstitutionController.java | 3 ++- .../service/ITsInstitutionService.java | 3 ++- .../service/impl/TsInstitutionServiceImpl.java | 10 +++++----- .../controller/ProductDeptIssueController.java | 1 + .../dao/SarFileSplitMenuEODao.java | 2 ++ .../service/SarFileSplitMenuEOService.java | 2 ++ .../impl/SarFileSplitItemsEOServiceImpl.java | 2 +- .../impl/SarFileSplitMenuEOServiceImpl.java | 17 +++++++++++++++++ .../standardSplit/SarFileSplitMenuEOMapper.xml | 5 +++++ 9 files changed, 37 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index 1341f25c..11557a38 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarInstitution.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarInstitution.entity.TsInstitution; +import com.adc.da.slrs.sarInstitution.entity.TsUserVO; import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService; import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.entity.TsUser; @@ -105,7 +106,7 @@ public class TsInstitutionController extends BaseController { @ApiOperation("获得下一级的部门和人员") @GetMapping("/getNextById") - public List getNextById(String ids){ + public List getNextById(String ids){ return tsInstitutionService.getNextById(ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index 92409ed4..2fefaaf6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarInstitution.service; import com.adc.da.slrs.sarInstitution.entity.TsInstitution; +import com.adc.da.slrs.sarInstitution.entity.TsUserVO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -39,7 +40,7 @@ public interface ITsInstitutionService extends IService { public List getInstitutionIdToDept(String institutionIds,String userName); - public List getNextById(String ids); + public List getNextById(String ids); /** * 获得第一级的部门 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 0a819b65..caa2a30f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -226,19 +226,19 @@ public class TsInstitutionServiceImpl extends ServiceImpl getNextById(String ids){ + public List getNextById(String ids){ List strings=new ArrayList<>(Arrays.asList(ids.split(","))); List tsUsers=tsInstitutionDao.selectNextUserByIds(strings); - List res=new ArrayList<>(); + List res=new ArrayList<>(); if (null!=tsUsers && tsUsers.size()>0){ Map middle=new HashMap<>(); for (TsUserVO u:tsUsers) { middle.put(u.getId(),u); } strings.forEach(s -> { - TsInstitution ins=new TsInstitution(); - BeanUtils.copyProperties(middle.get(s),ins); - res.add(ins); +// TsInstitution ins=new TsInstitution(); +// BeanUtils.copyProperties(middle.get(s),ins); + res.add(middle.get(s)); }); } return res; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java index a74378b2..2153a48b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java @@ -19,6 +19,7 @@ import java.util.Arrays; import java.util.List; @Controller +@RestController @RequestMapping("/api/sarStandUnqualified/productDeptIssue") @Api(tags = "产品规划部重点问题项管控") public class ProductDeptIssueController { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java index 9ad86e6c..753cba57 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java @@ -33,6 +33,8 @@ public interface SarFileSplitMenuEODao extends BaseMapper { List getChild(@Param("id") String id); + List getChildData(@Param("id") String id); + int getMaxDisplayByid(@Param("id") String id); int getChildrenCountByParentId(@Param("id") String id); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java index 84ec8397..193d4cbe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java @@ -30,4 +30,6 @@ public interface SarFileSplitMenuEOService { int copyMenuNotChildren(SarFileSplitItemsEO sarFileSplitItemsEO); String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO); + + List getChildData(String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 9627961f..725cf34f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -273,7 +273,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic if (getMenuList != null && !getMenuList.isEmpty()) { for(SarFileSplitItemsEO splitItemsEO : getMenuList){ menuIdList.add(splitItemsEO.getMenuId()); - List menuList = sarFileSplitMenuEODao.getChild(splitItemsEO.getMenuId()); + List menuList = sarFileSplitMenuEOService.getChildData(splitItemsEO.getMenuId()); menuIdList.addAll(menuList); } if(!menuIdList.isEmpty()){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java index 01f0771e..4000382a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -6,6 +6,7 @@ import com.adc.da.slrs.standardSplit.entity.*; import com.adc.da.slrs.standardSplit.service.SarFileSplitMenuEOService; import com.adc.da.sys.util.LoginUserUtil; import com.adc.da.sys.util.UUIDUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -451,4 +452,20 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService }*/ return sarFileSplitMenuEO.getId(); } + + @Override + public List getChildData(String id) { + List res=new ArrayList<>(); + return dealData(id,res); + } + + private List dealData(String id ,List res){ + List strings = SarFileSplitMenuEODao.getChildData(id); + res.addAll(strings); + if (null!=strings && strings.size()>0){ + return this.dealData(StringUtils.join(strings,","),res); + }else { + return res; + } + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitMenuEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitMenuEOMapper.xml index ebe12ee9..19beef94 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitMenuEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitMenuEOMapper.xml @@ -294,6 +294,11 @@ WHERE FIND_IN_SET(n.id, t.pids) + +