diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java
index e0afb3fdf6..0e3e14eab8 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java
@@ -26,11 +26,14 @@
package com.yxt.anrui.scm.api.scmvehrebate;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* Project: anrui-scm(单车返利)
* File: ScmVehRebate.java
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java
index 2af3e68672..bfe23a82a1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java
@@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmvehrebate;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* Project: anrui-scm(单车返利)
* File: ScmVehRebateVo.java
@@ -51,6 +54,9 @@ public class ScmVehRebateDetailsVo implements Vo {
private String sid; // sid
+ @ApiModelProperty("创建日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime; // 创建日期
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java
index 7604d7a35e..e45ceedf85 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java
@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-scm(单车返利)
* File: ScmVehRebateQuery.java
@@ -69,4 +71,6 @@ public class ScmVehRebateQuery implements Query {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("是否调整")
private String isAdjustment; // 是否调整
+ @ApiModelProperty("单车返利sid")
+ private List sidList; // 单车返利sid
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java
index f701ab3439..9b79d652e3 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java
@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-scm(单车返利预提申请)
* File: ScmVehRebateWithVo.java
@@ -51,12 +53,16 @@ public class ScmVehRebateWithDetailsVo implements Vo {
private String sid; // sid
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
@ApiModelProperty("预提返利")
private String withRebate; // 预提返利
@ApiModelProperty("台数")
private String num; // 台数
@ApiModelProperty("单车返利sid")
private String vehRebateSid; // 单车返利sid
+ @ApiModelProperty("单车返利sid")
+ private List vehRebateSids; // 单车返利sid
@ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利类型value")
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 bd9fd667d2..228cdf1a50 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
@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-scm(单车返利预提申请)
* File: ScmVehRebateWithDto.java
@@ -56,12 +58,13 @@ public class ScmVehRebateWithDto implements Dto {
@ApiModelProperty("台数")
private String num; // 台数
@ApiModelProperty("单车返利sid")
- private String vehRebateSid; // 单车返利sid
+ private List vehRebateSids; // 单车返利sid
@ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利类型value")
private String rebateTypeValue; // 返利类型value
@ApiModelProperty("单车返利预提申请sid")
private String mainSid; // 单车返利预提申请sid
-
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java
index 3d08709cfb..43ec4f762c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java
@@ -25,6 +25,10 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatewith;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@@ -65,7 +69,7 @@ public interface ScmVehRebateWithFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmVehRebateWithDto dto);
-
+
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
@@ -75,4 +79,9 @@ public interface ScmVehRebateWithFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+
+ @ApiOperation("单车返利预提查看详情")
+ @GetMapping("/vehRebateWithDetails/{sid}")
+ @ResponseBody
+ public ResultBean> vehRebateWithDetails(@PathVariable("sid") String sid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java
index d652992060..f08d5a4ba1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java
@@ -25,6 +25,8 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatewith;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -69,4 +71,9 @@ public class ScmVehRebateWithFeignFallback implements ScmVehRebateWithFeign {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmvehrebatewith/fetchDetailsBySid无法访问");
}
+
+ @Override
+ public ResultBean> vehRebateWithDetails(String sid) {
+ return null;
+ }
}
\ No newline at end of file
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 54ca078d76..fba8153b54 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
@@ -55,6 +55,8 @@ public class ScmVehRebateWithApplyDetailsVo implements Vo {
private String sid; // sid
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
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 54717a5f02..aa524c5d91 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
@@ -54,6 +54,8 @@ public class ScmVehRebateWithApplyDto implements Dto {
private String sid; // sid
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌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 699d9f4109..b5cbf8e154 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
@@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmvehrebatewithapply;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* Project: anrui-scm(单车返利预提申请)
* File: ScmVehRebateWithApplyVo.java
@@ -51,6 +54,9 @@ public class ScmVehRebateWithApplyVo implements Vo {
private String sid; // sid
+ @ApiModelProperty("创建日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime; // 创建日期
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
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 e9ade5bdb9..9b7697831e 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
@@ -120,6 +120,9 @@ public class ScmVehRebateService extends MybatisBaseService 0) {
+ qw.notIn("sid", query.getSidList());
+ }
IPage page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectPageVo(page, qw);
PagerVo p = PagerUtil.pageToVo(pagging, null);
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 6a1bbc84d3..f9d3cbd86c 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
@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -66,4 +67,7 @@ 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/ScmVehRebateWithRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java
index d92df60a35..80d4a64bd7 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java
@@ -25,6 +25,10 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmvehrebatewith;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -97,4 +101,9 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign {
ScmVehRebateWithDetailsVo vo = scmVehRebateWithService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
+
+ @Override
+ public ResultBean> vehRebateWithDetails(String sid) {
+ return scmVehRebateWithService.vehRebateWithDetails(sid);
+ }
}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
index 002443d67d..4edf3ab07e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
@@ -26,8 +26,15 @@
package com.yxt.anrui.scm.biz.scmvehrebatewith;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto;
+import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@@ -41,8 +48,13 @@ import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithFeign;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -60,56 +72,83 @@ import java.util.List;
*/
@Service
public class ScmVehRebateWithService extends MybatisBaseService {
- private QueryWrapper createQueryWrapper(ScmVehRebateWithQuery query) {
- // todo: 这里根据具体业务调整查询条件
- // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
- QueryWrapper qw = new QueryWrapper<>();
- return qw;
- }
-
- public PagerVo listPageVo(PagerQuery pq) {
- ScmVehRebateWithQuery query = pq.getParams();
- QueryWrapper qw = createQueryWrapper(query);
- IPage page = PagerUtil.queryToPage(pq);
- IPage pagging = baseMapper.selectPageVo(page, qw);
- PagerVo p = PagerUtil.pageToVo(pagging, null);
- return p;
- }
- public void saveOrUpdateDto(ScmVehRebateWithDto dto){
+ @Autowired
+ private ScmVehRebateService scmVehRebateService;
+
+ private QueryWrapper createQueryWrapper(ScmVehRebateWithQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ ScmVehRebateWithQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(ScmVehRebateWithDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
- return;
- }
- this.updateByDto(dto);
- }
-
- public void insertByDto(ScmVehRebateWithDto dto){
- ScmVehRebateWith entity = new ScmVehRebateWith();
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.insert(entity);
- }
-
- public void updateByDto(ScmVehRebateWithDto dto){
- String dtoSid = dto.getSid();
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(ScmVehRebateWithDto dto) {
+ ScmVehRebateWith entity = new ScmVehRebateWith();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ List vehRebateSids = dto.getVehRebateSids();
+ StringBuilder vehRebateSid = new StringBuilder();
+ for (String sid : vehRebateSids) {
+ vehRebateSid.append(sid).append(",");
+ }
+ entity.setVehRebateSid(vehRebateSid.substring(0,vehRebateSid.lastIndexOf(",")));
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(ScmVehRebateWithDto dto) {
+ String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
- }
- ScmVehRebateWith entity = fetchBySid(dtoSid);
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.updateById(entity);
- }
-
- public ScmVehRebateWithDetailsVo fetchDetailsVoBySid(String sid){
- ScmVehRebateWith entity = fetchBySid(sid);
- ScmVehRebateWithDetailsVo vo = new ScmVehRebateWithDetailsVo();
- BeanUtil.copyProperties(entity, vo);
- return vo;
- }
+ }
+ ScmVehRebateWith entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public ScmVehRebateWithDetailsVo fetchDetailsVoBySid(String sid) {
+ ScmVehRebateWith entity = fetchBySid(sid);
+ ScmVehRebateWithDetailsVo vo = new ScmVehRebateWithDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+
+ public void delByMainSid(String dtoSid) {
+ baseMapper.delByMainSid(dtoSid);
+ }
+ public List fetchByMainSid(String sid) {
+ return baseMapper.fetchByMainSid(sid);
+ }
- public void delByMainSid(String dtoSid) {
- baseMapper.delByMainSid(dtoSid);
- }
+ public ResultBean> vehRebateWithDetails(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ List scmVehRebateDetailsVos = new ArrayList<>();
+ String[] sids = sid.split(",");
+ for (String s : sids) {
+ ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(s);
+ ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo();
+ BeanUtil.copyProperties(scmVehRebate,scmVehRebateDetailsVo);
+ scmVehRebateDetailsVos.add(scmVehRebateDetailsVo);
+ }
+ return rb.success().setData(scmVehRebateDetailsVos);
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java
index de4ba097c9..3f93c3ca51 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java
@@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Delete;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -80,7 +81,7 @@ public class ScmVehRebateWithApplyRest implements ScmVehRebateWithApplyFeign {
@Override
@ApiOperation("根据sid批量删除")
- @PostMapping("/delBySids")
+ @DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return scmVehRebateWithApplyService.delAll(sids);
}
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 3d89001c8e..03d2fdefe7 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
@@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmvehrebatewithapply;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
import com.yxt.anrui.scm.biz.scmvehrebatewith.ScmVehRebateWithService;
import com.yxt.common.core.result.ResultBean;
@@ -45,6 +46,7 @@ import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
/**
@@ -161,7 +163,13 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService scmVehRebateWithDetailsVos = scmVehRebateWithService.fetchByMainSid(sid);
+ for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) {
+ String vehRebateSid = scmVehRebateWithDetailsVo.getVehRebateSid();
+ String[] vehRebateSids = vehRebateSid.split(",");
+ scmVehRebateWithDetailsVo.setVehRebateSids(Arrays.asList(vehRebateSids));
+ }
+ scmVehRebateWithApplyDetailsVo.setScmVehRebateWiths(scmVehRebateWithDetailsVos);
+ return rb.success().setData(scmVehRebateWithApplyDetailsVo);
}
}
\ No newline at end of file