修改

src/main/java/com/ydool/oa/workFlow/data/dto/WorkFlowCountDto.java

@@ -15,4 +15,7 @@ public class WorkFlowCountDto {
     @ApiModelProperty(value = "待填写的流程数量")
     private Integer writeFlowCount;
 
+    @ApiModelProperty(value = "人事审批的流程数量")
+    private Integer personnelCount;
+
 }

src/main/java/com/ydool/oa/workFlow/service/WorkFlowService.java

@@ -23,6 +23,7 @@ import com.ydool.oa.workFlow.enums.WorkFlowStepStatusEnum;
 import com.ydool.oa.workFlow.enums.WorkFlowStepTypeEnum;
 import com.ydool.oa.workFlow.enums.WorkFlowTypeEnum;
 import com.ydool.oa.workFlow.mapper.WorkFlowMapper;
+import com.ydool.staff.service.IAuditService;
 import com.ydool.system.entity.User;
 import com.ydool.system.service.impl.UserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +57,8 @@ public class WorkFlowService extends BaseService<WorkFlowMapper, WorkFlow> {
 
     @Autowired
     private UserServiceImpl userService;
+    @Autowired
+    private IAuditService auditService;
 
     /**
      * 发起流程
@@ -289,6 +292,7 @@ public class WorkFlowService extends BaseService<WorkFlowMapper, WorkFlow> {
                 )
         );
         workFlowCountDto.setWriteFlowCount(writeFlowCount);
+        workFlowCountDto.setPersonnelCount(auditService.counts());
         return AjaxResult.ok().data(workFlowCountDto);
     }
 

src/main/java/com/ydool/staff/controller/AuditController.java

@@ -93,10 +93,4 @@ public class AuditController extends BaseController {
         }
         return AjaxResult.fail().msg("审批状态错误");
     }
-
-    @GetMapping()
-    public AjaxResult count(){
-        return auditService.counts();
-    }
-
 }

src/main/java/com/ydool/staff/controller/RecruitmentController.java

@@ -54,14 +54,14 @@ public class RecruitmentController extends BaseController {
     }
 
 
-    // @GetMapping(value = "/submit")
+    @GetMapping(value = "/submit")
-    // @ApiOperation(value = "已提交审批")
+    @ApiOperation(value = "已提交审批")
-    // public AjaxResult submit() {
+    public AjaxResult submit() {
-    //     return auditService.submitAudit(getPage());
+        return auditService.submitAudit(getPage());
-    // }
+    }
 
     @GetMapping(value = "/waiting")
-    @ApiOperation(value = "待我审批")
+    @ApiOperation(value = "人事审批")
     public AjaxResult waiting() {
         return auditService.waitingAudit(getPage());
     }

src/main/java/com/ydool/staff/service/IAuditService.java

@@ -31,6 +31,6 @@ public interface IAuditService {
 
     AjaxResult waitingAudit(Page page);
 
-    AjaxResult counts();
+    Integer counts();
 }
 

src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java

@@ -539,7 +539,7 @@ public class AuditServiceImpl extends BaseService<AuditMapper, Audit> implements
     @Override
     public AjaxResult submitAudit(Page page) {
         Page selectPage = auditMapper.selectPage(page, Wrappers.lambdaQuery(Audit.class)
-                .eq(Audit::getAuditState, "submit").eq(Audit::getApprover, StpUtil.getLoginIdAsString()));
+                .eq(Audit::getAuditState, ArgsConst.SUBMIT).eq(Audit::getApprover, StpUtil.getLoginIdAsString()));
         return AjaxResult.ok().data(selectPage);
     }
 
@@ -553,15 +553,15 @@ public class AuditServiceImpl extends BaseService<AuditMapper, Audit> implements
     @Override
     public AjaxResult waitingAudit(Page page) {
         Page selectPage = auditMapper.selectPage(page, Wrappers.lambdaQuery(Audit.class)
-                .eq(Audit::getAuditOrder, "waiting").eq(Audit::getApprover, StpUtil.getLoginIdAsString()));
+                .eq(Audit::getAuditOrder, ArgsConst.WAITING).eq(Audit::getApprover, StpUtil.getLoginIdAsString()));
         return AjaxResult.ok().data(selectPage);
     }
 
 
     @Override
-    public AjaxResult counts() {
+    public Integer counts() {
-        Integer count = auditMapper.selectCount(Wrappers.lambdaQuery(Audit.class).eq(Audit::getAuditOrder, "waiting").eq(Audit::getApprover, StpUtil.getLoginIdAsString()));
+        return auditMapper.selectCount(Wrappers.lambdaQuery(Audit.class)
-        return AjaxResult.ok().data(count);
+                .eq(Audit::getAuditOrder, ArgsConst.WAITING).eq(Audit::getApprover, StpUtil.getLoginIdAsString()));
     }
 }
 

src/main/java/com/ydool/staff/service/impl/PersonnelIndicatorsServiceImpl.java

@@ -69,7 +69,9 @@ public class PersonnelIndicatorsServiceImpl extends BaseService<PersonnelIndicat
 
     @Override
     public AjaxResult savePersonnelIndicators(PersonnelIndicatorsRequest personnelIndicatorsRequest) {
-        Integer count = organizationMapper.selectCount(Wrappers.lambdaQuery(Organization.class).in(Organization::getAuditState, 0, 2).eq(Organization::getType, ArgsConst.PERSONNEL_INDICATORS));
+        Integer count = organizationMapper.selectCount(Wrappers.lambdaQuery(Organization.class)
+                .in(Organization::getAuditState,  2).eq(Organization::getType, ArgsConst.PERSONNEL_INDICATORS)
+        );
         if (count > 0) {
             return AjaxResult.fail("当前有未审批的指标申请！");
         }