From fedc277354338f04cf50ba948be1cdc3f6675926 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 16 Jan 2025 14:19:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8109ef86d7..2e5630b6f5 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 @@ -269,7 +269,7 @@ public class ScmVehRebateService extends MybatisBaseService Date: Thu, 16 Jan 2025 14:23:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E3=80=81=E5=8D=95=E8=BD=A6=E6=A0=B8=E5=AF=B9=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialrebateCheckapplyRest.java | 9 ++++----- .../ScmSpecialrebateCheckapplyService.java | 18 ++++++++++-------- .../ScmVehrebateCheckapplyRest.java | 8 ++++---- .../ScmVehrebateCheckapplyService.java | 17 +++++++++++------ 4 files changed, 29 insertions(+), 23 deletions(-) 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 2b8f9def1c..92b60f152a 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 @@ -27,15 +27,11 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; -import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.*; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.*; -import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; -import com.yxt.anrui.scm.api.scmvehrebatecheckapply.VehRebateCheckExcelVo; -import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath; import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; @@ -50,7 +46,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Api(tags = "专项返利核对申请表") @RestController @@ -67,7 +65,8 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl @Override public ResultBean rePushVoucher(String sid) { ResultBean rb = ResultBean.fireFail(); - scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid, "1"); + Map mapCheckState = new HashMap<>(); //当时提时交的上传状态 0代表1次提交，1代表二次提交 + scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid, "1",mapCheckState); return rb.success(); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index 1474d1ad35..b4fb375c39 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -64,10 +64,6 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialReb import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; -import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplyDetailsVo; -import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailsVo; -import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo; -import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply; import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService; import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService; @@ -452,7 +448,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService mapCheckState) { String format = scmVehRebateWithApplyService.returnBusDate(new Date()); String summaryTag = "";//摘要前缀 ScmSpecialrebateCheckapply entity = fetchBySid(sid); @@ -484,6 +480,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService voucherDetails = new ArrayList<>(); if (!v.isEmpty()) { for (ScmSpecialRebate rebate : v) { + Integer onceState = 0; + if (tag.equals("0") && mapCheckState.size() > 0) { + onceState = mapCheckState.get(rebate.getSid()); + } if (StringUtils.isNotBlank(rebate.getUseOrgSid())) { String useOrgSid = rebate.getUseOrgSid(); SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); @@ -512,7 +512,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid()); + Map mapCheckState = new HashMap<>(); for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) { ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid()); + mapCheckState.put(scmSpecialRebate.getSid(),scmSpecialRebate.getOnceCheckState()); if ("是".equals(scmSpecialRebate.getIsAdjustment())) { scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4); scmSpecialRebateService.updateAdjustmentState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1); @@ -917,7 +919,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService @@ -79,7 +78,8 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign { @Override public ResultBean rePushVoucher(String sid) { ResultBean rb = ResultBean.fireFail(); - scmVehrebateCheckapplyService.pushVehRebateWithVoucher(sid,"1"); + Map map = new HashMap<>(); + scmVehrebateCheckapplyService.pushVehRebateWithVoucher(sid,"1",map); return rb.success(); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java index 6ff0910434..7b0ffbe991 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java @@ -486,8 +486,10 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid()); - for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) { + Map mapCheckState = new HashMap<>(); //当时提时交的上传状态 0代表1次提交，1代表二次提交 + for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) { ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(scmVehrebateCheckapplydetailVo.getVehRebateSid()); + mapCheckState.put(scmVehRebate.getSid(),scmVehRebate.getOnceCheckState()); if ("是".equals(scmVehRebate.getIsAdjustment())) { scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 4); scmVehRebateService.updateAdjustmentState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1); @@ -496,8 +498,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService mapCheckState) { String format = scmVehRebateWithApplyService.returnBusDate(new Date()); String summaryTag = "";//摘要前缀 ScmVehrebateCheckapply entity = fetchBySid(sid); @@ -551,6 +552,10 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService 0) { + checkState = mapCheckState.get(rebate.getSid()); + } SysOrganizationVo data = sysOrganizationFeign.fetchBySid(rebate.getPurchaseSystemSid()).getData(); if (null != data) { deptCode = data.getOrgCode(); @@ -587,7 +592,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService Date: Thu, 16 Jan 2025 14:35:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8A=9E=E7=90=86=E8=BD=A6=E8=BE=86=E6=8C=81=E4=B9=85=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=AD=E5=AD=97=E6=AE=B5=E8=B5=8B=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 3493bf2437..ea57235a15 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -6116,8 +6116,13 @@ public class BusSalesOrderService extends MybatisBaseService Date: Thu, 16 Jan 2025 14:54:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scmspecialrebate/ScmSpecialRebate.java | 36 +++++++++---------- .../ScmVehrebateCheckapplydetailMapper.xml | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java index 9d2fb586f1..d1a4122d6f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java @@ -52,33 +52,33 @@ import java.math.BigDecimal; public class ScmSpecialRebate extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("品牌sid") + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("返利名称") + @ApiModelProperty("返利名称") private String rebateName; // 返利名称 - @ApiModelProperty("预计返利") + @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 - @ApiModelProperty("预提日期") + @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 - @ApiModelProperty("上传日期") + @ApiModelProperty("上传日期") private String uploadDate; // 上传日期 - @ApiModelProperty("上传金额") + @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 - @ApiModelProperty("二次上传日期") + @ApiModelProperty("二次上传日期") private String secondaryUploadDate; // 二次上传日期 - @ApiModelProperty("二次上传金额") + @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 - @ApiModelProperty("是否调整") + @ApiModelProperty("是否调整") private String isAdjustment; // 是否调整 - @ApiModelProperty("调整金额") + @ApiModelProperty("调整金额") private String adjustmentMoney; // 调整金额 - @ApiModelProperty("调整说明") + @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 @ApiModelProperty("调整状态") private Integer adjustmentState; @@ -129,13 +129,13 @@ public class ScmSpecialRebate extends BaseEntity { @ApiModelProperty("二次抵顶费用说明") private String secondSuppRemark; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml index a3e2c945eb..ae4c93b518 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml @@ -30,7 +30,7 @@ GROUP_CONCAT(svc.vehRebateSid) vehRebateSid, SUM(svc.uploadMoney) uploadMoney, SUM(svc.stayDetermineMoney) stayDetermineMoney, - SUM(svc.adjustmentMoney) adjustmentMoney, + SUM(CAST(svc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney, SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost, SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money, SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -