77

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

 package com.yiboshi.science.service.impl;
 
+import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiboshi.arch.exception.BusinessException;
@@ -332,7 +333,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         }
 
         ComProjectMembersDTO comProjectMembersDTO = comProjectMembersService.getMemCountById(id);
-        dto.setMemCount(comProjectMembersDTO.getMemCount());
+        dto.setMemCount(comProjectMembersDTO.getMemCount()+1);
         dto.setMemHighCount(comProjectMembersDTO.getMemHighCount());
         dto.setMemMiddleCount(comProjectMembersDTO.getMemMiddleCount());
         dto.setMemLowCount(comProjectMembersDTO.getMemLowCount());
@@ -342,6 +343,48 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         dto.setMemXsCount(comProjectMembersDTO.getMemXsCount());
         dto.setWorkCount(comProjectMembersDTO.getWorkCount());
 
+        //申报人职称统计
+        if (!StringUtils.isEmpty(comPersonDTO.getTitle())) {
+            String titleName = systemParameterService.judgmentTitleLevel(comPersonDTO.getTitle());
+            if (!StringUtils.isEmpty(titleName)) {
+                switch (titleName) {
+                    case "无职称":
+                    case "初级职称":
+                        dto.setMemLowCount(dto.getMemLowCount() + 1);
+                        break;
+                    case "中级职称":
+                        dto.setMemMiddleCount(dto.getMemMiddleCount() + 1);
+                        break;
+                    case "副高级职称":
+                    case "高级职称":
+                        dto.setMemHighCount(dto.getMemHighCount() + 1);
+                        break;
+                }
+            }
+        }
+
+        //申报人学历统计
+        if (!StringUtils.isEmpty(comPersonDTO.getDegreeName())) {
+            switch (comPersonDTO.getDegreeName()) {
+                case "博士后":
+                    dto.setMemBshCount(dto.getMemBshCount() + 1);
+                    break;
+                case "博士":
+                    dto.setMemBsCount(dto.getMemBsCount() + 1);
+                    break;
+                case "硕士":
+                    dto.setMemSsCount(dto.getMemSsCount() + 1);
+                    break;
+                case "学士":
+                    dto.setMemXsCount(dto.getMemXsCount() + 1);
+                    break;
+                case "大专":
+                case "其他":
+                    break;
+            }
+        }
+
+
         //获取项目组成员
         List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(dto.getId());
         dto.setMembers(memList);
@@ -596,25 +639,25 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
     public void audit(ComProjectAuditDTO dto, String auditUnitId, String auditTreeCode) {
         if (Objects.isNull(dto.getAuditObjectId()))
             throw new BusinessException("参数缺失！");
-        this.projAudit(dto,auditUnitId,auditTreeCode);
+        this.projAudit(dto, auditUnitId, auditTreeCode);
     }
 
     @Transactional
     public void batchAudit(ComProjectAuditDTO dto, String auditUnitId, String auditTreeCode) {
-       if(null!=dto.getIdList()&&dto.getIdList().size()>0){
-           dto.getIdList().forEach((f)->{
-               dto.setId(f);
-               this.projAudit(dto,auditUnitId,auditTreeCode);
-           });
-       }else{
-           throw new BusinessException("未选择项目！");
-       }
+        if (null != dto.getIdList() && dto.getIdList().size() > 0) {
+            dto.getIdList().forEach((f) -> {
+                dto.setId(f);
+                this.projAudit(dto, auditUnitId, auditTreeCode);
+            });
+        } else {
+            throw new BusinessException("未选择项目！");
+        }
     }
 
     @Transactional
     public void projAudit(ComProjectAuditDTO dto, String auditUnitId, String auditTreeCode) {
-        ComProjectAudit audit=comProjectAuditService.getById(dto.getId());
-        if(null==audit)
+        ComProjectAudit audit = comProjectAuditService.getById(dto.getId());
+        if (null == audit)
             throw new BusinessException("审核记录不存在！");
         if (!audit.getAuditResult().equals(CommonEnum.auditResult.waitAudit.getCode()))
             throw new BusinessException("所选项目已审核，请刷新列表后重新选择！");