diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java index 2bd00580..78500226 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java @@ -135,12 +135,12 @@ public class GroupController { return JsonResponse.ok(); } - @PostMapping("/member/del") + @PostMapping("/config/add") public JsonResponse configAdd(@RequestBody @Validated GroupDto.ConfigAdd dto) { return JsonResponse.ok(ktsGroupService.configAdd(dto)); } - @PostMapping("/config/add") + @PostMapping("/config/query") public JsonResponse configQuery() { return JsonResponse.ok(ktsGroupService.configQuery()); } diff --git a/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java b/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java index 388ff4aa..fc1c9236 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java +++ b/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java @@ -25,6 +25,8 @@ public class GroupDto { private Byte ktGroupStatus; @ApiModelProperty("课题组名称") private String ktGroupName; + private Byte planStatus; + private Byte developStatus; } @Data diff --git a/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java b/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java index 0cc471ff..8a069742 100644 --- a/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java +++ b/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java @@ -71,6 +71,14 @@ public class GroupVO { private Byte developStatus; private List childrenList; + + private Integer planTotal; + + private Long planIng; + + private Integer cgTotal; + + private Long cgIng; } @Data diff --git a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java index 512a5078..53e374ff 100644 --- a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java @@ -59,7 +59,28 @@ public class KtsGroupServiceImpl implements KtsGroupService { @Override public List queryGroupList(GroupDto.Query query) { - return ktsGroupDao.queryGroupList(query); + List groupList = ktsGroupDao.queryGroupList(query); + if (CollUtil.isNotEmpty(groupList)) { + for (GroupVO.Result result : groupList) { + //查询内容 + KtResearchContentExample ktResearchContentExample = new KtResearchContentExample(); + ktResearchContentExample.createCriteria().andKtGroupIdEqualTo(result.getId()).andDelFlagEqualTo((byte) 0); + List ktResearchContents = ktResearchContentMapper.selectByExample(ktResearchContentExample); + if (CollUtil.isNotEmpty(ktResearchContents)) { + result.setPlanTotal(ktResearchContents.size()); + result.setPlanIng(ktResearchContents.stream().filter(ktResearchContent -> ktResearchContent.getStatus() == 1).count()); + } + //查询成果 + KtExpectedOutcomesExample ktExpectedOutcomesExample = new KtExpectedOutcomesExample(); + ktExpectedOutcomesExample.createCriteria().andKtGroupIdEqualTo(result.getId()).andDelFlagEqualTo((byte) 0); + List ktExpectedOutcomes = ktExpectedOutcomesMapper.selectByExample(ktExpectedOutcomesExample); + if (CollUtil.isNotEmpty(ktExpectedOutcomes)) { + result.setCgTotal(ktExpectedOutcomes.size()); + result.setCgIng(ktExpectedOutcomes.stream().filter(ktExpectedOutcomes1 -> ktExpectedOutcomes1.getStatus() == 1).count()); + } + } + } + return groupList; } @Override diff --git a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml index b779b83e..3bd14a1c 100644 --- a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml +++ b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml @@ -36,6 +36,12 @@ and g.kt_group_name like concat('%',#{dto.ktGroupName},'%') + + and g.plan_status = #{dto.planStatus} + + + and g.develop_status = #{dto.developStatus} + group by g.id order by g.parent_kt_id,g.id