yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改

zhanglei
ligaode 2 months ago
parent
1c874cdef9
commit
0463c2bb86
2 changed files with 40 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  2. 24
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

24
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
View File

@ -1424,13 +1424,21 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
}
}
if (StringUtils.isBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
checkWord.add("上传日期不能为空");
break;
if (new BigDecimal(excelInfo.getUploadMoney()).compareTo(BigDecimal.ZERO) != 0){
checkWord.add("上传日期不能为空");
break;
}
}
if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isBlank(excelInfo.getUploadMoney())) {
checkWord.add("上传金额不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())){
if (new BigDecimal(excelInfo.getUploadMoney()).compareTo(BigDecimal.ZERO) == 0){
checkWord.add("上传金额不能为0");
break;
}
}
if (StringUtils.isNotBlank(excelInfo.getUploadDate())) {
String uploadDate = "";
if (isNumber(excelInfo.getUploadDate())) {
@ -1965,13 +1973,21 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
}
}
if (StringUtils.isBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
checkWord.add("二次上传日期不能为空");
break;
if (new BigDecimal(excelInfo.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) != 0){
checkWord.add("二次上传日期不能为空");
break;
}
}
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isBlank(excelInfo.getSecondaryUploadMoney())) {
checkWord.add("二次上传金额不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())){
if (new BigDecimal(excelInfo.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 0){
checkWord.add("二次上传金额不能为0");
break;
}
}
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate())) {
String secondaryUploadDate = "";
if (isNumber(excelInfo.getSecondaryUploadDate())) {

24
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
View File

@ -1784,13 +1784,21 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
}
if (StringUtils.isBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
checkWord.add("上传日期不能为空");
break;
if (new BigDecimal(excelInfo.getUploadMoney()).compareTo(BigDecimal.ZERO) != 0){
checkWord.add("上传日期不能为空");
break;
}
}
if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isBlank(excelInfo.getUploadMoney())) {
checkWord.add("上传金额不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())){
if (new BigDecimal(excelInfo.getUploadMoney()).compareTo(BigDecimal.ZERO) == 0){
checkWord.add("上传金额不能为0");
break;
}
}
if (StringUtils.isNotBlank(excelInfo.getUploadDate())) {
String uploadDate = "";
if (isNumber(excelInfo.getUploadDate())) {
@ -2281,13 +2289,21 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
}
if (StringUtils.isBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
checkWord.add("二次上传日期不能为空");
break;
if (new BigDecimal(excelInfo.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) != 0){
checkWord.add("二次上传日期不能为空");
break;
}
}
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isBlank(excelInfo.getSecondaryUploadMoney())) {
checkWord.add("二次上传金额不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())){
if (new BigDecimal(excelInfo.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 0){
checkWord.add("二次上传金额不能为0");
break;
}
}
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate())) {
String secondaryUploadDate = "";
if (isNumber(excelInfo.getSecondaryUploadDate())) {

Write Preview
Loading…
Cancel
Save