1

science-admin/src/main/java/com/yiboshi/science/enumeration/CommonEnum.java

@@ -342,6 +342,7 @@ public class CommonEnum {
         waitSubmit(10, "待提交"),
         toAudit(20, "评审中"),
         returnModify(30, "返回修改"),
+        lastModify(35, "返回修改"),
         failed(40, "未批准立项"),
         pass(50, "批准立项"),
         report(55, "结题上报"),

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

@@ -1130,10 +1130,21 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         return list;
     }
 
-    public String updateDefenseScore(String id, BigDecimal defenseScore) {
+    public String updateDefenseScore (String id, BigDecimal defenseTechnologyScore, BigDecimal defenseEconomyScore) {
         ComProject e = new ComProject();
         e.setId(id);
+        if (Objects.nonNull(defenseTechnologyScore))
+            e.setDefenseTechnologyScore(defenseTechnologyScore);
+        if (Objects.nonNull(defenseEconomyScore))
+            e.setDefenseEconomyScore(defenseEconomyScore);
+        if (Objects.nonNull(defenseTechnologyScore) && Objects.nonNull(defenseEconomyScore)) {
+            // 答辩总得分=答辩技术专家评分*80%+答辩账务专家评分*20%
+            BigDecimal multiplierTech = BigDecimal.valueOf(0.8);
+            BigDecimal multiplierEcon = BigDecimal.valueOf(0.2);
+            BigDecimal defenseScore = defenseTechnologyScore.multiply(multiplierTech).add(defenseEconomyScore.multiply(multiplierEcon));
             e.setDefenseScore(defenseScore);
+        }
+
         return this.update(e);
     }
 }
\ No newline at end of file

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

@@ -453,7 +453,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
             throw new BusinessException("合同书不存在！");
         if (!ComProjectTask.getTaskState().equals(CommonEnum.taskState.waitSubmit.getCode()) && !ComProjectTask.getTaskState().equals(CommonEnum.taskState.returnModify.getCode()))
             throw new BusinessException("合同书已上报");
-        comProjectAuditService.report(ComProjectTask.getReportYear(), model.getAuditObjectId(), model.getAuditType(), unitId, treeCode);
+        comProjectAuditService.report(ComProjectTask.getReportYear(), model.getAuditObjectId(), model.getAuditType(),null, unitId, treeCode);
         // 更新任务书状态
         this.updateState(model.getAuditObjectId(), CommonEnum.taskState.review.getCode());
     }

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

@@ -457,7 +457,7 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
             throw new BusinessException("人才申报记录不存在或已删除！");
         if (!comTalentApply.getTalentState().equals(CommonEnum.talentState.waitSubmit.getCode()) && !comTalentApply.getTalentState().equals(CommonEnum.talentState.returnModify.getCode()))
             throw new BusinessException("项目已上报！");
-        comProjectAuditService.report(comTalentApply.getReportYear(), model.getAuditObjectId(), model.getAuditType(), unitId, treeCode);
+        comProjectAuditService.report(comTalentApply.getReportYear(), model.getAuditObjectId(), model.getAuditType(),null ,unitId, treeCode);
 
         // 更新人才申报记录状态
         comTalentApply.setTalentState(CommonEnum.projState.toAudit.getCode());