更改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebate;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+@Data
+public class ScmSpecialRebateExcelVo {
+
+    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    private Integer rankNo;
+    @ExportEntityMap(CnName = "状态", EnName = "state")
+    private String state;
+    @ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
+    private String createOrgName;
+    @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
+    private String purchaseSystemName;
+    @ExportEntityMap(CnName = "品牌", EnName = "brandName")
+    private String brandName;
+    @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+    private String createTime;
+    @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
+    private String rebateTypeValue;
+    @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
+    private String rebateName;
+    @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
+    private String estimateRebate;
+    @ExportEntityMap(CnName = "其中预计费用", EnName = "expectCost")
+    private String expectCost;
+    @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+    private String palceGenDate;
+    @ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate")
+    private String withholdingDate;
+    @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
+    private String uploadDate;
+    @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
+    private String uploadMoney;
+    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
+    private String secondaryUploadDate;
+    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
+    private String secondaryUploadMoney;
+    @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
+    private String stayDetermineMoney;
+    @ExportEntityMap(CnName = "其中费用", EnName = "money")
+    private String money;
+    @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
+    private String diffAmount;
+    @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
+    private String isAdjustment;
+    @ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
+    private String adjustmentMoney;
+    @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
+    private String adjustmentRemarks;
+    @ExportEntityMap(CnName = "备注", EnName = "remarks")
+    private String remarks;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
+
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+@Data
+public class SpecialRebateCheckExcelVo {
+
+    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    private Integer rankNo;
+    @ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
+    private String createOrgName;
+    @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
+    private String purchaseSystemName;
+    @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
+    private String brandName;
+    @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+    private String createTime;
+    @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
+    private String rebateTypeValue;
+    @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
+    private String rebateName;
+    @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
+    private String estimateRebate;
+    @ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost")
+    private String withholdCost;
+    @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+    private String palceGenDate;
+    @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
+    private String uploadDate;
+    @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
+    private String uploadMoney;
+    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
+    private String secondaryUploadDate;
+    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
+    private String secondaryUploadMoney;
+    @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
+    private String stayDetermineMoney;
+    @ExportEntityMap(CnName = "其中费用", EnName = "money")
+    private String money;
+    @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
+    private String diffAmount;
+    @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
+    private String isAdjustment;
+    @ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
+    private String adjustmentMoney;
+    @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
+    private String adjustmentRemarks;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/SpectalRebateWithExcelVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewith;
+
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SpectalRebateWithExcelVo {
+
+    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    private Integer rankNo;
+    @ExportEntityMap(CnName = "分公司", EnName = "useOrgName")
+    private String useOrgName;
+    @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
+    private String purchaseSystemName;
+    @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
+    private String brandName;
+    @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+    private String createTime;
+    @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
+    private String rebateTypeValue;
+    @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
+    private String rebateName;
+    @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
+    private String estimateRebate;
+    @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost")
+    private BigDecimal expectItureCost;
+    @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;
+    @ExportEntityMap(CnName = "备注", EnName = "remarks")
+    private String remarks;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebate;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+@Data
+public class ScmVehRebateExcelVo {
+
+    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    private Integer rankNo;
+    @ExportEntityMap(CnName = "状态", EnName = "state")
+    private String state;
+    @ExportEntityMap(CnName = "一次核对状态", EnName = "onceCheckState")
+    private String onceCheckState;
+    @ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
+    private String createOrgName;
+    @ExportEntityMap(CnName = "品牌", EnName = "brandName")
+    private String brandName;
+    @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
+    private String purchaseSystemName;
+    @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;
+    @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+    private String 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 = "expectCost")
+    private String expectCost;
+    @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+    private String palceGenDate;
+    @ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate")
+    private String withholdingDate;
+    @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
+    private String uploadDate;
+    @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
+    private String uploadMoney;
+    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
+    private String secondaryUploadDate;
+    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
+    private String secondaryUploadMoney;
+    @ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
+    private String stayDetermineMoney;
+    @ExportEntityMap(CnName = "费用", EnName = "money")
+    private String money;
+    @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
+    private String isAdjustment;
+    @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
+    private String diffAmount;
+    @ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
+    private String adjustmentMoney;
+    @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
+    private String adjustmentRemarks;
+    @ExportEntityMap(CnName = "备注", EnName = "remarks")
+    private String remarks;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
+
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class VehRebateCheckExcelVo {
+
+    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    private Integer rankNo;
+    @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;
+    @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+    private String createTime;
+    @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
+    private String rebateTypeValue;
+    @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
+    private String rebateName;
+    @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
+    private String estimateRebate;
+    @ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost")
+    private String withholdCost;
+    @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+    private String palceGenDate;
+    @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
+    private String uploadDate;
+    @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
+    private String uploadMoney;
+    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
+    private String secondaryUploadDate;
+    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
+    private String secondaryUploadMoney;
+    @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
+    private String stayDetermineMoney;
+    @ExportEntityMap(CnName = "其中费用", EnName = "money")
+    private String money;
+    @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
+    private String diffAmount;
+    @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
+    private String isAdjustment;
+    @ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
+    private String adjustmentMoney;
+    @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
+    private String adjustmentRemarks;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java

@@ -36,8 +36,8 @@ import java.util.Date;
 @Data
 public class ExcelVo {
 
-    @ExportEntityMap(CnName = "序号", EnName = "id")
-    private String id;
+    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    private Integer rankNo;
     @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
     private String purchaseSystemName;
     @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
@@ -50,9 +50,8 @@ public class ExcelVo {
     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;
+    private String createTime;
     @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
     private String rebateTypeValue;
     @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java

@@ -83,4 +83,6 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
 
     @Update("update scm_special_rebate set adjustmentState = #{adjustmentState} where sid = #{sid}")
     void updateAdjustmentState(@Param("sid") String sid, @Param("adjustmentState") int adjustmentState);
+
+    List<ScmSpecialRebateExcelVo> excelList(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml

@@ -137,4 +137,20 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="excelList" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateExcelVo">
+        SELECT
+        *,
+        @row_number := @row_number + 1 AS rankNo,
+        expectItureCost + expectTreatCost + expectSuppCost AS expectCost,
+        expectItureCost + expectTreatCost + expectSuppCost AS withholdCost,
+        onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money
+        FROM scm_special_rebate,(
+        SELECT
+        @row_number := 0
+        ) AS t
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java

@@ -25,7 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmspecialrebate;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.scm.api.scmspecialrebate.*;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.SpecialRebateCheckExcelVo;
 import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply;
 import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService;
 import com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyService;
@@ -70,6 +73,22 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
         return rb.success().setData(pv);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/excelList")
+    public void excelList(@RequestBody ScmSpecialRebateQuery query) {
+        //得到所有要导出的数据
+        List<ScmSpecialRebateExcelVo> exportVoList = scmSpecialRebateService.excelList(query);
+        //定义导出的excel名字
+        String excelName = "专项返利管理";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        ExportExcelUtils.export(fileNameURL, exportVoList, ScmSpecialRebateExcelVo.class, response);
+    }
+
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -1565,4 +1565,92 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
     public void updateAdjustmentState(String sid, int adjustmentState) {
         baseMapper.updateAdjustmentState(sid, adjustmentState);
     }
+
+    public List<ScmSpecialRebateExcelVo> excelList(ScmSpecialRebateQuery query) {
+        QueryWrapper<ScmSpecialRebate> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("createBySid", query.getUserSid());
+                } else {
+                    List<ScmSpecialRebateExcelVo> scmSpecialRebateExcelVos = new ArrayList<>();
+                    return scmSpecialRebateExcelVos;
+                }
+            } else {
+                List<ScmSpecialRebateExcelVo> scmSpecialRebateExcelVos = new ArrayList<>();
+                return scmSpecialRebateExcelVos;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getCreateOrgName())) {
+            qw.like("createOrgName", query.getCreateOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getBrandName())) {
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
+        }
+        if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
+            qw.eq("rebateTypeKey", query.getRebateTypeKey());
+        }
+        if (StringUtils.isNotBlank(query.getRebateName())) {
+            qw.like("rebateName", query.getRebateName());
+        }
+        if (StringUtils.isNotBlank(query.getState())) {
+            qw.eq("state", query.getState());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.orderByDesc("createTime");
+        List<ScmSpecialRebateExcelVo> scmSpecialRebateExcelVos = baseMapper.excelList(qw);
+        for (ScmSpecialRebateExcelVo scmSpecialRebateExcelVo : scmSpecialRebateExcelVos) {
+            if (scmSpecialRebateExcelVo.getState().equals("0")){
+                scmSpecialRebateExcelVo.setState("未预提");
+            }else if (scmSpecialRebateExcelVo.getState().equals("1")){
+                scmSpecialRebateExcelVo.setState("预提中");
+            }else if (scmSpecialRebateExcelVo.getState().equals("2")){
+                scmSpecialRebateExcelVo.setState("待核对");
+            }else if (scmSpecialRebateExcelVo.getState().equals("3")){
+                scmSpecialRebateExcelVo.setState("核对中");
+            }else if (scmSpecialRebateExcelVo.getState().equals("4")){
+                scmSpecialRebateExcelVo.setState("已核对");
+            }else if (scmSpecialRebateExcelVo.getState().equals("5")){
+                scmSpecialRebateExcelVo.setState("分配中");
+            }else if (scmSpecialRebateExcelVo.getState().equals("6")){
+                scmSpecialRebateExcelVo.setState("已分配");
+            }
+            scmSpecialRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmSpecialRebateExcelVo.getCreateTime())));
+        }
+        return scmSpecialRebateExcelVos;
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java

@@ -26,12 +26,18 @@
 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;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -40,6 +46,10 @@ 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;
 
 @Api(tags = "专项返利核对申请表")
@@ -49,6 +59,10 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
 
     @Autowired
     private ScmSpecialrebateCheckapplyService scmSpecialrebateCheckapplyService;
+    @Autowired
+    private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
+    @Autowired
+    HttpServletResponse response;
 
     @Override
     public ResultBean rePushVoucher(String sid) {
@@ -94,6 +108,31 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
         return rb.success().setData(pdf);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/excelList")
+    public void excelList(@RequestParam("sid") String sid) {
+        List<ScmSpecialRebateDetailsVo> data = scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid).getData();
+        List<SpecialRebateCheckExcelVo> excelVos = new ArrayList<>();
+        Integer i = 1;
+        for (ScmSpecialRebateDetailsVo datum : data) {
+            SpecialRebateCheckExcelVo excelVo = new SpecialRebateCheckExcelVo();
+            BeanUtil.copyProperties(datum,excelVo);
+            excelVo.setRankNo(i);
+            excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
+            i = i + 1;
+            excelVos.add(excelVo);
+        }
+        //定义导出的excel名字
+        String excelName = "专项返利核对明细导出模板";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        ExportExcelUtils.export(fileNameURL, excelVos, SpecialRebateCheckExcelVo.class, response);
+    }
+
     @Override
     public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) {
         return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithRest.java

@@ -25,15 +25,27 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmspecialrebatewith;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.SpectalRebateWithExcelVo;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ExcelVo;
+import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.List;
 import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeign;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * Project: anrui-scm(专项返利) <br/>
  * File: ScmSpecialRebateWithFeignFallback.java <br/>
@@ -54,9 +66,38 @@ public class ScmSpecialRebateWithRest implements ScmSpecialRebateWithFeign {
 
 	@Autowired
 	private ScmSpecialRebateWithService scmSpecialRebateWithService;
+	@Autowired
+	HttpServletResponse response;
 
 	@Override
 	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
 		return scmSpecialRebateWithService.specialRebateWithDetails(sid);
 	}
+
+	@ApiOperation("导出")
+	@PostMapping("/excelList")
+	public void excelList(@RequestParam("sid") String sid) {
+		List<String> strings = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(sid);
+		String specialSid = String.join(",", strings);
+		List<ScmSpecialRebateDetailsVo> data = scmSpecialRebateWithService.specialRebateWithDetails(specialSid).getData();
+		List<SpectalRebateWithExcelVo> excelVos = new ArrayList<>();
+		Integer i = 1;
+		for (ScmSpecialRebateDetailsVo datum : data) {
+			SpectalRebateWithExcelVo excelVo = new SpectalRebateWithExcelVo();
+			BeanUtil.copyProperties(datum,excelVo);
+			excelVo.setRankNo(i);
+			excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
+			i = i + 1;
+			excelVos.add(excelVo);
+		}
+		//定义导出的excel名字
+		String excelName = "专项返利预提明细导出模板";
+		String fileNameURL = "";
+		try {
+			fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		ExportExcelUtils.export(fileNameURL, excelVos, SpectalRebateWithExcelVo.class, response);
+	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java

@@ -30,11 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.scmvehrebate.OneExcelVo;
-import com.yxt.anrui.scm.api.scmvehrebate.TwoExcelVo;
+import com.yxt.anrui.scm.api.scmvehrebate.*;
 import org.apache.ibatis.annotations.*;
-import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
-import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo;
 
 import java.util.List;
 
@@ -82,4 +79,6 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
 
     @Delete("delete from scm_veh_rebate where vehSid = #{vehSid}")
     void delByVehSid(String vehSid);
+
+    List<ScmVehRebateExcelVo> excelList(@Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@@ -104,4 +104,22 @@
             diffAmount           = #{diffAmount}
         WHERE sid = #{sid}
     </update>
+
+    <select id="excelList" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateExcelVo">
+        SELECT
+        *,
+        @row_number := @row_number + 1 AS rankNo,
+        sid AS vehRebateSid,
+        expectTreatCost + expectSuppCost AS expectCost,
+        expectTreatCost + expectSuppCost AS withholdCost,
+        onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money
+        FROM
+        scm_veh_rebate,(
+        SELECT
+        @row_number := 0
+        ) AS t
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehrebate;
 
+import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateExcelVo;
+import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateQuery;
 import com.yxt.anrui.scm.api.scmvehrebate.*;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.StringUtils;
@@ -77,6 +79,22 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
         return rb.success().setData(pv);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/excelList")
+    public void excelList(@RequestBody ScmVehRebateQuery query) {
+        //得到所有要导出的数据
+        List<ScmVehRebateExcelVo> exportVoList = scmVehRebateService.excelList(query);
+        //定义导出的excel名字
+        String excelName = "单车返利管理";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        ExportExcelUtils.export(fileNameURL, exportVoList, ScmVehRebateExcelVo.class, response);
+    }
+
     @Override
     public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -40,6 +40,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo;
+import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateExcelVo;
 import com.yxt.anrui.scm.api.scmvehrebate.*;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -1921,4 +1922,101 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         baseMapper.delByVehSid(vehSid);
         return rb.success();
     }
+
+    public List<ScmVehRebateExcelVo> excelList(ScmVehRebateQuery query) {
+        QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("createBySid", query.getUserSid());
+                } else {
+                    List<ScmVehRebateExcelVo> scmVehRebateExcelVos = new ArrayList<>();
+                    return scmVehRebateExcelVos;
+                }
+            } else {
+                List<ScmVehRebateExcelVo> scmVehRebateExcelVos = new ArrayList<>();
+                return scmVehRebateExcelVos;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getBrandName())) {
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getVehModelName())) {
+            qw.like("vehModelName", query.getVehModelName());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
+            qw.eq("rebateTypeKey", query.getRebateTypeKey());
+        }
+        if (StringUtils.isNotBlank(query.getRebateName())) {
+            qw.like("rebateName", query.getRebateName());
+        }
+        if (StringUtils.isNotBlank(query.getState())) {
+            qw.eq("state", query.getState());
+        }
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("useOrgName", query.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.orderByDesc("createTime");
+        List<ScmVehRebateExcelVo> scmVehRebateExcelVos = baseMapper.excelList(qw);
+        for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) {
+            if (scmVehRebateExcelVo.getState().equals("0")){
+                scmVehRebateExcelVo.setState("未预提");
+            }else if (scmVehRebateExcelVo.getState().equals("1")){
+                scmVehRebateExcelVo.setState("预提中");
+            }else if (scmVehRebateExcelVo.getState().equals("2")){
+                scmVehRebateExcelVo.setState("待核对");
+            }else if (scmVehRebateExcelVo.getState().equals("3")){
+                scmVehRebateExcelVo.setState("核对中");
+            }else if (scmVehRebateExcelVo.getState().equals("4")){
+                scmVehRebateExcelVo.setState("已核对");
+            }
+            scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime())));
+            if (scmVehRebateExcelVo.getOnceCheckState().equals("0")){
+                scmVehRebateExcelVo.setOnceCheckState("否");
+            }else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")){
+                scmVehRebateExcelVo.setOnceCheckState("是");
+            }else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")){
+                scmVehRebateExcelVo.setOnceCheckState("一次核对中");
+            }
+        }
+        return scmVehRebateExcelVos;
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java

@@ -26,13 +26,17 @@
 package com.yxt.anrui.scm.biz.scmvehrebatecheckapply;
 
 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.scmvehrebate.ScmVehRebateDetailsVo;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapply.*;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.*;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ExcelVo;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath;
 import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
+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;
@@ -41,6 +45,10 @@ 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;
 
 /**
@@ -65,6 +73,8 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
     private ScmVehrebateCheckapplyService scmVehrebateCheckapplyService;
     @Autowired
     private ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
+    @Autowired
+    private HttpServletResponse response;
 
     @Override
     public ResultBean rePushVoucher(String sid) {
@@ -108,6 +118,31 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
         return rb.success().setData(pdf);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/excelList")
+    public void excelList(@RequestParam("sid") String sid) {
+        List<ScmVehRebateDetailsVo> scmVehRebateDetailsVos = scmVehrebateCheckapplydetailService.vehRebateCheckDetails(sid).getData();
+        List<VehRebateCheckExcelVo> excelVos = new ArrayList<>();
+        Integer i = 1;
+        for (ScmVehRebateDetailsVo datum : scmVehRebateDetailsVos) {
+            VehRebateCheckExcelVo excelVo = new VehRebateCheckExcelVo();
+            BeanUtil.copyProperties(datum,excelVo);
+            excelVo.setRankNo(i);
+            excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
+            i = i + 1;
+            excelVos.add(excelVo);
+        }
+        //定义导出的excel名字
+        String excelName = "单车返利核对明细导出模板";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        ExportExcelUtils.export(fileNameURL, excelVos, VehRebateCheckExcelVo.class, response);
+    }
+
     @Override
     public ResultBean submitVehRebateCheckApply(SubmitScmVehRebateCheckApplyDto dto) {
         return scmVehrebateCheckapplyService.submitVehRebateCheckApply(dto);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.biz.scmvehrebatewith;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
 import com.yxt.anrui.scm.api.scmvehrebatewith.*;
 import com.yxt.common.base.utils.ExportExcelUtils;
@@ -34,6 +35,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.http.client.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -110,11 +112,17 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign {
     @ApiOperation("导出")
     @PostMapping("/excelList")
     public void excelList(@RequestParam("sid") String sid) {
-        List<ScmVehRebateDetailsVo> data = scmVehRebateWithService.vehRebateWithDetails(sid).getData();
+        List<String> strings = scmVehRebateWithService.fetchVehReBateSidByMainSid(sid);
+        String vehRebateSid = String.join(",", strings);
+        List<ScmVehRebateDetailsVo> data = scmVehRebateWithService.vehRebateWithDetails(vehRebateSid).getData();
         List<ExcelVo> excelVos = new ArrayList<>();
+        Integer i = 1;
         for (ScmVehRebateDetailsVo datum : data) {
             ExcelVo excelVo = new ExcelVo();
             BeanUtil.copyProperties(datum,excelVo);
+            excelVo.setRankNo(i);
+            excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
+            i = i + 1;
             excelVos.add(excelVo);
         }
         //定义导出的excel名字