From 5f9f16253565ccdbb230a0a80b7a455fe16ae127 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 21 Jan 2022 14:48:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 11 +++-- .../dao/SarStandProjectLibraryDao.java | 6 ++- .../SarStandProjectLibraryService.java | 4 +- .../SarStandProjectLibraryServiceImpl.java | 24 ++++++++-- .../SarStandProjectLibraryMapper.xml | 44 +++++++++++++++++++ 5 files changed, 77 insertions(+), 12 deletions(-) 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 0cd08aa5..e6e77371 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 @@ -346,14 +346,17 @@ public class SarStandProjectLibraryController extends BaseController selectListByids(@Param("ids") List ids); - List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + List queryProjectGroup(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + Integer queryProjectGroupCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); - List queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List strings); + List queryProjects(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List strings); + Integer queryProjectsCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List strings); } 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 72f916ab..84f5436d 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 @@ -29,8 +29,8 @@ public interface SarStandProjectLibraryService { void batchInsertAdd(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); public Head AnalysisJsonAndStorage(String jsonStr); - public List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + public IPage queryProjectGroup(@Param("current")int current,@Param("size")int size, @Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); - public List queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + public IPage queryProjects(@Param("current")int current,@Param("size")int size, @Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); } 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 63c7cddc..87ddfb1c 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 @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -129,12 +130,19 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) { - return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary); + public IPage queryProjectGroup(int current,int size,SarStandProjectLibrary sarStandProjectLibrary) { + List sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjectGroup(current,size,sarStandProjectLibrary); + Integer total=sarStandProjectLibraryDao.queryProjectGroupCount(sarStandProjectLibrary); + Page page=new Page<>(); + page.setRecords(sarStandProjectLibraries); + page.setTotal(total); + page.setCurrent(current); + page.setSize(size); + return page; } @Override - public List queryProjects(SarStandProjectLibrary sarStandProjectLibrary) { + public IPage queryProjects(int current,int size, SarStandProjectLibrary sarStandProjectLibrary) { List ids=new ArrayList<>(); if (null!=sarStandProjectLibrary.getProjectGroup() && !"".equals(sarStandProjectLibrary.getProjectGroup())){ if (sarStandProjectLibrary.getProjectGroup().contains(",")){ @@ -143,7 +151,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl sarStandProjectLibraryIPage=new Page<>(); + List sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjects(current,size,sarStandProjectLibrary,ids); + Integer total=sarStandProjectLibraryDao.queryProjectsCount(sarStandProjectLibrary,ids); + sarStandProjectLibraryIPage.setTotal(total); + sarStandProjectLibraryIPage.setCurrent(current); + sarStandProjectLibraryIPage.setSize(size); + sarStandProjectLibraryIPage.setRecords(sarStandProjectLibraries); + + return sarStandProjectLibraryIPage; } @Override diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 7350546f..b3c44c53 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -381,6 +381,24 @@ and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName} + limit ${(current-1) * size},${size} + + + + From 12ad84d7d64d6d5db1b0498170f1223b4b37ca02 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 21 Jan 2022 15:49:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=96=B0=E6=94=B9?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/common/ActDefineStartMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 2cbd6614..59408875 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -18,7 +18,7 @@ public class ActDefineStartMap { map.put("2","standardSurveyWorkFlow"); map.put("3","StandAskForOpinion"); map.put("4","standardregulatoryinventory"); - map.put("5","projectEvaluationProcess"); + map.put("5","projectEvaluationNewProcess"); map.put("6","Projectcomplianceassessment"); From 5d0df6d02cb195219a1b16c670f7649cafcbf624 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 21 Jan 2022 18:54:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsInstitutionController.java | 11 +++++ .../adc/da/slrs/sarUser/dao/TsUserDao.java | 4 ++ .../slrs/sarUser/service/ITsUserService.java | 2 + .../service/impl/TsUserServiceImpl.java | 42 ++++++++++++++++++ .../mybatis/mapper/sarUser/TsUserMapper.xml | 43 +++++++++++++++++++ 5 files changed, 102 insertions(+) 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 9028d757..1341f25c 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 @@ -73,6 +73,17 @@ public class TsInstitutionController extends BaseController { return Result.success(tsUserIPage); } + /** + * 查询机构下所有的机构人员 + * @return ResponseMessage> + */ + @ApiOperation("查询机构的人员") + @PostMapping("/userUnderInstitution") + public ResponseMessage> userUnderInstitution(TsUser tsUser){ + + return Result.success(tsUserService.getAllUsers(tsUser)); + } + @ApiOperation("导入机构数据") @PostMapping("/import") public ResponseMessage importInstitution() throws Exception { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java index d3a8ad84..1bef85d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java @@ -49,7 +49,11 @@ public interface TsUserDao extends BaseMapper { */ List getUserAndPositionPage(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser); + List userUnderInstitution(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser,@Param("ids") List ids); + Integer getUserAndPositionCount(@Param("TsUser") TsUser tsUser); + + Integer userUnderInstitutionCount(@Param("TsUser") TsUser tsUser,@Param("ids") List ids); /** * 通过岗位Id列表查询用户ID列表 * @param positionIds：岗位ID列表 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 9e33e87e..667438d8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -83,4 +83,6 @@ public interface ITsUserService extends IService { List selectByName(String name); List selectNameById(List strings,String type); + + IPage getAllUsers(TsUser tsUser); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index d3298b95..83752721 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarUser.service.impl; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; +import com.adc.da.slrs.sarInstitution.entity.TsInstitution; +import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarPosition.dao.TsPositionDao; @@ -47,6 +49,8 @@ public class TsUserServiceImpl extends ServiceImpl implements @Autowired private TsUserDao tsUserDao; @Autowired + private ITsUserService tsUserService; + @Autowired private ITsPositionService tsPositionService; @Autowired @Lazy @@ -59,6 +63,8 @@ public class TsUserServiceImpl extends ServiceImpl implements private SyncUserService syncUserService; @Autowired private TsPositionDao tsPositionDao; + @Autowired + private ITsInstitutionService tsInstitutionService; public void deleteUser(){ @@ -364,4 +370,40 @@ public class TsUserServiceImpl extends ServiceImpl implements }); return result; } + + @Override + public IPage getAllUsers(TsUser tsUser) { + List ids=new ArrayList<>(); + ids.add(tsUser.getInstitutionId()); + List middle=new ArrayList<>(); + middle.addAll(ids); + boolean flag=true; + while (flag){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.in("parent_id",middle); + List tsmiddle=tsInstitutionService.list(queryWrapper); + if (tsmiddle.size()>0){ + tsmiddle.forEach(tsInstitution -> { + middle.add(tsInstitution.getId()); + }); + middle.removeAll(ids); + ids.addAll(middle); + }else { + tsmiddle.forEach(tsInstitution -> { + middle.add(tsInstitution.getId()); + }); + middle.removeAll(ids); + ids.addAll(middle); + flag=false; + } + } + Page tsUserPage = new Page<>(); + tsUserPage.setCurrent(tsUser.getCurrent()); + tsUserPage.setSize(tsUser.getSize()); + tsUserPage.setRecords(tsUserDao.userUnderInstitution((tsUser.getCurrent()-1)*tsUser.getSize(),tsUser.getSize(),tsUser,ids)); + tsUserPage.setTotal(tsUserDao.userUnderInstitutionCount(tsUser,ids)); + return tsUserPage; + } + + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 47413212..0a403363 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -48,6 +48,49 @@ limit #{start},#{end} + + + +