From 0c578efa807001a409ed1bbe5fe3c0a74ddf321f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Wed, 3 Jul 2024 00:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emergencyDrill/emergencyDrillDrawer.vue   | 11 ++++---
 .../src/views/work/emergencyDrill/index.vue   | 31 ++++++++++++++++---
 ruoyi-ui/src/views/work/workTrain/index.vue   | 31 ++++++++++++++++---
 .../views/work/workTrain/workTrainDrawer.vue  | 14 +++++----
 .../src/main/resources/application.yml        |  2 +-
 .../com/yanzhu/jh/work/domain/WorkTrain.java  |  4 +--
 .../resources/mapper/work/WorkTrainMapper.xml |  1 +
 7 files changed, 71 insertions(+), 23 deletions(-)

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 @@
         />
         <el-table-column label="演练时间" align="center" prop="beginDate" width="100">
           <template slot-scope="scope">
-            <div>{{ parseTime(scope.row.beginDate, "{y}-{m}-{d} {h}:{i}") }}</div>
+            <div>{{ parseTime(scope.row.beginDate, "{y}-{m}-{d}") }}</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -112,6 +112,11 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="提交时间" align="center" prop="createTime" width="100">
+          <template slot-scope="scope">
+            <div>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</div>
+          </template>
+        </el-table-column>
         <el-table-column
           label="操作"
           align="center"
@@ -205,10 +210,8 @@
             <el-date-picker
               style="width: 100%"
               v-model="form.beginDate"
-              type="datetime"
+              type="date"
               placeholder="选择日期时间"
-              default-time="10:00:00"
-              value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
           </el-form-item>
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="结束日期"
         ></el-date-picker>
       </el-form-item>
+      <el-form-item label="提交时间">
+        <el-date-picker
+          v-model="daterangeTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
           >搜索</el-button
@@ -167,9 +178,9 @@
         show-overflow-tooltip
       />
       <el-table-column label="参与人数" align="center" prop="trainParticipants" />
-      <el-table-column label="演练时间" align="center" prop="beginDate" width="160">
+      <el-table-column label="演练时间" align="center" prop="beginDate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.beginDate, "{y}-{m}-{d} {h}:{i}") }}</span>
+          <span>{{ parseTime(scope.row.beginDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -200,6 +211,11 @@
           <dict-tag :options="dict.type.sys_common_isdel" :value="scope.row.isDel" />
         </template>
       </el-table-column>
+      <el-table-column label="提交时间" align="center" prop="createTime" width="100">
+          <template slot-scope="scope">
+            <div>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</div>
+          </template>
+        </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -291,10 +307,8 @@
           <el-date-picker
             style="width: 100%"
             v-model="form.beginDate"
-            type="datetime"
+            type="date"
             placeholder="选择日期时间"
-            default-time="10:00:00"
-            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -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="结束日期"
         ></el-date-picker>
       </el-form-item>
+      <el-form-item label="上传时间">
+        <el-date-picker
+          v-model="daterangeTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
           >搜索</el-button
@@ -167,9 +178,9 @@
         show-overflow-tooltip
       />
       <el-table-column label="参与人数" align="center" prop="trainParticipants" />
-      <el-table-column label="培训时间" align="center" prop="beginDate" width="120">
+      <el-table-column label="培训时间" align="center" prop="beginDate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.beginDate, "{y}-{m}-{d} {h}:{i}") }}</span>
+          <span>{{ parseTime(scope.row.beginDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -200,6 +211,11 @@
           <dict-tag :options="dict.type.sys_common_isdel" :value="scope.row.isDel" />
         </template>
       </el-table-column>
+      <el-table-column label="提交时间" align="center" prop="createTime" width="100">
+          <template slot-scope="scope">
+            <div>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</div>
+          </template>
+        </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -284,10 +300,8 @@
           <el-date-picker
             style="width: 100%"
             v-model="form.beginDate"
-            type="datetime"
+            type="date"
             placeholder="选择日期时间"
-            default-time="10:00:00"
-            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -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"
         />
-        <el-table-column label="开始时间" align="center" prop="beginDate" width="100">
+        <el-table-column label="培训日期" align="center" prop="beginDate" width="100">
           <template slot-scope="scope">
-            <div>{{ parseTime(scope.row.beginDate, "{y}-{m}-{d} {h}:{i}") }}</div>
+            <div>{{ parseTime(scope.row.beginDate, "{y}-{m}-{d}") }}</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -112,6 +112,11 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="提交时间" align="center" prop="createTime" width="100">
+          <template slot-scope="scope">
+            <div>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</div>
+          </template>
+        </el-table-column>
         <el-table-column
           label="操作"
           align="center"
@@ -205,10 +210,8 @@
             <el-date-picker
               style="width: 100%"
               v-model="form.beginDate"
-              type="datetime"
+              type="date"
               placeholder="选择日期时间"
-              default-time="10:00:00"
-              value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
           </el-form-item>
@@ -528,4 +531,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped></style>
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"
             <if test="trainNature != null  and trainNature != ''"> and wt.train_nature = #{trainNature}</if>
             <if test="isDel != null "> and wt.is_del = #{isDel}</if>
             <if test="params.beginMarksTime != null and params.beginMarksTime != '' and params.endMarksTime != null and params.endMarksTime != ''"> and wt.begin_date between #{params.beginMarksTime} and #{params.endMarksTime}</if>
+            <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and wt.create_time between #{params.beginTime} and #{params.endTime}</if>
             <!-- 查询条件-项目部门 -->
             <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
             <!--子部门数据-->