From f4301388a5c6d717a130e2d703ae082d029c0dae Mon Sep 17 00:00:00 2001 From: ccsens_zhengzhichuan Date: Fri, 12 Dec 2025 08:33:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=91=98=E7=BB=9F=E8=AE=A1=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/project/GroupController.java | 4 ++ .../system/domain/vo/ClientPrjProjInfoVo.java | 32 +++++++-------- .../research/system/domain/vo/GroupVO.java | 34 ++++++++++++++++ .../system/persist/dao/KtsGroupDao.java | 6 +++ .../system/service/KtsGroupService.java | 2 + .../service/impl/KtsGroupServiceImpl.java | 13 ++++++ .../main/resources/mapper/dao/KtsGroupDao.xml | 40 +++++++++++++++++++ 7 files changed, 115 insertions(+), 16 deletions(-) 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 330ef44b..44bdee5f 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 @@ -165,6 +165,10 @@ public class GroupController { return JsonResponse.ok(ktsGroupService.detailAdd(dto)); } + @PostMapping("/statistics") + public JsonResponse statistics(){ + return JsonResponse.ok(ktsGroupService.statistics()); + } private void aduit(Long memberId) throws Exception { //1.流程初始化表单 diff --git a/research-system/src/main/java/com/research/system/domain/vo/ClientPrjProjInfoVo.java b/research-system/src/main/java/com/research/system/domain/vo/ClientPrjProjInfoVo.java index 81eff7be..da89c1c9 100644 --- a/research-system/src/main/java/com/research/system/domain/vo/ClientPrjProjInfoVo.java +++ b/research-system/src/main/java/com/research/system/domain/vo/ClientPrjProjInfoVo.java @@ -162,14 +162,14 @@ public class ClientPrjProjInfoVo { @Data public static class Jdtj { - private Integer lwTotal;//论文应发表数量 - private Integer lwNum;//论文已发表 - private Integer zlTotal;//专利应发表数量 - private Integer zlNum;//专利已发表 - private Integer gccTotal;//高层次科技人才应数量 - private Integer gccNum;//高层次人才已发表 - private Integer rcTotal;//人才数量 - private Integer rcNum;//已培养数量 + private int lwTotal;//论文应发表数量 + private int lwNum;//论文已发表 + private int zlTotal;//专利应发表数量 + private int zlNum;//专利已发表 + private int gccTotal;//高层次科技人才应数量 + private int gccNum;//高层次人才已发表 + private int rcTotal;//人才数量 + private int rcNum;//已培养数量 private List jdtjList; } @@ -178,14 +178,14 @@ public class ClientPrjProjInfoVo { private Long id; private String ktGroupName; private String orgName; - private Integer lwTotal;//论文应发表数量 - private Integer lwNum;//论文已发表 - private Integer zlTotal;//专利应发表数量 - private Integer zlNum;//专利已发表 - private Integer gccTotal;//高层次科技人才应数量 - private Integer gccNum;//高层次人才已发表 - private Integer rcTotal;//人才数量 - private Integer rcNum;//已培养数量 + private int lwTotal;//论文应发表数量 + private int lwNum;//论文已发表 + private int zlTotal;//专利应发表数量 + private int zlNum;//专利已发表 + private int gccTotal;//高层次科技人才应数量 + private int gccNum;//高层次人才已发表 + private int rcTotal;//人才数量 + private int rcNum;//已培养数量 } @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 4aed487d..aecc24c8 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 @@ -221,4 +221,38 @@ public class GroupVO { } } + @Data + public static class Statistics { + private Integer total; + private List memberList; + private List zcList; + private List xlList; + + + @Data + public static class Member{ + private Long orgId; + private String orgName; + private Integer num; + } + + @Data + public static class Zc{ + private Long orgId; + private String orgName; + private Integer js;//教授 + private Integer fjs;//副教授 + private Integer zgjs;//主管技师 + } + + @Data + public static class Xl{ + private Long orgId; + private String orgName; + private Integer bsh;//博士后 + private Integer bs;//博士 + private Integer ss;//硕士 + } + } + } diff --git a/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java b/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java index 8db076e1..f7ada5b7 100644 --- a/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java +++ b/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java @@ -24,4 +24,10 @@ public interface KtsGroupDao { List jhzt(); List kzzt(); + + List queryMemberStatistics(); + + List queryZcStatistics(); + + List queryXlStatistics(); } diff --git a/research-system/src/main/java/com/research/system/service/KtsGroupService.java b/research-system/src/main/java/com/research/system/service/KtsGroupService.java index b78b7de3..08fa8eaa 100644 --- a/research-system/src/main/java/com/research/system/service/KtsGroupService.java +++ b/research-system/src/main/java/com/research/system/service/KtsGroupService.java @@ -55,4 +55,6 @@ public interface KtsGroupService { Integer detailAdd(GroupDto.DetailAdd dto); + + GroupVO.Statistics statistics(); } 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 2fe4172e..801b3c64 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 @@ -433,5 +433,18 @@ public class KtsGroupServiceImpl implements KtsGroupService { return null; } + @Override + public GroupVO.Statistics statistics() { + GroupVO.Statistics statistics = new GroupVO.Statistics(); + List members = ktsGroupDao.queryMemberStatistics(); + statistics.setMemberList(members); + statistics.setZcList(ktsGroupDao.queryZcStatistics()); + statistics.setXlList(ktsGroupDao.queryXlStatistics()); + if (CollUtil.isNotEmpty(members)) { + statistics.setTotal(members.stream().map(GroupVO.Statistics.Member::getNum).mapToInt(Integer::intValue).sum()); + } + return statistics; + } + } diff --git a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml index 3bd14a1c..dc44306b 100644 --- a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml +++ b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml @@ -144,4 +144,44 @@ where o.del_flag = 0 group by o.id + + + + + +