diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java
new file mode 100644
index 0000000000..770941d6f1
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatewith;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class ExcelVo {
+
+ @ExportEntityMap(CnName = "序号", EnName = "id")
+ private String id;
+ @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
+ private String purchaseSystemName;
+ @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
+ private String brandName;
+ @ExportEntityMap(CnName = "车型名称", EnName = "vehModelName")
+ private String vehModelName;
+ @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
+ private String vinNo;
+ @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice")
+ private String manufactorSettlementPrice;
+ @ExportEntityMap(CnName = "其中运费", EnName = "freight")
+ private String freight;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+ private Date createTime;
+ @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
+ private String rebateTypeValue;
+ @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
+ private String rebateName;
+ @ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard")
+ private String calculationStandard;
+ @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
+ private String estimateRebate;
+ @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
+ private BigDecimal expectTreatCost;
+ @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
+ private BigDecimal expectSuppCost;
+ @ExportEntityMap(CnName = "抵顶费用说明", EnName = "expectSuppRemark")
+ private String expectSuppRemark;
+ @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+ private String palceGenDate;
+}
\ 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 43ec4f762c..6431b091c3 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
@@ -74,7 +74,7 @@ public interface ScmVehRebateWithFeign {
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
-
+
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
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 80d4a64bd7..e477867333 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,10 +25,10 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmvehrebatewith;
-import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
+import cn.hutool.core.bean.BeanUtil;
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.api.scmvehrebatewith.*;
+import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -37,13 +37,11 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.List;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWith;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithQuery;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithVo;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithFeign;
/**
* Project: anrui-scm(单车返利预提申请)
@@ -59,51 +57,74 @@ import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithFeign;
* @since 1.0
*/
@Api(tags = "单车返利预提表")
-@RestController("com.yxt.anrui.scm.biz.scmvehrebatewith.ScmVehRebateWithRest")
+@RestController
@RequestMapping("v1/scmvehrebatewith")
public class ScmVehRebateWithRest implements ScmVehRebateWithFeign {
- @Autowired
- private ScmVehRebateWithService scmVehRebateWithService;
+ @Autowired
+ private ScmVehRebateWithService scmVehRebateWithService;
+ @Autowired
+ HttpServletResponse response;
- @Override
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- public ResultBean> listPage(@RequestBody PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- PagerVo pv = scmVehRebateWithService.listPageVo(pq);
- return rb.success().setData(pv);
- }
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = scmVehRebateWithService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
- @Override
- @ApiOperation("新增或修改")
- @PostMapping("/save")
- public ResultBean save(@RequestBody ScmVehRebateWithDto dto){
- ResultBean rb = ResultBean.fireFail();
- scmVehRebateWithService.saveOrUpdateDto(dto);
- return rb.success();
- }
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody ScmVehRebateWithDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ scmVehRebateWithService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
- @Override
- @ApiOperation("根据sid批量删除")
+ @Override
+ @ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
- public ResultBean delBySids(@RequestBody String[] sids){
- ResultBean rb = ResultBean.fireFail();
- scmVehRebateWithService.delBySids(sids);
- return rb.success();
- }
+ public ResultBean delBySids(@RequestBody String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ scmVehRebateWithService.delBySids(sids);
+ return rb.success();
+ }
- @Override
- @ApiOperation("根据SID获取一条记录")
+ @Override
+ @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- ScmVehRebateWithDetailsVo vo = scmVehRebateWithService.fetchDetailsVoBySid(sid);
- return rb.success().setData(vo);
- }
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ ScmVehRebateWithDetailsVo vo = scmVehRebateWithService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
- @Override
- public ResultBean> vehRebateWithDetails(String sid) {
- return scmVehRebateWithService.vehRebateWithDetails(sid);
- }
+ @Override
+ public ResultBean> vehRebateWithDetails(String sid) {
+ return scmVehRebateWithService.vehRebateWithDetails(sid);
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/excelList")
+ public void excelList(@RequestParam("sid") String sid) {
+ List data = scmVehRebateWithService.vehRebateWithDetails(sid).getData();
+ List excelVos = new ArrayList<>();
+ for (ScmVehRebateDetailsVo datum : data) {
+ ExcelVo excelVo = new ExcelVo();
+ BeanUtil.copyProperties(datum,excelVo);
+ excelVos.add(excelVo);
+ }
+ //定义导出的excel名字
+ String excelName = "厂家索赔单导出模板";
+ String fileNameURL = "";
+ try {
+ fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ ExportExcelUtils.export(fileNameURL, excelVos, ExcelVo.class, response);
+ }
}