进度统计完成

research-admin/src/main/java/com/research/web/controller/client/project/CooperatorController.java

@@ -82,4 +82,9 @@ public class CooperatorController {
     public JsonResponse<ClientPrjProjInfoVo.Statistics> statistics(){
         return JsonResponse.ok(cooperatorService.statistics());
     }
+
+    @PostMapping("/jdtjStatistics")
+    public JsonResponse<ClientPrjProjInfoVo.Jdtj> jdtjStatistics(){
+        return JsonResponse.ok(cooperatorService.jdtjStatistics());
+    }
 }

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<JdtjStatistics> 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<Rcpy> 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;

research-system/src/main/java/com/research/system/persist/dao/ClientPrjProOrgDao.java

@@ -25,4 +25,6 @@ public interface ClientPrjProOrgDao {
     List<ClientPrjProjInfoVo.Statistics.Gcc> zjStatistics3();
 
     List<ClientPrjProjInfoVo.Statistics.Rcpy> zjStatistics4();
+
+    List<ClientPrjProjInfoVo.JdtjStatistics> jdtjStatistics();
 }

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();
 }

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<ClientPrjProjInfoVo.JdtjStatistics> 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;
+    }
 }

research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml

@@ -126,4 +126,23 @@
         GROUP BY
             o.id
     </select>
+
+    <select id="jdtjStatistics" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$JdtjStatistics">
+        select o.id                                                                           as orgId,
+               o.org_name                                                                     as orgName,
+               o.xslw as lwTotal,
+               o.zlsqysq as zlTotal,
+               o.gcckjrc as gccTotal,
+               o.rcpy as rcTotal,
+               sum(case when a.category_id_1 = '1' then 1 else 0 end) as lwNum,
+               sum(case when a.category_id_1 = '11' then 1 else 0 end) as zlNum,
+               sum(case when a.category_id_1 = '5' then 1 else 0 end) as gccNum,
+               sum(case when a.category_id_1 = '6' then 1 else 0 end) as rcNum
+        from prj_proj_org o
+                 left join
+             ach_achievement a on a.proj_org_id = o.id and category_id_1 = 6
+        where o.del_flag = 0
+        GROUP BY
+            o.id
+    </select>
 </mapper>