From ce5b899c4da69e4ec95a00a0491298643bd317fb Mon Sep 17 00:00:00 2001 From: ccsens_zhengzhichuan Date: Thu, 11 Dec 2025 15:42:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=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/CooperatorController.java | 5 +++ .../system/domain/vo/ClientPrjProjInfoVo.java | 44 +++++++++++++++---- .../persist/dao/ClientPrjProOrgDao.java | 2 + .../system/service/CooperatorService.java | 2 + .../service/impl/CooperatorServiceImpl.java | 19 ++++++++ .../mapper/dao/ClientPrjProOrgDao.xml | 19 ++++++++ 6 files changed, 83 insertions(+), 8 deletions(-) diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/CooperatorController.java b/research-admin/src/main/java/com/research/web/controller/client/project/CooperatorController.java index 2ff3c36d..cd422772 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/project/CooperatorController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/project/CooperatorController.java @@ -82,4 +82,9 @@ public class CooperatorController { public JsonResponse statistics(){ return JsonResponse.ok(cooperatorService.statistics()); } + + @PostMapping("/jdtjStatistics") + public JsonResponse jdtjStatistics(){ + return JsonResponse.ok(cooperatorService.jdtjStatistics()); + } } 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 fe429c85..81eff7be 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 @@ -17,7 +17,7 @@ import java.util.List; public class ClientPrjProjInfoVo { @Data - public static class Result{ + public static class Result { private Long id; private Long tenantId; @@ -71,7 +71,7 @@ public class ClientPrjProjInfoVo { } @Data - public static class OrgVo{ + public static class OrgVo { private Long id; private String title; @@ -140,7 +140,7 @@ public class ClientPrjProjInfoVo { } @Data - public static class DocumentVo{ + public static class DocumentVo { private Long id; private Long projId; @@ -161,7 +161,35 @@ public class ClientPrjProjInfoVo { } @Data - public static class Statistics{ + 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 List jdtjList; + } + + @Data + public static class JdtjStatistics { + 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;//已培养数量 + } + + @Data + public static class Statistics { @ApiModelProperty("论文数量") private Integer lwTotal; @ApiModelProperty("专利数量") @@ -181,7 +209,7 @@ public class ClientPrjProjInfoVo { private List rcpyList; @Data - public static class Lw{ + public static class Lw { private Long orgId; private String orgName; private Integer sci; @@ -190,7 +218,7 @@ public class ClientPrjProjInfoVo { } @Data - public static class Zl{ + public static class Zl { private Long orgId; private String orgName; private Integer fm; @@ -199,14 +227,14 @@ public class ClientPrjProjInfoVo { } @Data - public static class Gcc{ + public static class Gcc { private Long orgId; private String orgName; private Integer dtr; } @Data - public static class Rcpy{ + public static class Rcpy { private Long orgId; private String orgName; private Integer bsh; diff --git a/research-system/src/main/java/com/research/system/persist/dao/ClientPrjProOrgDao.java b/research-system/src/main/java/com/research/system/persist/dao/ClientPrjProOrgDao.java index 8d3d5c1a..ca1eb288 100644 --- a/research-system/src/main/java/com/research/system/persist/dao/ClientPrjProOrgDao.java +++ b/research-system/src/main/java/com/research/system/persist/dao/ClientPrjProOrgDao.java @@ -25,4 +25,6 @@ public interface ClientPrjProOrgDao { List zjStatistics3(); List zjStatistics4(); + + List jdtjStatistics(); } diff --git a/research-system/src/main/java/com/research/system/service/CooperatorService.java b/research-system/src/main/java/com/research/system/service/CooperatorService.java index 1dc83c78..2368c2c6 100644 --- a/research-system/src/main/java/com/research/system/service/CooperatorService.java +++ b/research-system/src/main/java/com/research/system/service/CooperatorService.java @@ -32,4 +32,6 @@ public interface CooperatorService { String template(); ClientPrjProjInfoVo.Statistics statistics(); + + ClientPrjProjInfoVo.Jdtj jdtjStatistics(); } diff --git a/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java index a1a0bb0e..f8c3143f 100644 --- a/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java @@ -33,6 +33,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** *https://www.22biqu.com/biqu79073/39115438.html @@ -206,4 +207,22 @@ public class CooperatorServiceImpl implements CooperatorService { statistics.setRcpyList(prjProOrgDao.zjStatistics4()); return statistics; } + + @Override + public ClientPrjProjInfoVo.Jdtj jdtjStatistics() { + ClientPrjProjInfoVo.Jdtj jdtj = new ClientPrjProjInfoVo.Jdtj(); + List jdtjStatistics = prjProOrgDao.jdtjStatistics(); + if (CollUtil.isNotEmpty(jdtjStatistics)) { + jdtj.setRcNum(jdtjStatistics.stream().map(ClientPrjProjInfoVo.JdtjStatistics::getRcNum).mapToInt(Integer::intValue).sum()); + jdtj.setRcTotal(jdtjStatistics.stream().map(ClientPrjProjInfoVo.JdtjStatistics::getRcTotal).mapToInt(Integer::intValue).sum()); + jdtj.setLwNum(jdtjStatistics.stream().map(ClientPrjProjInfoVo.JdtjStatistics::getLwNum).mapToInt(Integer::intValue).sum()); + jdtj.setLwTotal(jdtjStatistics.stream().map(ClientPrjProjInfoVo.JdtjStatistics::getLwTotal).mapToInt(Integer::intValue).sum()); + jdtj.setGccNum(jdtjStatistics.stream().map(ClientPrjProjInfoVo.JdtjStatistics::getGccNum).mapToInt(Integer::intValue).sum()); + jdtj.setGccTotal(jdtjStatistics.stream().map(ClientPrjProjInfoVo.JdtjStatistics::getGccTotal).mapToInt(Integer::intValue).sum()); + jdtj.setZlNum(jdtjStatistics.stream().map(ClientPrjProjInfoVo.JdtjStatistics::getZlNum).mapToInt(Integer::intValue).sum()); + jdtj.setZlTotal(jdtjStatistics.stream().map(ClientPrjProjInfoVo.JdtjStatistics::getZlTotal).mapToInt(Integer::intValue).sum()); + jdtj.setJdtjList(jdtjStatistics); + } + return jdtj; + } } diff --git a/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml b/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml index 6d0f0aae..34d8b437 100644 --- a/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml +++ b/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml @@ -126,4 +126,23 @@ GROUP BY o.id + +