待办

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

@@ -93,7 +93,7 @@ public class ProcessAuditController {
      * 待审批列表(待处理列表)
      * @throws Exception 
      */
-    @ApiOperation(value = "分页条件查询,userId必填", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\"condition\":\"{\'startTime\':\'\',\'endTime\':\'\',\'userId\':\'\'}\"}")
+    @ApiOperation(value = "分页条件查询,userId必填", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\"condition\":\"{\'userId\':\'\'}\"}")
     @PostMapping("/toDisposeList")
     public ResultView toDisposeList(@RequestBody PageParam pageParam) throws Exception {
         Page<ProcessAudit> page = processAuditService.toDisposeList(pageParam);

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

@@ -172,18 +172,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         }
 		
         ew.orderByDesc("id");
-        /*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);
         }
         
         Page<ProcessAudit> pageInfo  = processAuditMapper.selectPage(page, ew);
-        //PageInfo<ProcessAudit> pageInfo  = (PageInfo<ProcessAudit>) processAuditMapper.selectPage(page,ew);
-        //PageInfo<ProcessAudit> pageInfo = new PageInfo<>(page);
         return pageInfo;
 	}
 
@@ -241,9 +235,14 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         
 		org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
 		QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
-        ew.eq("to_people", object.getInt("userId"));
-        ew.eq("audit_state", 0);//已提交
-        //List<ProcessAudit> list = processAuditMapper.selectList(ew);
+		if(StringUtils.isNotBlank(object.optString("userId"))){
+			ew.eq("to_people", object.getInt("userId"));
+	        //ew.eq("audit_state", 0);//已提交
+	        ew.and(x->x.eq("audit_state", 0).or().isNull("audit_state"));
+	        
+	        //and(i -> i.eq(“name”, “李白”).ne(“status”, “活着”))—>and (name = ‘李白’ and status <> ‘活着’)
+	        
+		}
         ew.orderByDesc("id");
         
         Page page = new Page();
@@ -523,12 +522,13 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 		if(StringUtils.isNotBlank(object.optString("userId"))){
 			//如果是第一个审批人 则第一条数据中状态不为0(提交)
 			ew.eq("to_people",object.optString("userId"));
-			ew.eq("result",1);//整个流程的第一条数据
-			ew.ne("audit_state",0);
+			//ew.eq("result",1);//整个流程的第一条数据
+			//ew.ne("audit_state",0);
+			
+			//第二个人审批 审批状态为2 3 (XX 第一条数据的状态是,2:审批不通过，3:审批完成进行中)
+			
+			ew.and(x->x.eq("result",1).ne("audit_state", 0).or().ne("result",1).ge("audit_state", 2));
 			
-			//第二个人审批 则 第一条数据的状态是,2:审批不通过，3:审批完成进行中
-			//ew.or("", consumer)
-			//ew.ne("result", 1);//不是第一条数据
 			
 		}