|
|
@@ -326,24 +326,24 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
326
|
326
|
}
|
|
327
|
327
|
}else{
|
|
328
|
328
|
//第二个人审批
|
|
329
|
|
- //修改第一条数据的状态
|
|
330
|
|
- processAudit.setAuditState(auditState);
|
|
331
|
|
- //processAudit.setAuditTime(auditTime);
|
|
332
|
|
- processAudit.setOngoingStep(ongoingStep);
|
|
333
|
|
- processAuditMapper.updateById(processAudit); //更改此条数据的审批状态
|
|
334
|
|
- //修改第二条数据的状态、进行到哪一步、审批时间
|
|
|
329
|
+ //修改第一条数据的状态(历史数据的状态)
|
|
|
330
|
+ if((int)auditState>=3){
|
|
|
331
|
+ processAudit.setAuditState(1);
|
|
|
332
|
+ }else{
|
|
|
333
|
+ processAudit.setAuditState(auditState);
|
|
|
334
|
+ }
|
|
|
335
|
+ processAudit.setAuditTime(auditTime);
|
|
|
336
|
+ processAuditMapper.updateById(processAudit);
|
|
|
337
|
+ //修改第二条数据的状态、进行到哪一步、审批时间(最新的数据)
|
|
335
|
338
|
QueryWrapper<ProcessAudit> ew2 = new QueryWrapper<>();
|
|
336
|
339
|
ew2.eq("process_id", processAudit.getProcessId());
|
|
337
|
340
|
ew2.eq("type", processAudit.getType());
|
|
338
|
|
- ew2.eq("result", 0);//不是第一条记录
|
|
|
341
|
+ ew2.eq("result", 1);//是第一条记录
|
|
339
|
342
|
List<ProcessAudit> paList = processAuditMapper.selectList(ew2);
|
|
340
|
|
- if((int)auditState>=3){
|
|
341
|
|
- paList.get(0).setAuditState(1);
|
|
342
|
|
- }else{
|
|
343
|
|
- paList.get(0).setAuditState(auditState);
|
|
344
|
|
- }
|
|
|
343
|
+ paList.get(0).setAuditState(auditState);
|
|
|
344
|
+ paList.get(0).setOngoingStep(ongoingStep);
|
|
|
345
|
+ processAuditMapper.updateById(paList.get(0));
|
|
345
|
346
|
|
|
346
|
|
- paList.get(0).setAuditTime(auditTime);
|
|
347
|
347
|
}
|
|
348
|
348
|
|
|
349
|
349
|
}
|