diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
index 75a365a56248a20dadd8ca87cab54bbd4c7e5b51..79244e48f6f08d4333e4158a368b4847d74ecb74 100644
--- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
+++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
@@ -5,11 +5,13 @@
  * @author: youqing
  * @version: 1.0
  * @date: 2020/9/11 10:55
- * 更改描述：
+ * 更改描述：2020/10/16 修改List 内类为NumberS子类
  */
 
 package com.cetc32.dh.common.response;
 
+import com.cetc32.dh.entity.NumberS;
+
 import java.util.List;
 
 /**
@@ -25,12 +27,20 @@ public class PageDataResult {
     //总记录数量
     private Integer totals;
 
-    private List<?> list;
+    private List<? extends NumberS> list;
 
     public PageDataResult(){};
-    public PageDataResult(int totals,List<?> list){
+    public PageDataResult(int totals,List<? extends NumberS> list){
+        this.totals=totals;
+        this.list=list;
+    }
+
+    public PageDataResult(int totals,List<? extends NumberS> list,Integer offset){
         this.totals=totals;
         this.list=list;
+        for(int i=0;i<list.size();i++){
+            list.get(i).setNumberId(offset +i +1);
+        }
     }
 
     public Integer getCode() {
@@ -53,13 +63,12 @@ public class PageDataResult {
         return list;
     }
 
-    public void setList(List <?> list) {
+    public void setList(List <? extends NumberS> list) {
         this.list = list;
     }
+
     /**
      * 指定缓存失效时间
-     * @param key 键
-     * @param time 时间(秒)
      * @return
      * 修改信息：
      */
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
index c89c0c039d0f339bca9f3a3b28d33bc99ff66bb3..3f9692c678234458271d77a1355b815409792cc7 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
@@ -53,7 +53,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @PostMapping(value = "/insert")
+    //@PostMapping(value = "/insert")
     public ResponseResult insert(DataMenu dataMenu) {
 //        DataMenu dataMenu=new DataMenu(2L,"test7",2L,"test7","test7");
         Integer count = dataMenuService.insertDataMenu(dataMenu);
@@ -66,7 +66,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @PostMapping(value = "/select")
+    //@PostMapping(value = "/select")
     public ResponseResult select(Long id) {
 
         DataMenu dataMenu = dataMenuService.queryById(id);
@@ -82,7 +82,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @PostMapping(value = "/deleteOne")
+    //@PostMapping(value = "/deleteOne")
     public ResponseResult delete(Long id) {
         Integer count = dataMenuService.deleteById(id);
         return ResponseResult.success(count);
@@ -94,7 +94,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @PostMapping(value = "/queryByPid")
+    //@PostMapping(value = "/queryByPid")
     public ResponseResult queryByPid(Long pid) {
         DataMenu dataMenu = dataMenuService.queryByPid(pid);
         return ResponseResult.success(dataMenu);
@@ -106,7 +106,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @PostMapping(value = "/showFilesById")
+    //@PostMapping(value = "/showFilesById")
     public ResponseResult showFilesById(Long menuId) {
         List<DataFile> dataFileList=dataMenuService.showFilesByMenuId(menuId);
         return ResponseResult.success(dataFileList);
@@ -118,7 +118,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @PostMapping(value = "/queryMenusByPIdSatisfyId")
+    //@PostMapping(value = "/queryMenusByPIdSatisfyId")
     public ResponseResult queryMenusByPIdSatisfyId(Long id) {
         List<DataMenu> dataMenuList = dataMenuService.queryByPIdSatisfyId(id);
         return ResponseResult.success(dataMenuList);
@@ -130,7 +130,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @PostMapping(value = "/addOneMenu")
+    //@PostMapping(value = "/addOneMenu")
     public ResponseResult addOneMenu(DataMenu dataMenu ) {
 //        dataMenu = new DataMenu(null, "test7", null, "test15", "test15");
         String message=dataMenuService.addDataMenu(dataMenu);
@@ -143,7 +143,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @PostMapping(value = "/updateDataMenu")
+    //@PostMapping(value = "/updateDataMenu")
     public ResponseResult updateDataMenu(DataMenu dataMenu) {
 //        dataMenu=new DataMenu(5L,"test5",1L,"test5","test5555");
         Integer count = dataMenuService.updatebyId(dataMenu);
@@ -156,7 +156,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @PostMapping(value = "/deleteMenuTree")
+    //@PostMapping(value = "/deleteMenuTree")
     public ResponseResult deleteDataMenuTree(Long id) {
         Integer count = dataMenuService.deleteMenuTree(id);
         System.out.println(count);
@@ -171,7 +171,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @PostMapping(value = "/showMenuTree")
+    //@PostMapping(value = "/showMenuTree")
     public ResponseResult  showMenuTree(Long id) {
             if (StringUtils.isEmpty(id)) {
                 id = 0L;
diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index b8f366a1222c4b7b6af21d59e14516ef52df6559..9a9e03922ccf8ab2cb46be50e78b45e67e4f731c 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -12,7 +12,8 @@ import com.cetc32.dh.common.response.PageDataResult;
 import com.cetc32.dh.common.response.ResponseResult;
 import com.cetc32.dh.entity.DataSubmit;
 import com.cetc32.dh.service.DataSubmitService;
-import org.apache.shiro.util.Assert;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,13 +36,15 @@ public class FileSubmitController {
      * 查询当前用户提交的所有导入请求
      * @return 返回给前端分装好的结构体
      * **/
-    @PostMapping("/submits")
+    @ApiOperation(value="当前用户名提交的数据")
+    @PostMapping("/request")
     public PageDataResult mySubmits(){
         DataSubmit ds=new DataSubmit();
-        ds.setSumbitor("admin");
+        ds.setSubmitor("admin");
         List<DataSubmit> list =new ArrayList<>();
         Integer count =0;
         list= dataSubmitService.selectMySubmit(ds);
+        count= dataSubmitService.countMineSubmit(ds);
         return new PageDataResult(count,list);
     }
 
@@ -49,13 +52,15 @@ public class FileSubmitController {
      * 查询当前用户可以审核的所有导入请求
      * @return 返回给前端分装好的结构体
      * **/
-    @PostMapping("/approves")
+    @ApiOperation(value="当前用户名下需要审核及已审核的所有任务")
+    @PostMapping("/task")
     public PageDataResult myApproves(){
         DataSubmit ds=new DataSubmit();
-        ds.setSumbitor("admin");
+        ds.setSubmitor("admin");
         List<DataSubmit> list =new ArrayList<>();
         Integer count =0;
         list= dataSubmitService.selectMyApprove(ds);
+        count= dataSubmitService.countMineApprov(ds);
         return new PageDataResult(count,list);
     }
 
@@ -63,6 +68,7 @@ public class FileSubmitController {
      * 拒绝导入请求
      * @return 返回执行结果
      * **/
+    @ApiOperation(value="拒绝请求")
     @PostMapping("/reject")
     public ResponseResult rejectSubmit(Integer id){
         DataSubmit ds =new DataSubmit();
@@ -76,6 +82,7 @@ public class FileSubmitController {
      * 拒绝导入请求
      * @return 返回执行结果
      * **/
+    @ApiOperation(value="审核通过")
     @PostMapping("/accept")
     public ResponseResult acceptSubmit(Integer id){
         DataSubmit ds =new DataSubmit();
@@ -84,4 +91,20 @@ public class FileSubmitController {
             return ResponseResult.success();
         return ResponseResult.error();
     }
+    /**
+     * @param page 页码
+     * @param results 每页显示条数
+     * @return 分页数据
+     * */
+    @ApiOperation(value="所有待审核的数据")
+    @PostMapping("/approves")
+    public PageDataResult myAprroves(@ApiParam(value="页码")Integer page, @ApiParam(value="每页数据条数")Integer results){
+        if(null ==page || page <= 0)
+            page=1;
+        if(null ==results||results <= 0 )
+            results=10;
+        DataSubmit ds =new DataSubmit();
+        return new PageDataResult(dataSubmitService.countReadyApprove(null),
+                dataSubmitService.selectReadyApprove(ds),(page-1)*results);
+    }
 }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 9fdde9afb0d176988b5c0020b75ccc003723dd86..46ddcf6fc1f131eca3df7b63a7af3491424c600c 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -15,10 +15,7 @@ import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.cetc32.dh.service.VfileMenuService;
 import java.util.Date;
 import java.util.List;
@@ -166,8 +163,8 @@ public class VfileMenuController {
 
     /**
      * 根据目录节点id和文件视图对象查询文件
-     * @param pageNum
-     * @param pageSize
+     * @param page
+     * @param results
      * @param vfileMenu
      * @return pdr
      * 备注:无
@@ -199,25 +196,28 @@ public class VfileMenuController {
                 dataType = "Integer", paramType = "query", defaultValue = "")
     })*/
     @PostMapping("/find")
-    public PageDataResult queryFilesByObj(@ApiParam(value="当前页码",required = true,defaultValue = "1") @RequestParam("current") Integer pageNum,
-                                          @ApiParam(value="每页数据条数",required = true,defaultValue = "10")@RequestParam("page") Integer pageSize,
+    public PageDataResult queryFilesByObj(@ApiParam(value="当前页码",required = true,defaultValue = "1") Integer page,
+                                          @ApiParam(value="每页数据条数",required = true,defaultValue = "10") Integer results,
                                           /*@ApiParam(value="vfileMenu")*/ VfileMenu vfileMenu){
         //if(vfil)
         //vfileMenu=new VfileMenu(null,null,null,null,null,null,null,13L,2017);
         PageDataResult pdr = new PageDataResult();
-        if (pageNum == null || pageNum == 0) {
-            pageNum = 1;
+        if (page == null || page == 0) {
+            page = 1;
         }
-        if (pageSize == null || pageSize == 0)
-            pageSize = 10;
-
-        pdr.setTotals(vfileMenuService.countFilesByObj(vfileMenu));
-        List<VfileMenu> vfileMenuList = vfileMenuService.queryFilesByObj((pageNum - 1) * pageSize,pageSize,vfileMenu);
-        for(int i=0;i<vfileMenuList.size();i++){
-            vfileMenuList.get(i).setNumberId((pageNum-1)*pageSize + i + 1);
+        if (results == null || results == 0)
+            results = 10;
+        int offset=(page - 1) * results;
+        /*pdr.setTotals(vfileMenuService.countFilesByObj(vfileMenu));*/
+        /*List<VfileMenu> vfileMenuList = vfileMenuService.queryFilesByObj(offset,results,vfileMenu);*/
+        return new PageDataResult(vfileMenuService.countFilesByObj(vfileMenu),
+                vfileMenuService.queryFilesByObj(offset,results,vfileMenu),
+                offset);
+        /*for(int i=0;i<vfileMenuList.size();i++){
+            vfileMenuList.get(i).setNumberId((page-1)*results + i + 1);
         }
-        pdr.setList(vfileMenuList);
-        return pdr;
+        pdr.setList(vfileMenuList);*/
+        //return pdr;
     }
 
 }
diff --git a/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java b/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java
index 98f4fb03b8860f792682f8a6d0ebc12b8e2b334e..6d5864f57943383526223d007ba65ddd88872d1c 100644
--- a/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java
+++ b/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java
@@ -9,6 +9,7 @@
 
 package com.cetc32.dh.dto;
 
+import com.cetc32.dh.entity.NumberS;
 import lombok.Data;
 
 ;
@@ -21,7 +22,7 @@ import lombok.Data;
  * @date: 2020/12/3 12:13
  */
 @Data
-public class AdminUserDTO {
+public class AdminUserDTO extends NumberS {
 
     /**
      * id
diff --git a/src/main/java/com/cetc32/dh/dto/PermissionDTO.java b/src/main/java/com/cetc32/dh/dto/PermissionDTO.java
index 2ba52cb6aa01231d5d3543168e058ffc24d89302..ba9940c2409f59ae6db88ea8fb3a538bec8a8831 100644
--- a/src/main/java/com/cetc32/dh/dto/PermissionDTO.java
+++ b/src/main/java/com/cetc32/dh/dto/PermissionDTO.java
@@ -9,6 +9,7 @@
 
 package com.cetc32.dh.dto;
 
+import com.cetc32.dh.entity.NumberS;
 import lombok.Data;
 import java.util.List;
 
@@ -20,7 +21,7 @@ import java.util.List;
  * @date: 2020/11/30 11:22
  */
 @Data
-public class PermissionDTO {
+public class PermissionDTO extends NumberS {
 
     /**
      * id
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index fc082a4a4144442cb875fcf6a6e0732250ea3908..52ecf8f4a126eb55b2a7805e594a1c05945da2d8 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -19,7 +19,8 @@ import javax.persistence.Table;
  * 备注:无
  */
 @Table(name="data_submit")
-public class DataSubmit {
+public class DataSubmit extends NumberS{
+
     /**
      * id
      * */
@@ -48,7 +49,7 @@ public class DataSubmit {
      * 提交者
      * */
     @Column(name = "sumbitor")
-    String sumbitor;
+    String submitor;
 
     /**
      * 审核人
@@ -118,12 +119,12 @@ public class DataSubmit {
         this.status = status;
     }
 
-    public String getSumbitor() {
-        return sumbitor;
+    public String getSubmitor() {
+        return submitor;
     }
 
-    public void setSumbitor(String sumbitor) {
-        this.sumbitor = sumbitor;
+    public void setSubmitor(String submitor) {
+        this.submitor = submitor;
     }
 
     public String getApprover() {
diff --git a/src/main/java/com/cetc32/dh/entity/NumberS.java b/src/main/java/com/cetc32/dh/entity/NumberS.java
new file mode 100644
index 0000000000000000000000000000000000000000..700c767c7ae2db68cbb8165321b27ec95e25b349
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/entity/NumberS.java
@@ -0,0 +1,13 @@
+package com.cetc32.dh.entity;
+
+public class NumberS {
+    private Integer numberId;
+
+    public Integer getNumberId() {
+        return numberId;
+    }
+
+    public void setNumberId(Integer numberId) {
+        this.numberId = numberId;
+    }
+}
diff --git a/src/main/java/com/cetc32/dh/entity/VfileMenu.java b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
index 5ae4cf996044add741feed12161808689f00df60..b5d12371fd8d109827ac4c24d373a633177444df 100644
--- a/src/main/java/com/cetc32/dh/entity/VfileMenu.java
+++ b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
@@ -24,7 +24,7 @@ import javax.persistence.*;
  */
 @ApiModel("文件实体")
 @Table(name = "vfile_menu")
-public class VfileMenu {
+public class VfileMenu extends NumberS{
 
     /**
      * 无参构造函数
@@ -57,9 +57,8 @@ public class VfileMenu {
 
     /**
      * 显示序号numberId
-     */
     @ApiModelProperty(hidden = true)
-    private Integer numberId;
+    private Integer numberId;*/
 
     /**
      * 文件fileId
@@ -252,15 +251,15 @@ public class VfileMenu {
 
     /**
      * @return numberId
-     */
+     *//*
     public Integer getNumberId() {
-        return numberId;
+        return super.numberId;
     }
 
-    /**
+    *//**
      * @param numberId
-     */
+     *//*
     public void setNumberId(Integer numberId) {
         this.numberId = numberId;
-    }
+    }*/
 }
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java
index ce87ca873787add55479c74232bbe4260c19ccd2..527b4e72f1b3565b98ede7278a7b755b2827b890 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java
@@ -37,9 +37,23 @@ public interface DataSubmitMapper {
     List<DataSubmit> selectMine(DataSubmit dataSubmit);
 
     /**
-     * 根据ID 更新提交的信息
-     * @param dataSubmit 更新的数据集合，通常dataSubmit一次查询只包含submitor或者approver中的一个。
+     * 根据当前用户统计所有任务个数
+     * @param dataSubmit 通常dataSubmit一次查询只包含submitor或者approver中的一个。
      * @return 反馈查询到的数据个数
      * */
     Integer countMine(DataSubmit dataSubmit);
+
+    /**
+     * 根据当前用户统计所有任务个数
+     * @param dataSubmit 通常dataSubmit一次查询只包含submitor或者approver中的一个。
+     * @return 反馈查询到的数据个数
+     * */
+    Integer countByStatusAndUser(DataSubmit dataSubmit);
+
+    /**
+     * 根据当前用户统计所有任务个数
+     * @param ds 通常dataSubmit一次查询只包含submitor或者approver中的一个。
+     * @return 反馈查询到的数据记录
+     * */
+    List<DataSubmit> selectByStatusAndUser(DataSubmit ds);
 }
diff --git a/src/main/java/com/cetc32/dh/service/DataSubmitService.java b/src/main/java/com/cetc32/dh/service/DataSubmitService.java
index c1e5a5b1c7173d3c73a4a9013e92f72a6f71d109..4e1ce5f389c2aa97b6c9a34533a8ed39dd47e792 100644
--- a/src/main/java/com/cetc32/dh/service/DataSubmitService.java
+++ b/src/main/java/com/cetc32/dh/service/DataSubmitService.java
@@ -50,9 +50,30 @@ public interface DataSubmitService {
     public List<DataSubmit> selectMyApprove(DataSubmit dataSubmit);
 
     /**
-     * 根据ID 更新提交的信息
-     * @param dataSubmit 更新的数据集合，通常dataSubmit一次查询只包含submitor或者approver中的一个。
+     * 根据当前用户统计所有任务个数
+     * @param dataSubmit 通常dataSubmit一次查询只包含submitor。
      * @return 反馈查询到的数据个数
      * */
-    public Integer countMine(DataSubmit dataSubmit);
+    Integer countMineSubmit(DataSubmit dataSubmit);
+
+    /**
+     * 根据当前用户统计所有任务个数
+     * @param dataSubmit 通常dataSubmit一次查询只包含approver。
+     * @return 反馈查询到的数据个数
+     * */
+    Integer countMineApprov(DataSubmit dataSubmit);
+
+    /**
+     * 查询当前登陆用户需要审核的提交信息
+     * @param dataSubmit 待查询的数据
+     * @return 反馈查询到的结果
+     * **/
+    public List<DataSubmit> selectReadyApprove(DataSubmit dataSubmit);
+
+    /**
+     * 根据当前用户统计所有任务个数
+     * @param dataSubmit 通常dataSubmit一次查询只包含submitor。
+     * @return 反馈查询到的数据个数
+     * */
+    Integer countReadyApprove(DataSubmit dataSubmit);
 }
diff --git a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
index dd988928d5064f50c010e1dff31a58c6b1e0d0bd..f6fe8812632f74a5777cdd35b91d7372b592fe57 100644
--- a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
@@ -12,7 +12,7 @@ package com.cetc32.dh.service.impl;
 import com.cetc32.dh.entity.DataSubmit;
 import com.cetc32.dh.mybatis.DataSubmitMapper;
 import com.cetc32.dh.service.DataSubmitService;
-import com.google.inject.internal.cglib.core.$DefaultGeneratorStrategy;
+import org.apache.shiro.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
@@ -111,23 +111,60 @@ public class DataSubmitServiceImpl implements DataSubmitService {
         if(dataSubmit==null){
             return null;
         }
-        dataSubmit.setSumbitor(null);
+        dataSubmit.setSubmitor(null);
         return dsMapper.selectMine(dataSubmit);
     }
 
+
     /**
-     * 根据ID 更新提交的信息
-     * @param dataSubmit 更新的数据集合，通常dataSubmit一次查询只包含submitor或者approver中的一个。
+     * 根据当前用户统计所有任务个数
+     * @param dataSubmit 通常dataSubmit一次查询只包含submitor。
      * @return 反馈查询到的数据个数
      * */
-    public Integer countMine(DataSubmit dataSubmit){
-        if(dataSubmit==null){
-            return null;
-        }
-        dataSubmit.setSumbitor(null);
+    public Integer countMineSubmit(DataSubmit dataSubmit){
+        Assert.notNull(dataSubmit);
+        if(null==dataSubmit.getSubmitor())
+            return -1;
+        dataSubmit.setApprover(null);
+        return dsMapper.countMine(dataSubmit);
+    }
+
+    /**
+     * 根据当前用户统计所有任务个数
+     * @param dataSubmit 通常dataSubmit一次查询只包含approver。
+     * @return 反馈查询到的数据个数
+     * */
+    public Integer countMineApprov(DataSubmit dataSubmit){
+        Assert.notNull(dataSubmit);
+        if(null==dataSubmit.getApprover())
+            return -1;
+        dataSubmit.setSubmitor(null);
         return dsMapper.countMine(dataSubmit);
     }
 
+    /**
+     * 查询当前登陆用户需要审核的提交信息
+     *
+     * @param dataSubmit 待查询的数据
+     * @return 反馈查询到的结果
+     **/
+    @Override
+    public List<DataSubmit> selectReadyApprove(DataSubmit dataSubmit) {
+
+        return dsMapper.selectByStatusAndUser(dataSubmit);
+    }
+
+    /**
+     * 根据当前用户统计所有任务个数
+     *
+     * @param dataSubmit 通常dataSubmit一次查询只包含submitor。
+     * @return 反馈查询到的数据个数
+     */
+    @Override
+    public Integer countReadyApprove(DataSubmit dataSubmit) {
+        return dsMapper.countByStatusAndUser(dataSubmit);
+    }
+
     /**
      * DataSubmitMapper注入方法，必须用@Autowired注解
      * @param dsMapper 待注入的bean
diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml
index d6c3f494dd9c1d3dbf66309cd1788d9c4b89d3bc..1d352bf4245885f43ec2d80fa8404052a6e645f6 100644
--- a/src/main/resources/mapper/DataSubmitMapper.xml
+++ b/src/main/resources/mapper/DataSubmitMapper.xml
@@ -132,5 +132,26 @@
       </if>
     </where>
   </select>
-
+  <select id="selectByStatusAndUser" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="com.cetc32.dh.entity.DataSubmit">
+    select * from data_submit
+    <where>
+      <if test="status!=null">
+        status = #{status}
+      </if>
+      <if test="approver!=null">
+        and approver = #{approver}
+      </if>
+    </where>
+  </select>
+  <select id="countByStatusAndUser" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="java.lang.Integer">
+    select count(*) from data_submit
+    <where>
+      <if test="status!=null">
+        status = #{status}
+      </if>
+      <if test="approver!=null">
+        and approver = #{approver}
+      </if>
+    </where>
+  </select>
 </mapper>
\ No newline at end of file