，

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

@@ -277,7 +277,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 		// TODO Auto-generated method stub
 		
 		JSONObject jsStr = JSONObject.parseObject(parameter);
-		String id = jsStr.getString("id");//audit表的id
+		String id = jsStr.getString("id");//audit表的每一条数据的id
 		Integer auditState = jsStr.getInteger("auditState");//审批的状态（1通过，2不通过）
 		//Integer toPeople = jsStr.getInteger("toPeople"); //下一个审批人的id
 		String auditTime = jsStr.getString("auditTime");
@@ -288,7 +288,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 		ProcessAudit processAudit = processAuditMapper.selectById(id);
 		
 	    
-		if(null != processAudit.getAuditState() && processAudit.getAuditState().equals(0)){ //审批状态 是0  就是第一次审批
+		if(processAudit.getResult().equals(1) && processAudit.getAuditState().equals(0)){ //审批状态 是0 而且是第一条数据  就是第一次审批
 			  //第一个人审批
 			
 			//获取审批人
@@ -318,7 +318,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 		        	ProcessAudit processAudit1 = new ProcessAudit();
 			        processAudit1.setMainId(processAudit.getMainId());
 			        //processAudit1.setAuditState(auditState);
-			        processAudit1.setOperationTime(processAudit.getOperationTime());
+			        //processAudit1.setOperationTime(processAudit.getOperationTime());
 			        processAudit1.setType(processAudit.getType());
 			        processAudit1.setHouseId(processAudit.getHouseId());
 			        processAudit1.setDepotId(processAudit.getDepotId());
@@ -328,6 +328,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 			        processAudit1.setAuditState(0);//已提交待审批
 			        processAudit1.setApplyPeople(processAudit.getApplyPeople());
 			        processAudit1.setProcessId(processAudit.getProcessId());
+			        processAudit1.setApplyTime(processAudit.getApplyTime());
 			        processAuditMapper.insert(processAudit1);
 		        }
 		}else{
@@ -547,7 +548,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 			
 			//第二个人审批 审批状态为2 3 (XX 第一条数据的状态是,2:审批不通过，3:审批完成进行中)
 			
-			ew.and(x->x.eq("result",1).ne("audit_state", 0).or().ne("result",1).le("audit_state", 2));
+			ew.and(x->x.eq("result",1).ne("audit_state", 0).or().ne("result",1).between("audit_state", 0,4));
 			
 			
 		}