From 60e1c17307261b9cf24fb7c0462f1c4567902c5d Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 20 十一月 2024 10:20:41 +0800
Subject: [PATCH] -修改doman
---
billion-generator/src/main/resources/vm/vue/index.vue.vm | 3 ---
billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java | 4 ++--
billion-generator/src/main/resources/vm/java/domain.java.vm | 4 ++--
billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java | 2 ++
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/billion-generator/src/main/resources/vm/java/domain.java.vm b/billion-generator/src/main/resources/vm/java/domain.java.vm
index b44604d..70f3884 100644
--- a/billion-generator/src/main/resources/vm/java/domain.java.vm
+++ b/billion-generator/src/main/resources/vm/java/domain.java.vm
@@ -41,8 +41,8 @@
#if($parentheseIndex != -1)
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
#elseif($column.javaType == 'Date')
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
#else
@Excel(name = "${comment}")
#end
diff --git a/billion-generator/src/main/resources/vm/vue/index.vue.vm b/billion-generator/src/main/resources/vm/vue/index.vue.vm
index 6296014..d2f15b0 100644
--- a/billion-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/billion-generator/src/main/resources/vm/vue/index.vue.vm
@@ -127,9 +127,6 @@
<el-table-column label="${comment}" align="center" prop="${javaField}" />
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
- </template>
</el-table-column>
#elseif($column.list && $column.htmlType == "imageUpload")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
diff --git a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
index d8cad35..bffb776 100644
--- a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
+++ b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
@@ -43,8 +43,8 @@
private String paramValue;
/** 閲囬泦鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date collectTime;
diff --git a/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java
index 14341b1..a646020 100644
--- a/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java
@@ -1,5 +1,6 @@
package com.billion.main.da.service.impl;
+import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -54,6 +55,7 @@
@Override
public int insertDaParamCollection(DaParamCollection daParamCollection)
{
+ daParamCollection.setCollectTime(new Date());
return daParamCollectionMapper.insertDaParamCollection(daParamCollection);
}
--
Gitblit v1.9.3