|
@ -506,6 +506,15 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate |
|
|
} else {//上传状态:已上传
|
|
|
} else {//上传状态:已上传
|
|
|
record.setUploadState("1"); |
|
|
record.setUploadState("1"); |
|
|
} |
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) { |
|
|
|
|
|
if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) { |
|
|
|
|
|
record.setSecondCheckState("是"); |
|
|
|
|
|
} else { |
|
|
|
|
|
record.setSecondCheckState("否"); |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
record.setSecondCheckState("否"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
return p; |
|
|
return p; |
|
|