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/ComProjectAuditServiceImpl.java

@@ -304,21 +304,21 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         }
         //返回修改
         else if (model.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
-            if (auditMethod.equals(CommonEnum.auditMethod.last.getCode()))
-                throw new BusinessException("终审项目不能返回修改！");
             unitLevel = unitLevel + 1;
             // 跳过县级行政机构
             if (reportTreeCode.length() / properties.getDefaultCodeLength() > 3 && auditUnitTreeCode.length() / properties.getDefaultCodeLength() == 2) {
                 unitLevel = comProjectAuditDAO.getMaxUnitLevelByObjectId(model.getAuditObjectId());
             }
-            //更新上报表
-            ComProjectAudit auditNote = this.getAudit(auditObjectId, null, auditType, CommonEnum.auditMethod.audit.getCode(), unitLevel);
-            if (null != auditNote) {
-                // 更新下级单位上报记录
-                this.updateAudit(auditNote.getId(), CommonEnum.auditResult.waitAudit.getCode(), "", index + 1, SecurityUserHolder.getPersonId(), new Date(), null, null, null, null);
-                // 插入审核记录表
-                comProjectAuditNoteService.insertAuditNote(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.audit.getCode(), auditNote.getAuditUnitId(), null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId());
-                unitId = auditNote.getAuditUnitId();
+            if (!model.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode())) {
+                //更新上报表
+                ComProjectAudit auditNote = this.getAudit(auditObjectId, null, auditType, CommonEnum.auditMethod.audit.getCode(), unitLevel);
+                if (null != auditNote) {
+                    // 更新下级单位上报记录
+                    this.updateAudit(auditNote.getId(), CommonEnum.auditResult.waitAudit.getCode(), "", index + 1, SecurityUserHolder.getPersonId(), new Date(), null, null, null, null);
+                    // 插入审核记录表
+                    comProjectAuditNoteService.insertAuditNote(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.audit.getCode(), auditNote.getAuditUnitId(), null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId());
+                    unitId = auditNote.getAuditUnitId();
+                }
             }
         }
         return unitId;

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

@@ -700,7 +700,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             }
         } else if (audit.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
             if (unitId == null)
-                projState = CommonEnum.projState.returnModify.getCode();
+                if (audit.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode()))
+                    projState = CommonEnum.projState.lastModify.getCode();
+                else
+                    projState = CommonEnum.projState.returnModify.getCode();
         } else {
             projState = CommonEnum.projState.failed.getCode();
         }