1

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

@@ -231,10 +231,10 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
             this.updateAudit(comProjectAudit.getId(), CommonEnum.auditResult.waitAudit.getCode(), "", maxIndex + 1, SecurityUserHolder.getPersonId(), new Date(), null, null, null, null);
         } else {
             //插入上报表
-            this.insertAudit(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.audit.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, treeCode.length() / properties.getDefaultCodeLength(), maxIndex + 1, SecurityUserHolder.getPersonId());
+            this.insertAudit(reportYear, auditType, auditObjectId, auditMethod, auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, treeCode.length() / properties.getDefaultCodeLength(), maxIndex + 1, SecurityUserHolder.getPersonId());
         }
         // 插入审核记录表
-        comProjectAuditNoteService.insertAuditNote(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.audit.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, treeCode.length() / properties.getDefaultCodeLength(), maxIndex + 1, SecurityUserHolder.getPersonId());
+        comProjectAuditNoteService.insertAuditNote(reportYear, auditType, auditObjectId, auditMethod, auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, treeCode.length() / properties.getDefaultCodeLength(), maxIndex + 1, SecurityUserHolder.getPersonId());
     }
 
     public String audit(ComProjectAudit model, String reportTreeCode, String auditUnitTreeCode) {

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

@@ -934,7 +934,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
                 && !StringUtil.isContainsRole(SecurityUserHolder.getRoles(), CommonEnum.systemRole.topGov.getCode().toString())
                 && !project.getProjState().equals(CommonEnum.projState.draft.getCode())
                 && !project.getProjState().equals(CommonEnum.projState.waitSubmit.getCode())
-                && !project.getProjState().equals(CommonEnum.projState.returnModify.getCode()))
+                && !project.getProjState().equals(CommonEnum.projState.returnModify.getCode())
+                && !project.getProjState().equals(CommonEnum.projState.lastModify.getCode()))
             throw new BusinessException("项目已上报！");
         ComProject comProject = convert2Entity(dto);
         comProjectBasicService.insertOrUpdate(dto);

science-admin/src/main/resources/mapper/ComProjectDAO.xml

@@ -28,7 +28,7 @@
     </select>
     <select id="getCount" resultType="com.yiboshi.science.param.dto.DataStatisticsDTO">
         SELECT ifnull(sum(case when proj_state in(-10,10) then 1 else 0 end),0) count1,
-        ifnull(sum(case when proj_state =30 then 1 else 0 end),0) count2,
+        ifnull(sum(case when proj_state in(30,35) then 1 else 0 end),0) count2,
         ifnull(sum(case when proj_state in(20,22,24,26,28,40,50) then 1 else 0 end),0) count3,
         ifnull(sum(case when proj_state is not null then 1 else 0 end),0) count4
         FROM com_project c

science-admin/src/main/resources/mapper/ComUnitDAO.xml

@@ -25,6 +25,12 @@
         where a.id = #{id}
     </select>
 
+    <select id="getTopUnit" resultType="com.yiboshi.science.param.dto.ComUnitDTO">
+        select a.*
+        from com_unit a
+        where length(a.tree_code) = #{len}
+    </select>
+
     <select id="getUnitByTreeCode" resultType="com.yiboshi.science.param.dto.ComUnitDTO">
         select a.*
         from com_unit a