|
@@ -266,7 +266,7 @@ public class GeneralAuditInfoServiceImpl extends ServiceImpl<GeneralAuditInfoMap
|
|
List<GeneralAuditInfo> dataList = baseMapper.getPrintListByCondition(pageView);
|
|
List<GeneralAuditInfo> dataList = baseMapper.getPrintListByCondition(pageView);
|
|
if (!CollectionUtils.isEmpty(dataList)) {
|
|
if (!CollectionUtils.isEmpty(dataList)) {
|
|
for (GeneralAuditInfo generalAuditInfo1:dataList){
|
|
for (GeneralAuditInfo generalAuditInfo1:dataList){
|
|
- if ("费用审核".equals(generalAuditInfo1.getType())){
|
|
|
|
|
|
+ if ("费用审核".equals(generalAuditInfo1.getType())||"运费结算".equals(generalAuditInfo1.getType())){
|
|
ExpenseInfo expenseInfo=expenseInfoService.selectById(generalAuditInfo1.getId());
|
|
ExpenseInfo expenseInfo=expenseInfoService.selectById(generalAuditInfo1.getId());
|
|
if (expenseInfo != null) {
|
|
if (expenseInfo != null) {
|
|
generalAuditInfo1.setPayerHeader(expenseInfo.getPayerHeader());
|
|
generalAuditInfo1.setPayerHeader(expenseInfo.getPayerHeader());
|