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 44bdee5f..fdc144b4 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 @@ -1,6 +1,7 @@ package com.research.web.controller.client.project; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; @@ -42,10 +43,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Author zzc @@ -91,7 +89,8 @@ public class GroupController { // if (query.getPageNum() > 0) { // PageHelper.startPage(query.getPageNum(), query.getPageSize()); // } - return JsonResponse.ok(new PageInfo<>(ktsGroupService.childList(query.getParam()))); + List results = ktsGroupService.childList(query.getParam()); + return JsonResponse.ok(new PageInfo<>(results)); } @PostMapping("/add") 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 aecc24c8..1da22edb 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 @@ -249,7 +249,7 @@ public class GroupVO { public static class Xl{ private Long orgId; private String orgName; - private Integer bsh;//博士后 + private Integer bk;//本科 private Integer bs;//博士 private Integer ss;//硕士 } 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 801b3c64..fd88cfea 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 @@ -89,7 +89,7 @@ public class KtsGroupServiceImpl implements KtsGroupService { if (CollUtil.isNotEmpty(groupList)) { return buildTree(groupList); } - return null; + return new ArrayList<>(); } @Override diff --git a/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml b/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml index 34d8b437..600782e9 100644 --- a/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml +++ b/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml @@ -76,7 +76,7 @@ select o.id as orgId, o.org_name as orgName, - SUM(CASE WHEN m.qualification = '0' THEN 1 ELSE 0 END) AS bsh, - SUM(CASE WHEN m.qualification = '1' THEN 1 ELSE 0 END) AS bs, - SUM(CASE WHEN m.qualification = '2' THEN 1 ELSE 0 END) AS zgjs + SUM(CASE WHEN m.qualification = '5' THEN 1 ELSE 0 END) AS bk, + SUM(CASE WHEN m.qualification = '6' THEN 1 ELSE 0 END) AS ss, + SUM(CASE WHEN m.qualification = '7' THEN 1 ELSE 0 END) AS bs from prj_proj_org o left join kts_kt_group g on g.proj_org_id = o.id and g.del_flag = 0 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id where o.del_flag = 0 - group by o.id,title + group by o.id