|
|
@@ -326,10 +326,24 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
326
|
326
|
}
|
|
327
|
327
|
}else{
|
|
328
|
328
|
//第二个人审批
|
|
|
329
|
+ //修改第一条数据的状态
|
|
329
|
330
|
processAudit.setAuditState(auditState);
|
|
330
|
|
- processAudit.setAuditTime(auditTime);
|
|
|
331
|
+ //processAudit.setAuditTime(auditTime);
|
|
331
|
332
|
processAudit.setOngoingStep(ongoingStep);
|
|
332
|
333
|
processAuditMapper.updateById(processAudit); //更改此条数据的审批状态
|
|
|
334
|
+ //修改第二条数据的状态、进行到哪一步、审批时间
|
|
|
335
|
+ QueryWrapper<ProcessAudit> ew2 = new QueryWrapper<>();
|
|
|
336
|
+ ew2.eq("process_id", processAudit.getProcessId());
|
|
|
337
|
+ ew2.eq("type", processAudit.getType());
|
|
|
338
|
+ ew2.eq("result", 0);//不是第一条记录
|
|
|
339
|
+ 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
|
+ }
|
|
|
345
|
+
|
|
|
346
|
+ paList.get(0).setAuditTime(auditTime);
|
|
333
|
347
|
}
|
|
334
|
348
|
|
|
335
|
349
|
}
|
|
|
@@ -443,7 +457,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
443
|
457
|
//已审批
|
|
444
|
458
|
pbList.get(1).setContent(list.get(0).getToPeople());
|
|
445
|
459
|
pbList.get(1).setAuditTime(list.get(0).getAuditTime());
|
|
446
|
|
- pbList.get(1).setAuditStuts(list.get(0).getAuditState());
|
|
|
460
|
+ if((int)list.get(0).getAuditState()>=3){
|
|
|
461
|
+ pbList.get(1).setAuditStuts(1);
|
|
|
462
|
+ }else{
|
|
|
463
|
+ pbList.get(1).setAuditStuts(list.get(0).getAuditState());
|
|
|
464
|
+ }
|
|
|
465
|
+
|
|
447
|
466
|
if(list.size()>1){
|
|
448
|
467
|
pbList.get(2).setContent(list.get(1).getToPeople());
|
|
449
|
468
|
pbList.get(2).setAuditTime(list.get(1).getAuditTime());
|