From 7f543920c84ca6b0d980155bda1aed82ea0e5c2a Mon Sep 17 00:00:00 2001 From: ccsens_zhengzhichuan Date: Mon, 26 Jan 2026 19:07:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=AA=E5=99=A8=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=20=E6=A0=B9=E6=8D=AE=E5=90=88=E4=BD=9C=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain/dto/MemberAduitDto.java | 1 + .../system/domain/dto/ResPlatformDto.java | 1 + .../com/research/system/domain/vo/HomeVo.java | 13 +++-- .../system/service/impl/HomeServiceImpl.java | 49 ++++++++++++++++--- .../service/impl/MemberAduitServiceImpl.java | 10 +++- .../src/main/resources/mapper/dao/HomeDao.xml | 26 +++++----- .../resources/mapper/dao/ResPlatformDao.xml | 3 ++ 7 files changed, 79 insertions(+), 24 deletions(-) diff --git a/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java b/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java index d789221d..0a29440a 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java +++ b/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java @@ -44,6 +44,7 @@ public class MemberAduitDto { @JsonFormat(pattern = "yyyy-MM-dd") private Date memberBirth; + @ApiModelProperty("成员类型 0负责人 1参与者 2指导老师 3导师") private List type; private Byte category; diff --git a/research-system/src/main/java/com/research/system/domain/dto/ResPlatformDto.java b/research-system/src/main/java/com/research/system/domain/dto/ResPlatformDto.java index fc7b9eaf..c0f74ed0 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/ResPlatformDto.java +++ b/research-system/src/main/java/com/research/system/domain/dto/ResPlatformDto.java @@ -13,6 +13,7 @@ public class ResPlatformDto { @Data public static class Query{ + private Long projOrgId; @ApiModelProperty("平台名称") private String name; @ApiModelProperty("管理员") diff --git a/research-system/src/main/java/com/research/system/domain/vo/HomeVo.java b/research-system/src/main/java/com/research/system/domain/vo/HomeVo.java index f03f4bb5..2f70723e 100644 --- a/research-system/src/main/java/com/research/system/domain/vo/HomeVo.java +++ b/research-system/src/main/java/com/research/system/domain/vo/HomeVo.java @@ -131,7 +131,7 @@ public class HomeVo { public static class ProjressMemberResult { private List orgMemberList; - private List titleList; + private List titleList; private List xlList; @Data @@ -142,8 +142,15 @@ public class HomeVo { @Data public static class TitleResult { - private String title; - private Integer num; + private int gj; + private int zj; + private int cj; + + @Data + public static class Vo{ + private String title; + private int num; + } } @Data diff --git a/research-system/src/main/java/com/research/system/service/impl/HomeServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/HomeServiceImpl.java index 34eb5501..29a06486 100644 --- a/research-system/src/main/java/com/research/system/service/impl/HomeServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/HomeServiceImpl.java @@ -7,6 +7,7 @@ import com.research.system.domain.po.*; import com.research.system.domain.vo.GroupVO; import com.research.system.domain.vo.HomeVo; import com.research.system.persist.dao.HomeDao; +import com.research.system.persist.dao.KtsGroupDao; import com.research.system.persist.mapper.KtsKtGroupMapper; import com.research.system.persist.mapper.PrjProjOrgMapper; import com.research.system.persist.mapper.ProProgressMapper; @@ -15,6 +16,7 @@ import com.research.system.service.HomeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -38,6 +40,8 @@ public class HomeServiceImpl implements HomeService { private KtsKtGroupMapper ktsKtGroupMapper; @Resource private TaskDeliverableMapper taskDeliverableMapper; + @Resource + private KtsGroupDao ktsGroupDao; @Override public HomeVo.Result queryHomeInfo() { @@ -115,15 +119,48 @@ public class HomeServiceImpl implements HomeService { public HomeVo.ProjressMemberResult queryProjressMemberList() { HomeVo.ProjressMemberResult projressMemberResult = new HomeVo.ProjressMemberResult(); projressMemberResult.setOrgMemberList(homeDao.orgMemberList()); - projressMemberResult.setXlList(homeDao.resultList()); + + //学历统计应该是工作人员学历和学生的在读状态相加 + List xls = ktsGroupDao.queryZdXlStatistics(); + GroupVO.Statistics.Xl xl = new GroupVO.Statistics.Xl(); + if (CollUtil.isNotEmpty(xls)) { + xl.setBs(xls.stream().map(GroupVO.Statistics.Xl::getBs).mapToInt(Integer::intValue).sum()); + xl.setSs(xls.stream().map(GroupVO.Statistics.Xl::getSs).mapToInt(Integer::intValue).sum()); + xl.setBsh(xls.stream().map(GroupVO.Statistics.Xl::getBsh).mapToInt(Integer::intValue).sum()); + } + List xlResults = homeDao.resultList(); + if (CollUtil.isNotEmpty(xlResults)) { + for (HomeVo.ProjressMemberResult.XlResult xlResult : xlResults) { + if ("博士".equals(xlResult.getXl())) { + xlResult.setNum(xl.getBs() + xlResult.getNum()); + } + if ("硕士".equals(xlResult.getXl())) { + xlResult.setNum(xl.getSs() + xlResult.getNum()); + } + if ("博士后".equals(xlResult.getXl())) { + xlResult.setNum(xl.getBsh() + xlResult.getNum()); + } + } + } + projressMemberResult.setXlList(xlResults); List titleResults = homeDao.titleList(); + List list = new ArrayList<>(); if (CollUtil.isNotEmpty(titleResults)) { - HomeVo.ProjressMemberResult.TitleResult titleResult = new HomeVo.ProjressMemberResult.TitleResult(); - titleResult.setTitle("其他"); - titleResult.setNum(projressMemberResult.getOrgMemberList().stream().mapToInt(HomeVo.ProjressMemberResult.OrgMemberResult::getNum).sum() - titleResults.stream().mapToInt(HomeVo.ProjressMemberResult.TitleResult::getNum).sum()); - titleResults.add(titleResult); + HomeVo.ProjressMemberResult.TitleResult titleResult1 = titleResults.get(0); + HomeVo.ProjressMemberResult.TitleResult.Vo titleResult = new HomeVo.ProjressMemberResult.TitleResult.Vo(); + titleResult.setTitle("高级"); + titleResult.setNum(titleResult1.getGj()); + list.add(titleResult); + HomeVo.ProjressMemberResult.TitleResult.Vo titleResult2 = new HomeVo.ProjressMemberResult.TitleResult.Vo(); + titleResult2.setTitle("中级"); + titleResult2.setNum(titleResult1.getZj()); + list.add(titleResult2); + HomeVo.ProjressMemberResult.TitleResult.Vo titleResult3 = new HomeVo.ProjressMemberResult.TitleResult.Vo(); + titleResult3.setTitle("初级"); + titleResult3.setNum(titleResult1.getCj()); + list.add(titleResult3); } - projressMemberResult.setTitleList(titleResults); + projressMemberResult.setTitleList(list); return projressMemberResult; } diff --git a/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java index bc1428ac..3955ef49 100644 --- a/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java @@ -80,7 +80,15 @@ public class MemberAduitServiceImpl implements MemberAduitService { KtsKtGroupMemberAduit ktsKtGroupMemberAduit = BeanUtil.copyProperties(dto, KtsKtGroupMemberAduit.class); ktsKtGroupMemberAduit.setId(IdUtil.getSnowflakeNextId()); ktsKtGroupMemberAduit.setStatus((byte) 0); - ktsKtGroupMemberAduit.setRoleIdList(dto.getRoleIdList().stream().map(String::valueOf).collect(Collectors.joining(","))); + if (CollUtil.isEmpty(dto.getRoleIdList())) { + if (dto.getType().contains("0")) { + ktsKtGroupMemberAduit.setRoleIdList("100"); + }else { + ktsKtGroupMemberAduit.setRoleIdList("2"); + } + }else { + ktsKtGroupMemberAduit.setRoleIdList(dto.getRoleIdList().stream().map(String::valueOf).collect(Collectors.joining(","))); + } ktsKtGroupMemberAduit.setReviewer(reviewerList.stream().map(String::valueOf).collect(Collectors.joining(","))); ktsKtGroupMemberAduitMapper.insertSelective(ktsKtGroupMemberAduit); diff --git a/research-system/src/main/resources/mapper/dao/HomeDao.xml b/research-system/src/main/resources/mapper/dao/HomeDao.xml index bfb709c3..6f60bb09 100644 --- a/research-system/src/main/resources/mapper/dao/HomeDao.xml +++ b/research-system/src/main/resources/mapper/dao/HomeDao.xml @@ -78,20 +78,18 @@