77

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

@@ -333,7 +333,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         }
 
         ComProjectMembersDTO comProjectMembersDTO = comProjectMembersService.getMemCountById(id);
-        dto.setMemCount(comProjectMembersDTO.getMemCount()+1);
+        dto.setMemCount(comProjectMembersDTO.getMemCount() + 1);
         dto.setMemHighCount(comProjectMembersDTO.getMemHighCount());
         dto.setMemMiddleCount(comProjectMembersDTO.getMemMiddleCount());
         dto.setMemLowCount(comProjectMembersDTO.getMemLowCount());
@@ -620,12 +620,28 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         return this.update(comProject);
     }
 
+    public boolean checkMember(String projId) {
+        boolean state = true;
+        List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(projId);
+        if (null != memList && memList.size() > 0) {
+            for (ComProjectMembersDTO obj : memList) {
+                if (Objects.isNull(obj.getDownloadUrl())) {
+                    state = false;
+                }
+            }
+        }
+        return state;
+    }
+
+
     public void report(ComProjectAudit model, String unitId, String treeCode) {
         ComProject comProject = this.entityById(model.getAuditObjectId());
         if (null == comProject)
             throw new BusinessException("项目不存在或已删除！");
         if (!comProject.getProjState().equals(CommonEnum.projState.waitSubmit.getCode()) && !comProject.getProjState().equals(CommonEnum.projState.returnModify.getCode()))
             throw new BusinessException("项目已上报！");
+        if (!checkMember(model.getAuditObjectId()))
+            throw new BusinessException("项目组成员简历未上传完整，上报失败！");
         comProjectAuditService.report(comProject.getReportYear(), model.getAuditObjectId(), model.getAuditType(), unitId, treeCode);
         String versionNo = "";
         if (null == comProject.getVersionNo())
@@ -663,6 +679,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         if (!audit.getAuditResult().equals(CommonEnum.auditResult.waitAudit.getCode()))
             throw new BusinessException("所选项目已审核，请刷新列表后重新选择！");
         ComProject model = this.getById(audit.getAuditObjectId());
+        if (dto.getAuditResult().equals(CommonEnum.auditResult.pass.getCode()) && !checkMember(audit.getAuditObjectId()))
+            throw new BusinessException("项目组成员简历未上传完整，请选择返回修改！");
         if (null == model)
             throw new BusinessException("审核对象不存在！");
         ComUnit appUnit = comUnitService.getById(model.getAppUnitId());