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

更改

master
ligaode 2 months ago
parent
29fc97f146
commit
035e138eee
2 changed files with 21 additions and 13 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. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  2. 30
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

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

@ -1631,6 +1631,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
qw.eq("adjustmentState", 0);
qw.eq("state", 2);
qw.eq("onceCheckState", 0);
qw.and(wrapper -> wrapper.eq("uploadDate", "")
.or().isNull("uploadDate")
);
qw.orderByDesc("createTime");
List<OneExcelVo> oneExcelVos = baseMapper.excelListOne(qw);
for (OneExcelVo oneExcelVo : oneExcelVos) {
@ -1700,6 +1703,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
);
qw.ne("adjustmentState", 0);
qw.eq("state", 2);
qw.ne("uploadDate", "");
qw.isNotNull("uploadDate");
qw.orderByDesc("createTime");
List<TwoExcelVo> twoExcelVos = baseMapper.excelListTwo(qw);

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

@ -158,7 +158,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmVehRebateVo record : pagging.getRecords()) {
if ("001".equals(record.getCalculationModeKey())){
if ("001".equals(record.getCalculationModeKey())) {
record.setCalculationStandard(record.getCalculationStandard() + "%");
}
}
@ -240,7 +240,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
qw.orderByDesc("createTime");
List<ScmVehRebateVo> scmVehRebateVoList = baseMapper.listAll(qw);
for (ScmVehRebateVo record : scmVehRebateVoList) {
if ("001".equals(record.getCalculationModeKey())){
if ("001".equals(record.getCalculationModeKey())) {
record.setCalculationStandard(record.getCalculationStandard() + "%");
}
}
@ -524,6 +524,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
qw.eq("adjustmentState", 0);
qw.eq("state", 2);
qw.eq("onceCheckState", 0);
qw.and(wrapper -> wrapper.eq("uploadDate", "")
.or().isNull("uploadDate")
);
qw.orderByDesc("createTime");
List<OneExcelVo> oneExcelVos = baseMapper.excelListOne(qw);
for (OneExcelVo oneExcelVo : oneExcelVos) {
@ -602,6 +605,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
);
qw.ne("adjustmentState", 0);
qw.eq("state", 2);
qw.ne("uploadDate", "");
qw.isNotNull("uploadDate");
qw.orderByDesc("createTime");
List<TwoExcelVo> twoExcelVos = baseMapper.excelListTwo(qw);
@ -692,7 +696,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
scmVehRebate.setUseOrgName(sysOrganizationVo.getName());
scmVehRebate.setOrgPath(dto.getOrgPath());
scmVehRebate.setCreateBySid(dto.getCreateBySid());
if (!"2".equals(scmVehRebateVeh.getState())){
if (!"2".equals(scmVehRebateVeh.getState())) {
scmVehRebate.setState(0);
}
scmVehRebate.setPurchaseSystemSid(scmVehRebateVeh.getPurchaseSystemSid());
@ -2185,29 +2189,29 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
qw.orderByDesc("createTime");
List<ScmVehRebateExcelVo> scmVehRebateExcelVos = baseMapper.excelList(qw);
for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) {
if (scmVehRebateExcelVo.getState().equals("0")){
if (scmVehRebateExcelVo.getState().equals("0")) {
scmVehRebateExcelVo.setState("未预提");
}else if (scmVehRebateExcelVo.getState().equals("1")){
} else if (scmVehRebateExcelVo.getState().equals("1")) {
scmVehRebateExcelVo.setState("预提中");
}else if (scmVehRebateExcelVo.getState().equals("2")){
} else if (scmVehRebateExcelVo.getState().equals("2")) {
scmVehRebateExcelVo.setState("待核对");
}else if (scmVehRebateExcelVo.getState().equals("3")){
} else if (scmVehRebateExcelVo.getState().equals("3")) {
scmVehRebateExcelVo.setState("核对中");
}else if (scmVehRebateExcelVo.getState().equals("4")){
} else if (scmVehRebateExcelVo.getState().equals("4")) {
scmVehRebateExcelVo.setState("已核对");
}
if (scmVehRebateExcelVo.getOnceCheckState().equals("0")){
if (scmVehRebateExcelVo.getOnceCheckState().equals("0")) {
scmVehRebateExcelVo.setOnceCheckState("否");
}else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")){
} else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")) {
scmVehRebateExcelVo.setOnceCheckState("是");
}else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")){
} else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")) {
scmVehRebateExcelVo.setOnceCheckState("一次核对中");
}
scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime())));
if ("是".equals(scmVehRebateExcelVo.getIsAdjustment())){
if ("是".equals(scmVehRebateExcelVo.getIsAdjustment())) {
scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost()));
scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost()));
}else {
} else {
scmVehRebateExcelVo.setTreatAdjustmentMoney(BigDecimal.ZERO);
scmVehRebateExcelVo.setSuppAdjustmentMoney(BigDecimal.ZERO);
}

Write Preview
Loading…
Cancel
Save