|
@@ -65,15 +65,16 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
|
|
.like(!StringUtils.isEmpty(name), CostAccountShare::getResponsibilityName, name)
|
|
.like(!StringUtils.isEmpty(name), CostAccountShare::getResponsibilityName, name)
|
|
.orderByAsc(CostAccountShare::getShareLevel));
|
|
.orderByAsc(CostAccountShare::getShareLevel));
|
|
List<CostAccountShare> costAccountShareList = pages.getRecords();
|
|
List<CostAccountShare> costAccountShareList = pages.getRecords();
|
|
|
|
+
|
|
List<CostAccountShareVO> costAccountShareVOList = BeanUtil.convertList(costAccountShareList, CostAccountShareVO.class);
|
|
List<CostAccountShareVO> costAccountShareVOList = BeanUtil.convertList(costAccountShareList, CostAccountShareVO.class);
|
|
- getMessage(hospId, costAccountShareList);
|
|
|
|
|
|
+ getMessage(hospId, costAccountShareVOList);
|
|
//
|
|
//
|
|
PageUtils pageUtils = new PageUtils(pages);
|
|
PageUtils pageUtils = new PageUtils(pages);
|
|
pageUtils.setList(costAccountShareVOList);
|
|
pageUtils.setList(costAccountShareVOList);
|
|
return pageUtils;
|
|
return pageUtils;
|
|
}
|
|
}
|
|
|
|
|
|
- private void getMessage(Integer hospId, List<CostAccountShare> costAccountShareList) {
|
|
|
|
|
|
+ private void getMessage(Integer hospId, List<CostAccountShareVO> costAccountShareList) {
|
|
// 设置责任中心的数据 与 会计科目的数据从对应的id里面获取
|
|
// 设置责任中心的数据 与 会计科目的数据从对应的id里面获取
|
|
List<Responsibility> list = responsibilityService.list(new QueryWrapper<Responsibility>().lambda().eq(Responsibility::getHospId, hospId));
|
|
List<Responsibility> list = responsibilityService.list(new QueryWrapper<Responsibility>().lambda().eq(Responsibility::getHospId, hospId));
|
|
List<Accounting> accountingList = accountingService.list(new QueryWrapper<Accounting>().lambda().eq(Accounting::getHospId, hospId));
|
|
List<Accounting> accountingList = accountingService.list(new QueryWrapper<Accounting>().lambda().eq(Accounting::getHospId, hospId));
|
|
@@ -86,6 +87,7 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
|
|
i.setResponsibilityId(id);
|
|
i.setResponsibilityId(id);
|
|
i.setResponsibilityName(responsibilities.get(0).getResponsibilityName());
|
|
i.setResponsibilityName(responsibilities.get(0).getResponsibilityName());
|
|
i.setResponsibilityCode(responsibilities.get(0).getResponsibilityCode());
|
|
i.setResponsibilityCode(responsibilities.get(0).getResponsibilityCode());
|
|
|
|
+
|
|
}
|
|
}
|
|
Integer accountingId = i.getAccountingId();
|
|
Integer accountingId = i.getAccountingId();
|
|
if (accountingId>0){
|
|
if (accountingId>0){
|
|
@@ -94,6 +96,7 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
|
|
i.setAccountingId(accountingId);
|
|
i.setAccountingId(accountingId);
|
|
i.setAccountingName(accountingList1.get(0).getAccountingName());
|
|
i.setAccountingName(accountingList1.get(0).getAccountingName());
|
|
i.setAccountingCode(accountingList1.get(0).getAccountingCode());
|
|
i.setAccountingCode(accountingList1.get(0).getAccountingCode());
|
|
|
|
+ i.setAllParentIds(accountingList1.get(0).getAllParentIds());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|