From 495ef9340b7b67ba79e95a71a2728638ac917802 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 22 Jan 2025 10:12:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialRebateDetailsVo.java | 2 ++ .../ScmSpecialRebateExcelVo.java | 4 ++++ .../SpecialRebateCheckExcelVo.java | 4 ++++ .../api/scmvehrebate/ScmVehRebateExcelVo.java | 4 ++++ .../ScmVehrebateCheckapplyFeign.java | 1 - .../VehRebateCheckExcelVo.java | 4 ++++ .../ScmSpecialRebateService.java | 22 +++++++++++++++++++ .../ScmSpecialrebateCheckapplyRest.java | 18 +++++++++++++++ .../biz/scmvehrebate/ScmVehRebateMapper.xml | 2 +- .../biz/scmvehrebate/ScmVehRebateService.java | 19 ++++++++++++++++ .../ScmVehrebateCheckapplyRest.java | 18 +++++++++++++++ 11 files changed, 96 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java index 2e9e0e4aac..6bdf52cc1e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java @@ -122,6 +122,8 @@ public class ScmSpecialRebateDetailsVo implements Vo { @ApiModelProperty("预计抵顶费用说明") private String expectSuppRemark; + @ApiModelProperty("一次核对状态") + private Integer onceCheckState; @ApiModelProperty("一次支出费用") private BigDecimal onceItureCost; @ApiModelProperty("一次待支付费用") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java index f8152cd620..05891e42f3 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java @@ -36,6 +36,10 @@ public class ScmSpecialRebateExcelVo { @ExportEntityMap(CnName = "序号", EnName = "rankNo") private Integer rankNo; + @ExportEntityMap(CnName = "状态", EnName = "state") + private String state; + @ExportEntityMap(CnName = "一次核对状态", EnName = "onceCheckState") + private String onceCheckState; @ExportEntityMap(CnName = "分公司", EnName = "createOrgName") private String createOrgName; @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java index 328d6bba3d..b0875340bd 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java @@ -36,6 +36,10 @@ public class SpecialRebateCheckExcelVo { @ExportEntityMap(CnName = "序号", EnName = "rankNo") private Integer rankNo; + @ExportEntityMap(CnName = "状态", EnName = "state") + private String state; + @ExportEntityMap(CnName = "一次核对状态", EnName = "onceCheckState") + private String onceCheckState; @ExportEntityMap(CnName = "分公司", EnName = "createOrgName") private String createOrgName; @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java index 277436465e..e36ae083e5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java @@ -35,6 +35,10 @@ public class ScmVehRebateExcelVo { @ExportEntityMap(CnName = "序号", EnName = "rankNo") private Integer rankNo; + @ExportEntityMap(CnName = "状态", EnName = "state") + private String state; + @ExportEntityMap(CnName = "一次核对状态", EnName = "onceCheckState") + private String onceCheckState; @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") private String purchaseSystemName; @ExportEntityMap(CnName = "品牌", EnName = "brandName") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java index 8cec8f23c9..ed7012ece5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java @@ -66,7 +66,6 @@ public interface ScmVehrebateCheckapplyFeign { @PostMapping("/rePushVoucher") public ResultBean rePushVoucher(@RequestParam("sid") String sid); - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java index 1ff427da5f..df6e921293 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java @@ -36,6 +36,10 @@ public class VehRebateCheckExcelVo { @ExportEntityMap(CnName = "序号", EnName = "rankNo") private Integer rankNo; + @ExportEntityMap(CnName = "状态", EnName = "state") + private String state; + @ExportEntityMap(CnName = "一次核对状态", EnName = "onceCheckState") + private String onceCheckState; @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") private String purchaseSystemName; @ExportEntityMap(CnName = "品牌", EnName = "brandName") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index e82abc234a..84e08a3853 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -1635,6 +1635,28 @@ public class ScmSpecialRebateService extends MybatisBaseService scmSpecialRebateExcelVos = baseMapper.excelList(qw); for (ScmSpecialRebateExcelVo scmSpecialRebateExcelVo : scmSpecialRebateExcelVos) { + if (scmSpecialRebateExcelVo.getState().equals("0")){ + scmSpecialRebateExcelVo.setState("未预提"); + }else if (scmSpecialRebateExcelVo.getState().equals("1")){ + scmSpecialRebateExcelVo.setState("预提中"); + }else if (scmSpecialRebateExcelVo.getState().equals("2")){ + scmSpecialRebateExcelVo.setState("待核对"); + }else if (scmSpecialRebateExcelVo.getState().equals("3")){ + scmSpecialRebateExcelVo.setState("核对中"); + }else if (scmSpecialRebateExcelVo.getState().equals("4")){ + scmSpecialRebateExcelVo.setState("已核对"); + }else if (scmSpecialRebateExcelVo.getState().equals("5")){ + scmSpecialRebateExcelVo.setState("分配中"); + }else if (scmSpecialRebateExcelVo.getState().equals("6")){ + scmSpecialRebateExcelVo.setState("已分配"); + } + if (scmSpecialRebateExcelVo.getOnceCheckState().equals("0")){ + scmSpecialRebateExcelVo.setOnceCheckState("否"); + }else if (scmSpecialRebateExcelVo.getOnceCheckState().equals("1")){ + scmSpecialRebateExcelVo.setOnceCheckState("是"); + }else if (scmSpecialRebateExcelVo.getOnceCheckState().equals("2")){ + scmSpecialRebateExcelVo.setOnceCheckState("一次核对中"); + } scmSpecialRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmSpecialRebateExcelVo.getCreateTime()))); scmSpecialRebateExcelVo.setItureAdjustmentMoney(scmSpecialRebateExcelVo.getOnceItureCost().add(scmSpecialRebateExcelVo.getSecondItureCost()).subtract(scmSpecialRebateExcelVo.getExpectItureCost())); scmSpecialRebateExcelVo.setTreatAdjustmentMoney(scmSpecialRebateExcelVo.getOnceTreatCost().add(scmSpecialRebateExcelVo.getSecondTreatCost()).subtract(scmSpecialRebateExcelVo.getExpectTreatCost())); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java index ae097cbd7e..a17e0bdcd2 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java @@ -126,6 +126,24 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl excelVo.setItureAdjustmentMoney(excelVo.getOnceItureCost().add(excelVo.getSecondItureCost()).subtract(excelVo.getExpectItureCost())); excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost())); excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost())); + if (excelVo.getState().equals("0")){ + excelVo.setState("未预提"); + }else if (excelVo.getState().equals("1")){ + excelVo.setState("预提中"); + }else if (excelVo.getState().equals("2")){ + excelVo.setState("待核对"); + }else if (excelVo.getState().equals("3")){ + excelVo.setState("核对中"); + }else if (excelVo.getState().equals("4")){ + excelVo.setState("已核对"); + } + if (excelVo.getOnceCheckState().equals("0")){ + excelVo.setOnceCheckState("否"); + }else if (excelVo.getOnceCheckState().equals("1")){ + excelVo.setOnceCheckState("是"); + }else if (excelVo.getOnceCheckState().equals("2")){ + excelVo.setOnceCheckState("一次核对中"); + } i = i + 1; excelVos.add(excelVo); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index 684e4514ad..6459d46950 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -109,7 +109,7 @@ SELECT *, @row_number := @row_number + 1 AS rankNo, - sid AS vehRebateSid, + sid AS vehRebateSid FROM scm_veh_rebate,( SELECT diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 6780b741c9..b56b430885 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -2034,6 +2034,25 @@ public class ScmVehRebateService extends MybatisBaseService scmVehRebateExcelVos = baseMapper.excelList(qw); for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) { + if (scmVehRebateExcelVo.getState().equals("0")){ + scmVehRebateExcelVo.setState("未预提"); + }else if (scmVehRebateExcelVo.getState().equals("1")){ + scmVehRebateExcelVo.setState("预提中"); + }else if (scmVehRebateExcelVo.getState().equals("2")){ + scmVehRebateExcelVo.setState("待核对"); + }else if (scmVehRebateExcelVo.getState().equals("3")){ + scmVehRebateExcelVo.setState("核对中"); + }else if (scmVehRebateExcelVo.getState().equals("4")){ + scmVehRebateExcelVo.setState("已核对"); + } + if (scmVehRebateExcelVo.getOnceCheckState().equals("0")){ + scmVehRebateExcelVo.setOnceCheckState("否"); + }else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")){ + scmVehRebateExcelVo.setOnceCheckState("是"); + }else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")){ + scmVehRebateExcelVo.setOnceCheckState("一次核对中"); + } + scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime()))); scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost())); scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost())); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java index ce3350d226..91c103afc6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java @@ -136,6 +136,24 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign { excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime())); excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost())); excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost())); + if (excelVo.getState().equals("0")){ + excelVo.setState("未预提"); + }else if (excelVo.getState().equals("1")){ + excelVo.setState("预提中"); + }else if (excelVo.getState().equals("2")){ + excelVo.setState("待核对"); + }else if (excelVo.getState().equals("3")){ + excelVo.setState("核对中"); + }else if (excelVo.getState().equals("4")){ + excelVo.setState("已核对"); + } + if (excelVo.getOnceCheckState().equals("0")){ + excelVo.setOnceCheckState("否"); + }else if (excelVo.getOnceCheckState().equals("1")){ + excelVo.setOnceCheckState("是"); + }else if (excelVo.getOnceCheckState().equals("2")){ + excelVo.setOnceCheckState("一次核对中"); + } i = i + 1; excelVos.add(excelVo); }