From b59ba42d1f0fe258205f6607d9d0e9f70fcbddb5 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 24 Feb 2023 17:57:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/api/basevehicleout/BaseVehicleOutFeign.java |  2 +-
 .../base/biz/basevehicleout/BaseVehicleOutRest.java  |  4 ++--
 .../biz/basevehicleout/BaseVehicleOutService.java    | 12 ++++--------
 .../FinCollectionConfirmation.java                   |  2 ++
 .../FinCollectionConfirmationVo.java                 |  2 ++
 .../FinCollectionConfirmationMapper.java             |  3 +++
 .../FinCollectionConfirmationService.java            |  7 +++++++
 7 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
index e9389dff13..c4d1ff394d 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
@@ -60,7 +60,7 @@ public interface BaseVehicleOutFeign {
     @PostMapping("/exportExcel")
     @ApiOperation(value = "车辆销售台账列表导出")
     @ResponseBody
-    public void exportExcel(@RequestBody String[] sids);
+    public void exportExcel(@RequestBody BaseVehicleOutQuery baseVehicleOutQuery);
 
 }
 
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
index ab53fc144a..3d5273605c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
@@ -72,9 +72,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     }
 
     @Override
-    public void exportExcel(String[] sids) {
+    public void exportExcel(BaseVehicleOutQuery baseVehicleOutQuery) {
         //得到所有要导出的数据
-        List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = baseVehicleOutService.listExcel(sids);
+        List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = baseVehicleOutService.listExcel(baseVehicleOutQuery);
         //定义导出的excel名字
         String excelName = "车辆销售台账管理列表";
         String fileNameURL = "";
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index a5a738695a..71e65689fd 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -1122,15 +1122,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success();
     }
 
-    public List<BaseVehicleOutVoExecl> listExcel(String[] sids) {
+    public List<BaseVehicleOutVoExecl> listExcel(BaseVehicleOutQuery baseVehicleOutQuery) {
         List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = new ArrayList<>();
-        int id = 1;
-        for (String sid : sids) {
-            BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(sid);
-            baseVehicleOutVoExecl.setRankNo(id);
-            id = id + 1;
-            baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);
-        }
+        /*BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(baseVehicleOutQuery);
+        baseVehicleOutVoExecl.setRankNo(id);
+        baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);*/
         return baseVehicleOutVoExecls;
     }
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
index 633d900e6d..e369e9ff58 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
@@ -134,4 +134,6 @@ public class FinCollectionConfirmation extends BaseEntity {
     private String staffDeptName;
     @ApiModelProperty("销售专员部门sid")
     private String staffDeptSid;
+    @ApiModelProperty("下载次数")
+    private String downNum; // 下载次数
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java
index 2f6d6de5d7..91473454d9 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java
@@ -92,4 +92,6 @@ public class FinCollectionConfirmationVo implements Vo {
 
     @ApiModelProperty("单据编号")
     private String billNo;
+    @ApiModelProperty("下载次数")
+    private String downNum; // 下载次数
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
index 90e9d72a85..7ff09e0da4 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
@@ -113,4 +113,7 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     String selectNum(String bill);
 
     int updateVin(@Param("vinNo") String vinNo, @Param("contractNo") String contractNo, @Param("temporaryNo") String temporaryNo);
+
+    @Update("update fin_collection_confirmation set downNum = #{downNum} where sid = #{skdSid}")
+    void updateDown(@Param("skdSid") String skdSid,@Param("downNum") String downNum);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 7590232fab..e930fe3cab 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -2043,6 +2043,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         String pdfName = "收款单_" + dateStr + seconds + ".pdf";
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
         pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
+        String downNum = finCollectionConfirmationDetailsVo.getDownNum();
+        if (StringUtils.isBlank(downNum)){
+            downNum = "1";
+        }else {
+            downNum = String.valueOf((Integer.parseInt(downNum) + 1));
+        }
+        baseMapper.updateDown(skdSid,downNum);
         return rb.success().setData(pdfPath);
     }