From b954f194459fa6673346a32dc0dbd56d34ee755e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 四月 2025 17:09:40 +0800
Subject: [PATCH] 合同导入
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 9 +++++++++
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 17 ++++++++++++-----
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 7 ++++++-
3 files changed, 27 insertions(+), 6 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..086ef78 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,10 @@
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"));
contractService.save(tContract);
if(tContract.getStatus().equals("2")){
//发起合同新增审批
@@ -225,6 +229,7 @@
return stringApiResult;
} catch (Exception e) {
System.out.println("合同导入失败!" + e.getMessage());
+ e.printStackTrace();
}
return R.ok();
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index cd58196..9042014 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -388,5 +388,14 @@
public static LocalDate stringToLocalDate(String time) {
return LocalDate.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
}
+ /**
+ * 字符串转为localdatetime
+ *
+ * @param time localdate
+ * @return 字符串
+ */
+ public static LocalDateTime stringToLocalDateTime(String time) {
+ return LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 823e7af..2aac724 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -44,12 +44,17 @@
private String contractName;
@Excel(name = "生效日期", format = "yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
+ private String startTimeStr;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("start_time")
private LocalDateTime startTime;
- @Excel(name = "终止日期", format = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "终止日期")
+ @TableField(exist = false)
+ private String endTimeStr;
+
@ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("end_time")
@@ -66,7 +71,9 @@
@ApiModelProperty(value = "租金支付方式 月付 季付 年付")
@TableField("pay_type")
private String payType;
- @Excel(name = "开始计费日期", format = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "开始计费日期")
+ @TableField(exist = false)
+ private String startPayTimeStr;
@ApiModelProperty(value = "开始计费时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("start_pay_time")
@@ -86,7 +93,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("first_pay_time")
private LocalDateTime firstPayTime;
- @Excel(name = "变动时间", format = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "变动时间 根据周期改变 前端忽略")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("change_time")
@@ -154,7 +160,9 @@
/**
* 签订时间
*/
- @Excel(name = "签订时间", format = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "签订时间")
+ @TableField(exist = false)
+ private String signTimeStr;
@ApiModelProperty(value = "签订时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("sign_time")
@@ -169,7 +177,6 @@
@ApiModelProperty(value = "租户确认合同电子签名")
@TableField("signature")
private String signature;
- @Excel(name = "签订时间")
@ApiModelProperty(value = "终止合同备注说明")
@TableField("terminate_remark")
private String terminateRemark;
--
Gitblit v1.7.1