From a399f080265d477d7ca7f2fb995ed09bbd3971e3 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 15 May 2025 09:26:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A4=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BA=8C=E6=AC=A1=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/secondarysales/secondarysalesAdd.vue | 2 +- .../src/views/secondarysales/secondarysalesInfo.vue | 2 +- .../src/views/workFlow/ercixiaoshouFlow/secondarysalesByPGJ.vue | 2 +- .../views/workFlow/ercixiaoshouFlow/secondarysalesDaiBan.vue | 2 +- .../src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue | 2 +- .../src/views/workFlow/ercixiaoshouFlow/secondarysalesYiBan.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue index 51f307f581..b139f9a824 100644 --- a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue +++ b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue @@ -291,7 +291,7 @@ {{ purchaserMoney }} -
竞价结果
+
竞价结果
{{ formobj.result }} diff --git a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesInfo.vue b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesInfo.vue index 184ed44acd..6169df45b2 100644 --- a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesInfo.vue +++ b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesInfo.vue @@ -246,7 +246,7 @@ {{ purchaserMoney }} -
竞价结果
+
竞价结果
{{ formobj.result }} diff --git a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesByPGJ.vue b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesByPGJ.vue index dd4b91d237..656218a43f 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesByPGJ.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesByPGJ.vue @@ -249,7 +249,7 @@ {{ purchaserMoney }} -
竞价结果
+
竞价结果
{{ formobj.result }} diff --git a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesDaiBan.vue index c99e622a1b..9d6f8e78cf 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesDaiBan.vue @@ -249,7 +249,7 @@ {{ purchaserMoney }} -
竞价结果
+
竞价结果
{{ formobj.result }} diff --git a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue index 2c5f4facc0..c5063ba5de 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue @@ -290,7 +290,7 @@ {{ purchaserMoney }} -
竞价结果
+
竞价结果
{{ formobj.result }} diff --git a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesYiBan.vue index 3728163b71..23a6b98a11 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesYiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesYiBan.vue @@ -246,7 +246,7 @@ {{ purchaserMoney }} -
竞价结果
+
竞价结果
{{ formobj.result }} From bdd9a4acaa2434e5847ef9b84f89e51f23c2a559 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 15 May 2025 09:27:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/vehRebate/AppVehRebateFeign.java | 11 +- .../api/vehRebate/ListVehRebateMx.java | 100 ++++++++++++++++++ .../api/vehRebate/VehRebateMxVo.java | 40 +++++++ .../biz/vehRebate/AppVehRebateRest.java | 8 ++ .../biz/vehRebate/AppVehRebateService.java | 50 ++++++++- .../biz/scmvehrebate/ScmVehRebateMapper.xml | 14 ++- 6 files changed, 214 insertions(+), 9 deletions(-) create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/ListVehRebateMx.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/VehRebateMxVo.java diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/AppVehRebateFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/AppVehRebateFeign.java index dd67eee67d..9c7f19ce3e 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/AppVehRebateFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/AppVehRebateFeign.java @@ -4,9 +4,9 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @FeignClient( contextId = "anrui-reportcenter-AppVehRebate", @@ -18,4 +18,9 @@ public interface AppVehRebateFeign { @PostMapping("/list") @ResponseBody ResultBean list(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("统计明细") + @GetMapping("/detail") + @ResponseBody + public ResultBean getDetail(@RequestParam("sid") String sid); } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/ListVehRebateMx.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/ListVehRebateMx.java new file mode 100644 index 0000000000..932c4c01c8 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/ListVehRebateMx.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.reportcenter.api.vehRebate; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class ListVehRebateMx { + + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("返利类型") + private String rebateType; + @ApiModelProperty("返利名称") + private String rebateName; + @ApiModelProperty("所属年月") + private String yearAndMonth; + @ApiModelProperty("预计返利") + private BigDecimal rebateEstimate; + @ApiModelProperty("上传金额") + private BigDecimal rebateUpload; + @ApiModelProperty("二次上传金额") + private BigDecimal rebateSecondaryUpload; + @ApiModelProperty("待确定金额") + private BigDecimal rebateStayDetermine; + @ApiModelProperty("调整金额") + private BigDecimal rebateAdjust; + @ApiModelProperty("未上传金额") + private BigDecimal rebateNoUpload; + @ApiModelProperty("其中预计费用") + private BigDecimal feesEstimate; + @ApiModelProperty("其中上传费用") + private BigDecimal feeUpload; + @ApiModelProperty("车型名称") + private String model; + @ApiModelProperty("采购系统") + private String buySystem; + @ApiModelProperty("创建日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date dateCreate; + @ApiModelProperty("预提日期") + private String dateEstimate; + @ApiModelProperty("上传日期") + private String dateUpload; + @ApiModelProperty("二次上传日期") + private String dateSecondUpload; + @ApiModelProperty("状态") + private String stateFlow; + @ApiModelProperty("一次核对状态") + private String stateFirst; + @ApiModelProperty("二次核对状态") + private String stateSecond; + @ApiModelProperty("品牌名称") + private String brand; + @ApiModelProperty("分公司") + private String branch; + @ApiModelProperty("事业部") + private String division; + @ApiModelProperty("厂家入库价") + private BigDecimal carInPrice; + @ApiModelProperty("运费") + private BigDecimal freight; + @ApiModelProperty("上装金额") + private BigDecimal top; + @ApiModelProperty("计算方式") + private String rebateCalcType; + @ApiModelProperty("计算标准") + private String rebateCalcStandard; + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/VehRebateMxVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/VehRebateMxVo.java new file mode 100644 index 0000000000..a44599a9f1 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/VehRebateMxVo.java @@ -0,0 +1,40 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.reportcenter.api.vehRebate; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class VehRebateMxVo { + + @ApiModelProperty("明细") + private List list; + @ApiModelProperty("总页数") + private Integer pages; +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateRest.java index e0d4d1b448..e000f911e8 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateRest.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.reportcenter.biz.vehRebate; import com.yxt.anrui.reportcenter.api.vehRebate.AppVehRebateFeign; +import com.yxt.anrui.reportcenter.api.vehRebate.VehRebateMxVo; import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageQuery; import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageVo; import com.yxt.common.core.query.PagerQuery; @@ -34,6 +35,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController() @RequestMapping("v1/carRebate") public class AppVehRebateRest implements AppVehRebateFeign { @@ -45,4 +48,9 @@ public class AppVehRebateRest implements AppVehRebateFeign { public ResultBean list(PagerQuery query) { return appVehRebateService.list(query); } + + @Override + public ResultBean getDetail(String sid) { + return appVehRebateService.getDetail(sid); + } } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateService.java index 00dfd31cc5..49c8eae90f 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateService.java @@ -25,11 +25,9 @@ *********************************************************/ package com.yxt.anrui.reportcenter.biz.vehRebate; -import com.yxt.anrui.reportcenter.api.vehRebate.ListVehRebate; -import com.yxt.anrui.reportcenter.api.vehRebate.TotalVehRebate; -import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageQuery; -import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageVo; +import com.yxt.anrui.reportcenter.api.vehRebate.*; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatMxVo; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatQuery; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatVo; import com.yxt.common.base.utils.StringUtils; @@ -129,4 +127,48 @@ public class AppVehRebateService { vehRebatePageVo.setPages((int) data.getPages()); return rb.success().setData(vehRebatePageVo); } + + public ResultBean getDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + VehRebateMxVo vehRebateMxVo = new VehRebateMxVo(); + List listVehRebateMxes = new ArrayList<>(); + List scmVehRebateStatMxVos = scmVehRebateFeign.getDetail(sid).getData(); + for (ScmVehRebateStatMxVo scmVehRebateStatMxVo : scmVehRebateStatMxVos) { + ListVehRebateMx listVehRebateMx = new ListVehRebateMx(); + listVehRebateMx.setVin(scmVehRebateStatMxVo.getVinNo()); + listVehRebateMx.setRebateType(scmVehRebateStatMxVo.getRebateTypeValue()); + listVehRebateMx.setRebateName(scmVehRebateStatMxVo.getRebateName()); + listVehRebateMx.setYearAndMonth(scmVehRebateStatMxVo.getPalceGenDate()); + listVehRebateMx.setRebateEstimate(scmVehRebateStatMxVo.getEstimateRebate()); + listVehRebateMx.setRebateUpload(scmVehRebateStatMxVo.getUploadMoney()); + listVehRebateMx.setRebateSecondaryUpload(scmVehRebateStatMxVo.getSecondaryUploadMoney()); + listVehRebateMx.setRebateStayDetermine(scmVehRebateStatMxVo.getStayDetermineMoney()); + listVehRebateMx.setRebateAdjust(scmVehRebateStatMxVo.getAdjustmentMoney()); + listVehRebateMx.setRebateNoUpload(scmVehRebateStatMxVo.getNotUploadMoney()); + listVehRebateMx.setFeesEstimate(scmVehRebateStatMxVo.getExpectCost()); + listVehRebateMx.setFeeUpload(scmVehRebateStatMxVo.getMoney()); + listVehRebateMx.setModel(scmVehRebateStatMxVo.getVehModelName()); + listVehRebateMx.setBuySystem(scmVehRebateStatMxVo.getPurchaseSystemName()); + listVehRebateMx.setDateCreate(scmVehRebateStatMxVo.getCreateTime()); + listVehRebateMx.setDateEstimate(scmVehRebateStatMxVo.getWithholdingDate()); + listVehRebateMx.setDateUpload(scmVehRebateStatMxVo.getUploadDate()); + listVehRebateMx.setDateSecondUpload(scmVehRebateStatMxVo.getSecondaryUploadDate()); + listVehRebateMx.setStateFlow(scmVehRebateStatMxVo.getState()); + listVehRebateMx.setStateFirst(scmVehRebateStatMxVo.getOnceCheckState()); + listVehRebateMx.setStateSecond(scmVehRebateStatMxVo.getSecondCheckState()); + listVehRebateMx.setBrand(scmVehRebateStatMxVo.getBrandName()); + listVehRebateMx.setBranch(scmVehRebateStatMxVo.getUseOrgName()); + listVehRebateMx.setDivision(scmVehRebateStatMxVo.getDivision()); + listVehRebateMx.setCarInPrice(scmVehRebateStatMxVo.getManufactorSettlementPrice()); + listVehRebateMx.setFreight(scmVehRebateStatMxVo.getFreight()); + listVehRebateMx.setTop(scmVehRebateStatMxVo.getTopAmount()); + listVehRebateMx.setRebateCalcType(scmVehRebateStatMxVo.getCalculationModeValue()); + listVehRebateMx.setRebateCalcStandard(scmVehRebateStatMxVo.getCalculationStandard()); + listVehRebateMx.setRemarks(scmVehRebateStatMxVo.getRemarks()); + listVehRebateMxes.add(listVehRebateMx); + } + vehRebateMxVo.setList(listVehRebateMxes); + vehRebateMxVo.setPages(1); + return rb.success().setData(vehRebateMxVo); + } } \ No newline at end of file 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 b518f20072..ea91f89fa4 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 @@ -264,8 +264,18 @@ r.withholdingDate, r.uploadDate, r.secondaryUploadDate, - r.state, - r.onceCheckState, + case r.state + WHEN '0' THEN '未预提' + WHEN '1' THEN '预提中' + WHEN '2' THEN '待核对' + WHEN '3' THEN '核对中' + WHEN '4' THEN '已核对' + end as state, + case r.onceCheckState + WHEN '0' THEN '否' + WHEN '1' THEN '是' + WHEN '2' THEN '一次核对中' + end as onceCheckState, IF(r.secondaryUploadMoney > 0 AND r.isAdjustment = '是','是','否') AS secondCheckState, r.brandName, r.useOrgName,