。。

src/main/java/com/unissoft/ventilation/controller/ProcessAuditController.java

@@ -4,6 +4,8 @@ package com.unissoft.ventilation.controller;
 import java.util.List;
 import java.util.Map;
 
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -57,7 +59,7 @@ public class ProcessAuditController {
     @ApiOperation(value = "分页条件查询", notes = "提交参数(type必填)：{\"pageIndex\":1,\"pageSize\":10,  \"condition\":\"{\'type\':\'\',\'startTime\':\'\',\'endTime\':\'\'}\"}")
     @PostMapping("/getPage")
     public ResultView getPage(@RequestBody PageParam pageParam) throws Exception{
-        PageInfo<ProcessAudit> page = processAuditService.getPage(pageParam);
+    	Page<ProcessAudit> page = processAuditService.getPage(pageParam);
         return ResultView.success(page);
     }
     
@@ -94,7 +96,7 @@ public class ProcessAuditController {
     @ApiOperation(value = "分页条件查询,userId必填", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\"condition\":\"{\'startTime\':\'\',\'endTime\':\'\',\'userId\':\'\'}\"}")
     @PostMapping("/toDisposeList")
     public ResultView toDisposeList(@RequestBody PageParam pageParam) throws Exception {
-        PageInfo<ProcessAudit> page = processAuditService.toDisposeList(pageParam);
+        Page<ProcessAudit> page = processAuditService.toDisposeList(pageParam);
         return ResultView.success(page);
     }
     
@@ -129,4 +131,30 @@ public class ProcessAuditController {
     	Map<String,Object> map = processAuditService.getDataByProcessId(processId);
         return ResultView.success(map);
     }
+    
+    /**
+     * 待办列表(已发起)
+     * 申请人是当前登录人
+     * @throws Exception 
+     */
+    @ApiOperation(value = "分页条件查询,userId必填", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\"condition\":\"{\'userId\':\'\'}\"}")
+    @PostMapping("/applyList")
+    public ResultView applyList(@RequestBody PageParam pageParam) throws Exception {
+        Page<ProcessAudit> page = processAuditService.applyList(pageParam);
+        return ResultView.success(page);
+    }
+    
+    
+    /**
+     * 待办列表(已处理)
+     * 申请人是当前登录人
+     * @throws Exception 
+     */
+    @ApiOperation(value = "分页条件查询,userId必填", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\"condition\":\"{\'userId\':\'\'}\"}")
+    @PostMapping("/completeList")
+    public ResultView completeList(@RequestBody PageParam pageParam) throws Exception {
+        Page<ProcessAudit> page = processAuditService.completeList(pageParam);
+        return ResultView.success(page);
+    }
+    
 }

src/main/java/com/unissoft/ventilation/service/ProcessAuditService.java

@@ -2,12 +2,15 @@ package com.unissoft.ventilation.service;
 
 import com.unissoft.model.ProcessAudit;
 import com.unissoft.result.PageParam;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 
 import java.util.List;
 import java.util.Map;
 
+import org.json.JSONException;
+
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.pagehelper.PageInfo;
 
 /**
  * <p>
@@ -21,13 +24,13 @@ public interface ProcessAuditService extends IService<ProcessAudit> {
 
 	void add(String parameter);
 
-	PageInfo<ProcessAudit> getPage(PageParam pageParam)throws Exception;
+	Page<ProcessAudit> getPage(PageParam pageParam)throws Exception;
 
 	List<Map<String, Object>> getAllById(Integer id);
 
 	void deleteById(Integer id);
 
-	PageInfo<ProcessAudit> toDisposeList(PageParam pageParam)throws Exception;
+	Page<ProcessAudit> toDisposeList(PageParam pageParam)throws Exception;
 
 	void audit(String parameter);
 
@@ -35,4 +38,8 @@ public interface ProcessAuditService extends IService<ProcessAudit> {
 
 	Map<String, Object> getDataByProcessId(String processId);
 
+	Page<ProcessAudit> applyList(PageParam pageParam) throws JSONException;
+
+	Page<ProcessAudit> completeList(PageParam pageParam) throws JSONException;
+
 }

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -1,6 +1,7 @@
 package com.unissoft.ventilation.service.impl;
 
 import com.unissoft.model.BasicsWarehouse;
+import com.unissoft.model.GrainConditionRecord;
 import com.unissoft.model.ProcessAudit;
 import com.unissoft.model.ProcessBasis;
 import com.unissoft.model.ProcessBasisSon;
@@ -21,10 +22,13 @@ import com.unissoft.ventilation.service.ProcessBasisService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Maps;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -138,11 +142,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 	
 	
 	@Override
-	public PageInfo<ProcessAudit> getPage(PageParam pageParam) throws JSONException {
+	public Page<ProcessAudit> getPage(PageParam pageParam) throws JSONException {
 		// TODO Auto-generated method stub
 		Integer pageIndex = pageParam.getPageIndex();
         Integer pageSize = pageParam.getPageSize();
-       // HashMap<String, Object> map = Maps.newHashMap();
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
         ew.eq("result", 1);//取第一条数据
         if (!StringUtils.isEmpty(pageParam.getCondition())) {
@@ -169,11 +172,18 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         }
 		
         ew.orderByDesc("id");
-        if (pageIndex != MyConstant.ZERO && pageSize != MyConstant.ZERO) {
+        /*if (pageIndex != MyConstant.ZERO && pageSize != MyConstant.ZERO) {
             PageHelper.startPage(pageIndex, pageSize);
+        }*/
+        
+        Page page = new Page();
+        if (pageIndex != MyConstant.ZERO && pageSize != MyConstant.ZERO) {
+            page = new Page(pageIndex, pageSize);
         }
-        List<ProcessAudit> page = processAuditMapper.selectList(ew);
-        PageInfo<ProcessAudit> pageInfo = new PageInfo<>(page);
+        
+        Page<ProcessAudit> pageInfo  = processAuditMapper.selectPage(page, ew);
+        //PageInfo<ProcessAudit> pageInfo  = (PageInfo<ProcessAudit>) processAuditMapper.selectPage(page,ew);
+        //PageInfo<ProcessAudit> pageInfo = new PageInfo<>(page);
         return pageInfo;
 	}
 
@@ -222,7 +232,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
 
 	@Override
-	public PageInfo<ProcessAudit> toDisposeList(PageParam pageParam) throws JSONException {
+	public Page<ProcessAudit> toDisposeList(PageParam pageParam) throws JSONException {
 		// TODO Auto-generated method stub
 		
 		Integer pageIndex = pageParam.getPageIndex();
@@ -233,10 +243,16 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 		QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
         ew.eq("to_people", object.getInt("userId"));
         ew.eq("audit_state", 0);//已提交
-        List<ProcessAudit> list = processAuditMapper.selectList(ew);
+        //List<ProcessAudit> list = processAuditMapper.selectList(ew);
+        ew.orderByDesc("id");
         
-        if(list.size()>0){
-        	for (ProcessAudit processAudit : list) {
+        Page page = new Page();
+        if (pageIndex != MyConstant.ZERO && pageSize != MyConstant.ZERO) {
+            page = new Page(pageIndex, pageSize);
+        }
+        Page<ProcessAudit> pageInfo  = processAuditMapper.selectPage(page, ew);
+        if(pageInfo.getTotal()>0){
+        	for (ProcessAudit processAudit : pageInfo.getRecords()) {
             	//根据仓房id获取仓房名称
             	BasicsWarehouse ware = systemFeign.getByIdHouse(processAudit.getHouseId());
             	if(null != ware){
@@ -254,12 +270,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             	
     		}
         }
-        ew.orderByDesc("id");
-        if (pageIndex != MyConstant.ZERO && pageSize != MyConstant.ZERO) {
-            PageHelper.startPage(pageIndex, pageSize);
-        }
-        List<ProcessAudit> page = processAuditMapper.selectList(ew);
-        PageInfo<ProcessAudit> pageInfo = new PageInfo<>(page);
 		return pageInfo;
 	}
 
@@ -444,4 +454,84 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 		return map;
 	}
 
+
+	@Override
+	public Page<ProcessAudit> applyList(PageParam pageParam) throws JSONException {
+		// TODO Auto-generated method stub
+		
+		Integer pageIndex = pageParam.getPageIndex();
+        Integer pageSize = pageParam.getPageSize();
+        
+		QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
+		org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
+		if(StringUtils.isNotBlank(object.optString("userId"))){
+			ew.eq("apply_people",object.optString("userId"));
+		}
+		ew.eq("result",1);//整个流程的第一条数据
+		ew.orderByDesc("id");
+		
+		Page page = new Page();
+	    if (pageIndex != MyConstant.ZERO && pageSize != MyConstant.ZERO) {
+	            page = new Page(pageIndex, pageSize);
+	    }
+	        
+        Page<ProcessAudit> pageInfo  = processAuditMapper.selectPage(page, ew);
+        
+        
+        if(pageInfo.getTotal()>0){
+        	for (ProcessAudit processAudit : pageInfo.getRecords()) {
+            	//根据仓房id获取仓房名称
+            	BasicsWarehouse ware = systemFeign.getByIdHouse(processAudit.getHouseId());
+            	if(null != ware){
+            		processAudit.setHouseName(ware.gethName());
+            	}
+            	//BasicsWarehouse ware = (BasicsWarehouse) resultView.getData();
+            	//全局获取当前登录人的信息
+            	SysUserPO currUserInfo = UserUtils.getCurrUserInfo();
+            	//赋值
+            	if(null != currUserInfo){
+            		processAudit.setApplyName(currUserInfo.getuName());
+                	processAudit.setCompanyName(currUserInfo.getCompanyName());
+                	processAudit.setDepartmentName(currUserInfo.getDepartmentName());
+            	}
+            	
+    		}
+        }
+        
+		return pageInfo;
+	}
+
+
+	@Override
+	public Page<ProcessAudit> completeList(PageParam pageParam) throws JSONException {
+		// TODO Auto-generated method stub
+		
+		Integer pageIndex = pageParam.getPageIndex();
+        Integer pageSize = pageParam.getPageSize();
+        
+        
+		QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
+		org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
+		if(StringUtils.isNotBlank(object.optString("userId"))){
+			//如果是第一个审批人 则第一条数据中状态不为0(提交)
+			ew.eq("to_people",object.optString("userId"));
+			ew.eq("result",1);//整个流程的第一条数据
+			ew.ne("audit_state",0);
+			
+			//第二个人审批 则 第一条数据的状态是,2:审批不通过，3:审批完成进行中
+			//ew.or("", consumer)
+			//ew.ne("result", 1);//不是第一条数据
+			
+		}
+		
+		ew.orderByDesc("id");
+		Page page = new Page();
+	    if (pageIndex != MyConstant.ZERO && pageSize != MyConstant.ZERO) {
+	            page = new Page(pageIndex, pageSize);
+	    }
+        Page<ProcessAudit> pageInfo  = processAuditMapper.selectPage(page, ew);
+        
+		return pageInfo;
+	}
+
 }