diff --git a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue index a8888b5d..2f209ff0 100644 --- a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue +++ b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue @@ -87,7 +87,7 @@ /> - {{ parseTime(scope.row.beginDate, "{y}-{m}-{d} {h}:{i}") }} + {{ parseTime(scope.row.beginDate, "{y}-{m}-{d}") }} + + + {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }} + + diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue index 501fd948..d29a67d1 100644 --- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue +++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue @@ -69,6 +69,17 @@ end-placeholder="结束日期" > + + + 搜索 - + - {{ parseTime(scope.row.beginDate, "{y}-{m}-{d} {h}:{i}") }} + {{ parseTime(scope.row.beginDate, "{y}-{m}-{d}") }} + + + {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }} + + @@ -376,6 +390,7 @@ export default { workTrainDeptList: [], // 时间范围 daterangeMarksTime: [], + daterangeTime: [], // 弹出层标题 title: "", // 是否显示弹出层 @@ -452,6 +467,10 @@ export default { this.queryParams.params["beginMarksTime"] = this.daterangeMarksTime[0]; this.queryParams.params["endMarksTime"] = this.daterangeMarksTime[1]; } + if (null != this.daterangeTime && "" != this.daterangeTime) { + this.queryParams.params["beginTime"] = this.daterangeTime[0]; + this.queryParams.params["endTime"] = this.daterangeTime[1]; + } listWorkTrain(this.queryParams).then((response) => { this.workTrainList = response.rows; this.total = response.total; @@ -495,6 +514,8 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + this.daterangeTime=[]; + this.daterangeMarksTime=[]; this.handleQuery(); }, // 多选框选中数据 diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue index 9ff5fef4..866dbdf9 100644 --- a/ruoyi-ui/src/views/work/workTrain/index.vue +++ b/ruoyi-ui/src/views/work/workTrain/index.vue @@ -69,6 +69,17 @@ end-placeholder="结束日期" > + + + 搜索 - + - {{ parseTime(scope.row.beginDate, "{y}-{m}-{d} {h}:{i}") }} + {{ parseTime(scope.row.beginDate, "{y}-{m}-{d}") }} + + + {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }} + + @@ -369,6 +383,7 @@ export default { workTrainDeptList: [], // 时间范围 daterangeMarksTime: [], + daterangeTime: [], // 弹出层标题 title: "", // 是否显示弹出层 @@ -445,6 +460,10 @@ export default { this.queryParams.params["beginMarksTime"] = this.daterangeMarksTime[0]; this.queryParams.params["endMarksTime"] = this.daterangeMarksTime[1]; } + if (null != this.daterangeTime && "" != this.daterangeTime) { + this.queryParams.params["beginTime"] = this.daterangeTime[0]; + this.queryParams.params["endTime"] = this.daterangeTime[1]; + } listWorkTrain(this.queryParams).then((response) => { this.workTrainList = response.rows; this.total = response.total; @@ -488,6 +507,8 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + this.daterangeTime=[]; + this.daterangeMarksTime=[]; this.handleQuery(); }, // 多选框选中数据 diff --git a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue index b3f652d5..732b3827 100644 --- a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue +++ b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue @@ -85,9 +85,9 @@ prop="trainParticipants" width="90" /> - + - {{ parseTime(scope.row.beginDate, "{y}-{m}-{d} {h}:{i}") }} + {{ parseTime(scope.row.beginDate, "{y}-{m}-{d}") }} + + + {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }} + + @@ -528,4 +531,3 @@ export default { }, }; - diff --git a/ruoyi-wechat/src/main/resources/application.yml b/ruoyi-wechat/src/main/resources/application.yml index 13ee415f..07929941 100644 --- a/ruoyi-wechat/src/main/resources/application.yml +++ b/ruoyi-wechat/src/main/resources/application.yml @@ -20,7 +20,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: druid + active: prod # 文件上传 servlet: multipart: diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java index abab07ab..4e63d2ec 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java @@ -55,12 +55,12 @@ public class WorkTrain extends BaseEntity private Long trainParticipants; /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date beginDate; /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date endDate; diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml index 330dc765..e71572b1 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml @@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and wt.train_nature = #{trainNature} and wt.is_del = #{isDel} and wt.begin_date between #{params.beginMarksTime} and #{params.endMarksTime} + and wt.create_time between #{params.beginTime} and #{params.endTime} and sp.deptId = #{projectDeptId}