From 031fdf31a9236f14a18f4124158eb06141ccc12f Mon Sep 17 00:00:00 2001
From: 15737803739 <xia1314521.0>
Date: Wed, 12 Mar 2025 21:16:15 +0800
Subject: [PATCH] =?UTF-8?q?2025-03-12=20=20=E5=90=88=E5=90=8C=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../batch/tasklet/msxf/MsxfContractDownloadTasklet.java   | 8 ++++----
 .../batch/tasklet/msxf/MsxfContractToSFTPTasklet.java     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/msxf/MsxfContractDownloadTasklet.java b/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/msxf/MsxfContractDownloadTasklet.java
index 4d223e8..413cc06 100644
--- a/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/msxf/MsxfContractDownloadTasklet.java
+++ b/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/msxf/MsxfContractDownloadTasklet.java
@@ -201,7 +201,7 @@ public class MsxfContractDownloadTasklet extends MsxfContractBatchTasklet {
     }
 
     private void addrecordList(List<SysMqRecord> recordList,File fil,String bizNo,String bizDate) {
-        if (fil.getName().contains(ContractConst.CONTRACT_POLICY)){
+        if (fil.getName().contains("_"+ContractConst.CONTRACT_POLICY)){
             SysMqRecord mqRecordDown = new SysMqRecord();
             mqRecordDown.setId(idGenerator.nextIdStr());
             mqRecordDown.setBizType(ContractConst.BIZ_TYPE_FILE_DOWNLOAD);
@@ -226,7 +226,7 @@ public class MsxfContractDownloadTasklet extends MsxfContractBatchTasklet {
             mqRecordBack.setBizType(ContractConst.BIZ_TYPE_FILE_BACK);
             mqRecordBack.setStatus(SysMqRecord.Status.DOING.getStatus());
             recordList.add(mqRecordBack);
-        } else if (fil.getName().contains("entrust")){
+        } else if (fil.getName().contains("_"+ContractConst.CONTRACT_PROXY)){
             SysMqRecord mqRecordDown = new SysMqRecord();
             mqRecordDown.setId(idGenerator.nextIdStr());
             mqRecordDown.setBizType(ContractConst.BIZ_TYPE_FILE_DOWNLOAD);
@@ -251,7 +251,7 @@ public class MsxfContractDownloadTasklet extends MsxfContractBatchTasklet {
             mqRecordBack.setBizType(ContractConst.BIZ_TYPE_FILE_BACK);
             mqRecordBack.setStatus(SysMqRecord.Status.DOING.getStatus());
             recordList.add(mqRecordBack);
-        } else if (fil.getName().contains(ContractConst.CONTRACT_FINANCING)) {
+        } else if (fil.getName().contains("_"+ContractConst.CONTRACT_FINANCING)) {
             SysMqRecord mqRecordDown = new SysMqRecord();
             mqRecordDown.setId(idGenerator.nextIdStr());
             mqRecordDown.setBizType(ContractConst.BIZ_TYPE_FILE_DOWNLOAD);
@@ -276,7 +276,7 @@ public class MsxfContractDownloadTasklet extends MsxfContractBatchTasklet {
             mqRecordBack.setBizType(ContractConst.BIZ_TYPE_FILE_BACK);
             mqRecordBack.setStatus(SysMqRecord.Status.DOING.getStatus());
             recordList.add(mqRecordBack);
-        } else if (fil.getName().contains(ContractConst.INSTALLMENT_GUARANTEE)) {
+        } else if (fil.getName().contains("_"+ContractConst.INSTALLMENT_GUARANTEE)) {
             SysMqRecord mqRecordDown = new SysMqRecord();
             mqRecordDown.setId(idGenerator.nextIdStr());
             mqRecordDown.setBizType(ContractConst.BIZ_TYPE_FILE_DOWNLOAD);
diff --git a/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/msxf/MsxfContractToSFTPTasklet.java b/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/msxf/MsxfContractToSFTPTasklet.java
index b49b492..b344c05 100644
--- a/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/msxf/MsxfContractToSFTPTasklet.java
+++ b/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/msxf/MsxfContractToSFTPTasklet.java
@@ -72,8 +72,8 @@ public class MsxfContractToSFTPTasklet extends MsxfContractBatchTasklet {
     public void runJob(JobReqEntity jobReqEntity, JobRespEntity jobRespEntity) throws Exception {
         log.info("批量【msxfContractToSFTPTasklet】入参：[{}]", jobReqEntity);
         String date = getDate(jobReqEntity);
-        String bizDate = StringUtils.isEmpty(date) ? LocalDate.now().toString() : date;
-        String formatDate = getYesDateFormats(bizDate);
+        //String bizDate = StringUtils.isEmpty(date) ? LocalDate.now().toString() : date;
+        String formatDate = getYesDateFormats(date);
         //状态枚举 参考SysMqRecord.java ,Status枚举
         Integer status = getStatus(jobReqEntity);
         String eventType = getEventType(jobReqEntity);