From d23f7478ae380d369eb42ffa64238ee3d694d6f0 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 19 Nov 2021 16:51:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BA=BF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E4=BB=A5=E5=8F=8Abug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsInstitutionController.java | 6 ++++++ .../sarInstitution/dao/TsInstitutionDao.java | 2 ++ .../service/ITsInstitutionService.java | 2 ++ .../service/impl/TsInstitutionServiceImpl.java | 7 +++++++ .../SarStandProjectLibraryController.java | 5 +++-- .../dao/SarStandProjectLibraryDao.java | 1 + .../sarStandProjectLibrary/dao/standDTO.java | 11 +++++++++++ .../service/SarStandProjectLibraryService.java | 3 ++- .../impl/SarStandProjectLibraryServiceImpl.java | 14 ++++++++++++-- .../sarInstitution/TsInstitutionMapper.xml | 16 ++++++++++++++++ 10 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java 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 b3887516..606e6e98 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 @@ -86,6 +86,12 @@ public class TsInstitutionController extends BaseController { return tsInstitutionService.getNext(institutionId,userName); } + @ApiOperation("获得下一级的部门和人员") + @GetMapping("/getNextById") + public List getNextById(String ids){ + return tsInstitutionService.getNextById(ids); + } + @ApiOperation("获得第一级部门目录") @GetMapping("/getFirstInstitution") public List getFirstInstitution(){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index bc0b5780..619e6efd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -29,6 +29,8 @@ public interface TsInstitutionDao extends BaseMapper { */ List selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName); + List selectNextUserByIds(@Param("ids") List ids); + List selectTreeByIds(@Param("rootIds") List rootIds); 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 48d24c8b..892228b0 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 @@ -37,6 +37,8 @@ public interface ITsInstitutionService extends IService { */ public List getNext(String institutionId,String userName); + public List getNextById(String ids); + /** * 获得第一级的部门 * @return 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 ce821462..5f117ceb 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 @@ -216,6 +216,13 @@ public class TsInstitutionServiceImpl extends ServiceImpl getNextById(String ids){ + List strings=new ArrayList<>(Arrays.asList(ids.split(","))); + List tsUsers=tsInstitutionDao.selectNextUserByIds(strings); + + return tsUsers; + } + public List getFirst(){ //查询第一层机构 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 077f5e0f..a2c3cd93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto; @@ -100,8 +101,8 @@ public class SarStandProjectLibraryController extends BaseController list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize); + public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize, standDTO standDTO){ + IPage list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize, standDTO); // 创建一个新的list集合，用于存储去重后的元素 List listTemp = new ArrayList(); for (SarStandProjectLibrary sarStandProjectLibrary:list1.getRecords()){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index eff55660..73a61e1c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -30,4 +30,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper getAllStand(); List updateByProjectId(@Param("id")String id, @Param("version")String version); void deleteByProjectId(@Param("projectId")String projectId); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java new file mode 100644 index 00000000..a5e5ea27 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.sarStandProjectLibrary.dao; + +import lombok.Data; + +@Data +public class standDTO { + + private String uname; + + private String productLine; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index ccee2c44..e1487e33 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandProjectLibrary.service; +import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,7 +18,7 @@ public interface SarStandProjectLibraryService { List queryNotMaintenanceProjectsolostar(String type); Map solostar(); List queryById(String id); - IPage queryProjectManager(int current, int pageSize); + IPage queryProjectManager(int current, int pageSize, standDTO standDTO); List queryByProductLine(String productLine); List queryStandId(String standId); IPage queryStandInfo(int current, int pageSize, String standId, String cars); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 2553c394..ef5124ef 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; import com.adc.da.ocr.util.UUIDUtils; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; +import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; @@ -260,11 +261,20 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { + public IPage queryProjectManager(int current, int pageSize, standDTO standDTO) { + StringBuilder stringBuilder=new StringBuilder(); + stringBuilder.append("where 1=1 "); + if (null!=standDTO.getUname() && !"".equals(standDTO.getUname())){ + stringBuilder.append("and s.NAME like '%"+standDTO.getUname()+"%' "); + } + if (null!=standDTO.getProductLine() && !"".equals(standDTO.getProductLine())){ + stringBuilder.append("and sar_stand_project_library.product_line like '%"+standDTO.getProductLine()+"%' "); + } + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("product_line","s.user_id as projectManager","s.NAME AS uName"); wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" + - " and sar_stand_project_library.product_line IS not NULL"); + " and sar_stand_project_library.product_line IS not NULL "+stringBuilder.toString()); Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index aedae23d..d466c37e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -48,6 +48,22 @@ + +