fix 收入支出合同,正确回显存档和审核信息中的人名
This commit is contained in:
+14
@@ -599,8 +599,22 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
|
||||
});
|
||||
// 获取存档记录
|
||||
listArchive = listAll.stream().filter(p->Objects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList());
|
||||
listArchive.forEach(p -> {
|
||||
String name = p.getCreateBy();
|
||||
LoginUser user = sysBaseAPI.getUserByName(name);
|
||||
if (user != null){
|
||||
p.setCreateBy(user.getRealname());
|
||||
}
|
||||
});
|
||||
// 获取审核记录
|
||||
listAudit = listAll.stream().filter(p->!Objects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList());
|
||||
listAudit.forEach(p -> {
|
||||
String name = p.getCreateBy();
|
||||
LoginUser user = sysBaseAPI.getUserByName(name);
|
||||
if (user != null){
|
||||
p.setCreateBy(user.getRealname());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
String str = JSON.toJSONString(payIncomeContract);
|
||||
|
||||
+14
@@ -310,8 +310,22 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
|
||||
});
|
||||
// 获取存档记录
|
||||
listArchive = listAll.stream().filter(p->Objects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList());
|
||||
listArchive.forEach(p -> {
|
||||
String name = p.getCreateBy();
|
||||
LoginUser user = sysBaseAPI.getUserByName(name);
|
||||
if (user != null){
|
||||
p.setCreateBy(user.getRealname());
|
||||
}
|
||||
});
|
||||
// 获取审核记录
|
||||
listAudit = listAll.stream().filter(p->!Objects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList());
|
||||
listAudit.forEach(p -> {
|
||||
String name = p.getCreateBy();
|
||||
LoginUser user = sysBaseAPI.getUserByName(name);
|
||||
if (user != null){
|
||||
p.setCreateBy(user.getRealname());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if(!CollectionUtils.isEmpty(listArchive)){
|
||||
|
||||
Reference in New Issue
Block a user