|
|
@ -170,6 +170,11 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
qw.orderByDesc("createTime"); |
|
|
|
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
for (ScmVehRebateVo record : pagging.getRecords()) { |
|
|
|
if ("001".equals(record.getCalculationModeKey())){ |
|
|
|
record.setCalculationStandard(record.getCalculationStandard() + "%"); |
|
|
|
} |
|
|
|
} |
|
|
|
PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
@ -2026,6 +2031,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
}else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")){ |
|
|
|
scmVehRebateExcelVo.setOnceCheckState("一次核对中"); |
|
|
|
} |
|
|
|
if ("比例".equals(scmVehRebateExcelVo.getCalculationModeValue())){ |
|
|
|
scmVehRebateExcelVo.setCalculationStandard(scmVehRebateExcelVo.getCalculationStandard() + "%"); |
|
|
|
} |
|
|
|
} |
|
|
|
return scmVehRebateExcelVos; |
|
|
|
} |
|
|
|