From cd09bb39089bc45e4565ebc30e9ee2b64ba5ae9c Mon Sep 17 00:00:00 2001
From: whb <17803890193@163.com>
Date: Thu, 9 May 2024 09:44:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E6=98=93=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E4=B8=8A=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/StuAddBussinessController.java | 4 +-
.../stuEncryptOnChainController.java | 90 +++++++++++--------
2 files changed, 54 insertions(+), 40 deletions(-)
diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuAddBussinessController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuAddBussinessController.java
index 6fa3472..4fcc4fc 100644
--- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuAddBussinessController.java
+++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuAddBussinessController.java
@@ -139,8 +139,8 @@ public class StuAddBussinessController {
map.put("报告模板预览","/supply/尽职调查内容与程序.pdf");
map.put("评级模板预览","/supply/供应链金融应收账款类融资信用调查与分析.pdf");
- map.put("保理合同模板下载","/supply/国内有追索权保理业务合同及附件.pdf");
- map.put("客户结算条款模板下载","/supply/客户结算条款.pdf");
+ map.put("保理合同模板","/supply/国内有追索权保理业务合同及附件.pdf");
+ map.put("客户结算条款模板","/supply/客户结算条款.pdf");
//map.put("确认开增值税发票","/supply/部分3 采购订单1.pdf");
diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuEncryptOnChainController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuEncryptOnChainController.java
index 972d017..6f72b4d 100644
--- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuEncryptOnChainController.java
+++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuEncryptOnChainController.java
@@ -9,6 +9,7 @@ import com.sztzjy.block_finance.entity.dto.StutInfoSecDto;
import com.sztzjy.block_finance.entity.dto.StutranDocDto;
import com.sztzjy.block_finance.mappers.StuTransactionDocumentsInfoMapper;
import com.sztzjy.block_finance.service.StuEncryptOnChainService;
+import com.sztzjy.block_finance.service.impl.StuDebtTransferStartServiceImpl;
import com.sztzjy.block_finance.util.ResultEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -51,6 +52,10 @@ public class stuEncryptOnChainController {
private StuTransactionDocumentsInfoMapper docMapper;
+ @Resource
+ StuDebtTransferStartServiceImpl stuDebtTransferStartService;
+
+
@ApiOperation("查询交易信息")
@GetMapping("readInfo")
@AnonymousAccess
@@ -127,6 +132,10 @@ public class stuEncryptOnChainController {
// }
+ //第一次上传 创建五个文件名
+ stuDebtTransferStartService.defaultDataSettings(userId);
+
+
StuTransactionDocumentsInfoExample example = new StuTransactionDocumentsInfoExample();
example.createCriteria().andUserIdEqualTo(userId).andFileNameEqualTo(fileName);
@@ -137,54 +146,59 @@ public class stuEncryptOnChainController {
String uploadPath = IFileUtil.upload(file);
- if (!documentsInfoList.isEmpty()){
+ if (!documentsInfoList.isEmpty()) {
StuTransactionDocumentsInfo documentsInfo = documentsInfoList.get(0);
+
documentsInfo.setUrl(uploadPath);
+
documentsInfo.setUpdateTime(new Date());
docMapper.updateByPrimaryKeySelective(documentsInfo);
-
- }else {
-
- StuTransactionDocumentsInfo documentsInfo = new StuTransactionDocumentsInfo();
- documentsInfo.setCreateTime(new Date());
- if ("采购订单".equals(fileName))
- {
- documentsInfo.setSequence(1);
- }
- if ("开具发票".equals(fileName))
- {
- documentsInfo.setSequence(2);
- }
- if ("邮件确认订单".equals(fileName))
- {
- documentsInfo.setSequence(3);
- }
- if ("交货对账单".equals(fileName))
- {
- documentsInfo.setSequence(4);
- }
- if ("确认开增值税发票".equals(fileName))
- {
- documentsInfo.setSequence(5);
- }
-
-
-
- documentsInfo.setFileName(fileName);
- documentsInfo.setUrl(uploadPath);
- documentsInfo.setUploadStatus(1);
- documentsInfo.setUserId(userId);
- documentsInfo.setId((int) IdUtil.getSnowflakeNextId());
-
- docMapper.insertSelective(documentsInfo);
-
+ return new ResultEntity<>(HttpStatus.OK, "上传成功",uploadPath);
}
+// }else {
+//
+//
+//
+// StuTransactionDocumentsInfo documentsInfo = new StuTransactionDocumentsInfo();
+// documentsInfo.setCreateTime(new Date());
+// if ("采购订单".equals(fileName))
+// {
+// documentsInfo.setSequence(1);
+// }
+// if ("开具发票".equals(fileName))
+// {
+// documentsInfo.setSequence(2);
+// }
+// if ("邮件确认订单".equals(fileName))
+// {
+// documentsInfo.setSequence(3);
+// }
+// if ("交货对账单".equals(fileName))
+// {
+// documentsInfo.setSequence(4);
+// }
+// if ("确认开增值税发票".equals(fileName))
+// {
+// documentsInfo.setSequence(5);
+// }
+//
+//
+//
+// documentsInfo.setFileName(fileName);
+// documentsInfo.setUrl(uploadPath);
+// documentsInfo.setUploadStatus(1);
+// documentsInfo.setUserId(userId);
+// documentsInfo.setId((int) IdUtil.getSnowflakeNextId());
+//
+// docMapper.insertSelective(documentsInfo);
+//
+// }
- return new ResultEntity<>(HttpStatus.OK, "上传成功",uploadPath);
+ return new ResultEntity<>(HttpStatus.BAD_REQUEST, "上传失败");
}