From 6f804a3f7f46a9f5d8bf8059aa48bd3bd702f042 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Wed, 21 Jun 2023 09:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=206.21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/task/TaskList.vue | 10 +-
.../src/views/task/modules/TaskForm.vue | 108 ++++++++++++------
.../task/controller/TaskController.java | 4 +-
.../org/jeecg/modules/task/entity/Task.java | 25 ++--
4 files changed, 90 insertions(+), 57 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/task/TaskList.vue b/ant-design-vue-jeecg/src/views/task/TaskList.vue
index 58e21fb..5ac2e1b 100644
--- a/ant-design-vue-jeecg/src/views/task/TaskList.vue
+++ b/ant-design-vue-jeecg/src/views/task/TaskList.vue
@@ -203,12 +203,12 @@ export default {
// }
},
// {
- // title: '预计结束时间',
+ // title: '创建时间',
// align: "center",
- // dataIndex: 'expectedEndTime',
- // customRender: function (text) {
- // return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
- // }
+ // dataIndex: 'createTime',
+ // // customRender: function (text) {
+ // // return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
+ // // }
// },
// {
// title:'预计任务时长',
diff --git a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
index cb4c724..820bf3f 100644
--- a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
+++ b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
@@ -12,29 +12,30 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -85,7 +86,7 @@
-
@@ -100,35 +101,34 @@
-
-
-
+
+
-
-
-
+
+
-
-
+
+
-
-
+
+
@@ -148,7 +148,7 @@
-
+
@@ -182,8 +182,8 @@ export default {
model: {
workLevel: 2,
workStatus: 0,
- startTime: new Date(),
- expectedEndTime: new Date(),
+ startTime: new Date(+new Date() + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, ''),
+ expectedEndTime: new Date(+new Date() + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, ''),
expectedDuration: 1,
// curryUserName: '',
},
@@ -247,6 +247,7 @@ export default {
formDisabled() {
return this.disabled
},
+
},
created() {
//备份model原始值
@@ -259,9 +260,8 @@ export default {
this.$refs.treeList.setCheckedNodes([data.id])
}
},
- changetree(data,lst)
- {
- if(lst,checkedKeys.lenght==0)
+ changetree(data, lst) {
+ if (lst, checkedKeys.lenght == 0)
this.$refs.treeList.setCheckedNodes([data.id])
},
fillTaskName() {
@@ -344,8 +344,42 @@ export default {
}
})
- }
- ,
+ },
+ // currentTime() {
+ // var date = new Date();
+ // var year = date.getFullYear(); //月份从0~11，所以加一
+ // let month = date.getMonth();
+ // // console.log("month",month);
+ // var dateArr = [
+ // date.getMonth() + 1,
+ // date.getDate(),
+ // date.getHours(),
+ // date.getMinutes(),
+ // date.getSeconds(),
+ // ];
+ // //如果格式是MM则需要此步骤，如果是M格式则此循环注释掉
+ // for (var i = 0; i < dateArr.length; i++) {
+ // if (dateArr[i] >= 1 && dateArr[i] <= 9) {
+ // dateArr[i] = "0" + dateArr[i];
+ // }
+ // }
+ // var strDate =
+ // year +
+ // "-" +
+ // dateArr[0] +
+ // "-" +
+ // dateArr[1] +
+ // " " +
+ // dateArr[2] +
+ // ":" +
+ // dateArr[3] +
+ // ":" +
+ // dateArr[4];
+ // //此处可以拿外部的变量接收 strDate:2022-05-01 13:25:30
+ // this.model.startTime = strDate;
+ // this.model.expectedEndTime = strDate;
+ // console.log("strDate", strDate);
+ // },
loadData2() {
// if (!this.url.list) {
// this.$message.error("请设置url.list属性!");
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java
index 6e46153..b0bcf94 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java
@@ -94,8 +94,8 @@ public class TaskController extends JeecgController {
}
IPage pageList = taskService.page(page, queryWrapper);
pageList.getRecords().stream().forEach(e -> {
- String startDate = DateUtils.date2Str(e.getStartTime(), new SimpleDateFormat("yyyy/MM/dd"));
- String endDate = DateUtils.date2Str(e.getExpectedEndTime(), new SimpleDateFormat("yyyy/MM/dd"));
+ String startDate = DateUtils.date2Str(e.getStartTime(), new SimpleDateFormat("yyyy/MM/dd hh:mm:ss"));
+ String endDate = DateUtils.date2Str(e.getExpectedEndTime(), new SimpleDateFormat("yyyy/MM/dd hh:mm:ss"));
String startEndTime = startDate + "-" + endDate;
e.setStartEndTime(startEndTime);
Projectx projectx = iProjectxService.getById(e.getProjectId());
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/entity/Task.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/entity/Task.java
index 486cc62..72f392a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/entity/Task.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/entity/Task.java
@@ -133,25 +133,24 @@ public class Task implements Serializable {
/**
* 发布时间
*/
- @Excel(name = "发布时间", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "发布时间")
+ @Excel(name = "发布时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private java.util.Date publishTime;
/**
* 开始时间
*/
- @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "开始时间")
private java.util.Date startTime;
/**
* 预计结束时间
*/
- @Excel(name = "预计结束时间", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "预计结束时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "预计结束时间")
private java.util.Date expectedEndTime;
@@ -169,9 +168,9 @@ public class Task implements Serializable {
/**
* 提交时间
*/
- @Excel(name = "提交时间", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "提交时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "提交时间")
private java.util.Date submitTime;
/**