1

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

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

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectAuditController.java

@@ -149,9 +149,9 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
                     e.setMobile(hideAllPhoneNum(e.getMobile()));
                 if (null != e.getAuditResult())
                     e.setAuditResultName(CommonEnum.auditResult.getEnum(e.getAuditResult()).getDescription());
-                if(vo.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode())){
-                    e.setAssignList(comProjectAssignService.getAssignExpertList(e.getAuditObjectId()));
-                }
+//                if(vo.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode())){
+//                    e.setAssignList(comProjectAssignService.getAssignExpertList(e.getAuditObjectId()));
+//                }
             });
         }
         return ResponseDataModel.ok(page);

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

@@ -131,7 +131,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
                             CommonEnum.projState.waitSubmit.getCode());
                     break;
                 case 2:
-                    criteria.eq("proj_state", CommonEnum.projState.returnModify.getCode());
+                    criteria.in("proj_state",
+                            CommonEnum.projState.returnModify.getCode(),
+                            CommonEnum.projState.lastModify.getCode());
                     break;
                 case 3:
                     criteria.in("proj_state",

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