修改科研成果统计

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

@@ -77,4 +77,9 @@ public class CooperatorController {
     public JsonResponse<String> template(){
         return JsonResponse.ok(cooperatorService.template());
     }
+
+    @PostMapping("/queryStatistics")
+    public JsonResponse<ClientPrjProjInfoVo.Statistics> statistics(){
+        return JsonResponse.ok(cooperatorService.statistics());
+    }
 }

research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java

@@ -202,6 +202,8 @@ public class CooperatorServiceImpl implements CooperatorService {
         ClientPrjProjInfoVo.Statistics statistics = prjProOrgDao.statistics();
         statistics.setLwList(prjProOrgDao.lwStatistics1());
         statistics.setZlList(prjProOrgDao.zjStatistics2());
+        statistics.setGccList(prjProOrgDao.zjStatistics3());
+        statistics.setRcpyList(prjProOrgDao.zjStatistics4());
         return statistics;
     }
 }

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

@@ -87,7 +87,7 @@
             o.id
     </select>
 
-    <select id="lwStatistics2" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Zl">
+    <select id="zjStatistics2" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Zl">
         select o.id                                                                           as orgId,
                o.org_name                                                                     as orgName,
                sum(case when a.category_id_1 = '11' then 1 else 0 end)                           as fm,
@@ -101,11 +101,29 @@
             o.id
     </select>
 
-    <select id="lwStatistics3" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Gcc">
-   
+    <select id="zjStatistics3" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Gcc">
+        select o.id                                                                           as orgId,
+               o.org_name                                                                     as orgName,
+               count(a.id) as dtr
+        from prj_proj_org o
+                 left join
+             ach_achievement a on a.proj_org_id = o.id and category_id_1 = 5
+        where o.del_flag = 0
+        GROUP BY
+            o.id
     </select>
 
-    <select id="lwStatistics4" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Rcpy">
-
+    <select id="zjStatistics4" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Rcpy">
+        select o.id                                                                           as orgId,
+               o.org_name                                                                     as orgName,
+               sum(case when a.type = '0' then 1 else 0 end) as bsh,
+               sum(case when a.type = '1' then 1 else 0 end) as bs,
+               sum(case when a.type = '2' then 1 else 0 end) as ss
+        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>