From fe846ceac8c8395477b0181d70f192d32be10894 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 15:02:05 +0800
Subject: [PATCH] bug修改
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index c0f6410..0897aaa 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -177,7 +177,7 @@
@ApiImplicitParam(paramType = "form", name = "file", value = "文件对象", required = true, dataType = "__file")
public R<String> importContracts(@RequestPart("file") MultipartFile file) {
ImportParams params = new ImportParams();
- params.setTitleRows(1);//标题行数
+// params.setTitleRows(1);//标题行数
params.setHeadRows(1); //表头行数
try {
InputStream inputStream = file.getInputStream();
@@ -185,6 +185,12 @@
List<String> errors = new ArrayList<>();
for (TContract tContract : contractList) {
try{
+ tContract.setStartTime(DateUtils.stringToLocalDateTime(tContract.getStartTimeStr() + " 00:00:00"));
+ tContract.setEndTime(DateUtils.stringToLocalDateTime(tContract.getEndTimeStr() + " 23:59:59"));
+ tContract.setStartPayTime(DateUtils.stringToLocalDateTime(tContract.getStartPayTimeStr() + " 00:00:00"));
+ tContract.setSignTime(DateUtils.stringToLocalDateTime(tContract.getSignTimeStr() + " 00:00:00"));
+ tContract.setChangeRent(tContract.getMonthRent());
+ tContract.setFirstPayTime(tContract.getStartTime().plusDays(10));
contractService.save(tContract);
if(tContract.getStatus().equals("2")){
//发起合同新增审批
@@ -225,6 +231,7 @@
return stringApiResult;
} catch (Exception e) {
System.out.println("合同导入失败!" + e.getMessage());
+ e.printStackTrace();
}
return R.ok();
}
--
Gitblit v1.7.1