From 7e293fd208fff779b00835d10d6fd66bf2c0c837 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 29 Aug 2022 15:54:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=8D=95=E8=BD=A6=E8=BF=94=E5=88=A9=E9=A2=84?= =?UTF-8?q?=E6=8F=90=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scmvehrebatewith/ScmVehRebateWith.java | 8 ---- .../scmvehrebatewith/ScmVehRebateWithDto.java | 8 ---- .../scmvehrebatewith/ScmVehRebateWithVo.java | 8 ---- .../ScmVehRebateWithApply.java | 2 - .../ScmVehRebateWithApplyDetailsVo.java | 2 - .../ScmVehRebateWithApplyDto.java | 2 - .../ScmVehRebateWithApplyVo.java | 2 - .../ScmVehRebateWithMapper.java | 1 - .../ScmVehRebateWithMapper.xml | 37 ++++++++++++++----- .../ScmVehRebateWithApplyService.java | 22 ++++++++--- 10 files changed, 44 insertions(+), 48 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWith.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWith.java index ceb99f3060..a14a90ab3f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWith.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWith.java @@ -50,16 +50,8 @@ import lombok.Data; public class ScmVehRebateWith extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("预提返利") - private String withRebate; // 预提返利 - @ApiModelProperty("台数") - private String num; // 台数 @ApiModelProperty("单车返利sid") private String vehRebateSid; // 单车返利sid - @ApiModelProperty("返利类型key") - private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") - private String rebateTypeValue; // 返利类型value @ApiModelProperty("单车返利预提申请sid") private String mainSid; // 单车返利预提申请sid diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDto.java index 228cdf1a50..d4e45fe811 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDto.java @@ -53,16 +53,8 @@ public class ScmVehRebateWithDto implements Dto { private String sid; // sid - @ApiModelProperty("预提返利") - private String withRebate; // 预提返利 - @ApiModelProperty("台数") - private String num; // 台数 @ApiModelProperty("单车返利sid") private List vehRebateSids; // 单车返利sid - @ApiModelProperty("返利类型key") - private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") - private String rebateTypeValue; // 返利类型value @ApiModelProperty("单车返利预提申请sid") private String mainSid; // 单车返利预提申请sid @ApiModelProperty("备注") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithVo.java index 2197356997..f5ff9f828c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithVo.java @@ -51,16 +51,8 @@ public class ScmVehRebateWithVo implements Vo { private String sid; // sid - @ApiModelProperty("预提返利") - private String withRebate; // 预提返利 - @ApiModelProperty("台数") - private String num; // 台数 @ApiModelProperty("单车返利sid") private String vehRebateSid; // 单车返利sid - @ApiModelProperty("返利类型key") - private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") - private String rebateTypeValue; // 返利类型value @ApiModelProperty("单车返利预提申请sid") private String mainSid; // 单车返利预提申请sid diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java index 4de0a73cfb..5aa45acf29 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java @@ -56,8 +56,6 @@ public class ScmVehRebateWithApply extends BaseEntity { private String brandName; // 品牌名称 @ApiModelProperty("预提申请") private String withApply; // 预提申请 - @ApiModelProperty("预提返利合计") - private String withRebateTotal; // 预提返利合计 @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 @ApiModelProperty("使用组织sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java index d6cc3fe478..23c5e81ed1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java @@ -65,8 +65,6 @@ public class ScmVehRebateWithApplyDetailsVo implements Vo { private String brandName; // 品牌名称 @ApiModelProperty("预提申请") private String withApply; // 预提申请 - @ApiModelProperty("预提返利合计") - private String withRebateTotal; // 预提返利合计 @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 @ApiModelProperty("使用组织sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java index a2ef0a493c..da79650848 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java @@ -62,8 +62,6 @@ public class ScmVehRebateWithApplyDto implements Dto { private String brandName; // 品牌名称 @ApiModelProperty("预提申请") private String withApply; // 预提申请 - @ApiModelProperty("预提返利合计") - private String withRebateTotal; // 预提返利合计 @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid @ApiModelProperty("创建人姓名") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java index 69334686d0..4cd9446945 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java @@ -63,8 +63,6 @@ public class ScmVehRebateWithApplyVo implements Vo { private String brandName; // 品牌名称 @ApiModelProperty("预提申请") private String withApply; // 预提申请 - @ApiModelProperty("预提返利合计") - private String withRebateTotal; // 预提返利合计 @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 @ApiModelProperty("使用组织sid") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java index f9d3cbd86c..2e333dedca 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java @@ -68,6 +68,5 @@ public interface ScmVehRebateWithMapper extends BaseMapper { @Delete("delete from scm_veh_rebate_with where mainSid = #{dtoSid}") void delByMainSid(String dtoSid); - @Select("select * from scm_veh_rebate_with where mainSid = #{dtoSid}") List fetchByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml index bad8fda03a..ce2b9e0221 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml @@ -1,13 +1,32 @@ - - - - - + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index 57a305058d..6884c354cf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java @@ -39,6 +39,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWith; import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo; import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto; import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery; @@ -130,8 +131,13 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService vehRebateSids = scmVehRebateWith.getVehRebateSids(); + for (String vehRebateSid : vehRebateSids) { + ScmVehRebateWith scmVehRebateWith1 = new ScmVehRebateWith(); + scmVehRebateWith1.setVehRebateSid(vehRebateSid); + scmVehRebateWith1.setMainSid(sid); + scmVehRebateWithService.save(scmVehRebateWith1); + } } return rb.success().setMsg("添加成功").setData(sid); } @@ -142,8 +148,13 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService vehRebateSids = scmVehRebateWith.getVehRebateSids(); + for (String vehRebateSid : vehRebateSids) { + ScmVehRebateWith scmVehRebateWith1 = new ScmVehRebateWith(); + scmVehRebateWith1.setVehRebateSid(vehRebateSid); + scmVehRebateWith1.setMainSid(dtoSid); + scmVehRebateWithService.save(scmVehRebateWith1); + } } return rb.success().setMsg("修改成功").setData(dtoSid); } @@ -190,8 +201,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService scmVehRebateWithDetailsVos = scmVehRebateWithService.fetchByMainSid(sid); for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) { - String vehRebateSid = scmVehRebateWithDetailsVo.getVehRebateSid(); - String[] vehRebateSids = vehRebateSid.split(","); + String[] vehRebateSids = scmVehRebateWithDetailsVo.getVehRebateSid().split(","); scmVehRebateWithDetailsVo.setVehRebateSids(Arrays.asList(vehRebateSids)); } scmVehRebateWithApplyDetailsVo.setScmVehRebateWiths(scmVehRebateWithDetailsVos);