From ea1fc2631fdaf6551c48ae3042a05e30358939da Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Wed, 19 Jun 2024 14:32:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A4=9A=E4=BD=99=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/system/TdTrainController.java      |  3 ++
 .../resources/templates/system/train/add.html | 35 ++++---------------
 .../templates/system/train/edit.html          | 16 ++++-----
 .../resources/mapper/system/TdTrainMapper.xml |  1 +
 4 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java
index 946dda1..7ec6d40 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system.system;
 
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -88,6 +89,8 @@ public class TdTrainController extends BaseController
     @ResponseBody
     public AjaxResult addSave(TdTrain tdTrain)
     {
+        tdTrain.setCreateStaffid(getLoginName());
+        tdTrain.setCreateDate(new Date());
         return toAjax(tdTrainService.insertTdTrain(tdTrain));
     }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/add.html b/ruoyi-admin/src/main/resources/templates/system/train/add.html
index 585ea96..5b9cc68 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/add.html
@@ -89,9 +89,9 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">培训地点：</label>
+                        <label class="col-sm-4 control-label">培训人员：</label>
                         <div class="col-sm-8">
-                            <textarea name="trainAddress"  required class="form-control"></textarea>
+                            <input name="trainName" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
@@ -110,38 +110,17 @@
                     </div>
                 </div>
             </div>
-
             <div class="row">
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">填报人：</label>
-                        <div class="col-sm-8">
-                            <input name="createStaffid" class="form-control" type="text" >
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">填报日期：</label>
-                        <div class="col-sm-8">
-                            <div class="input-group date">
-                                <input name="createDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-6">
+                <div class="col-sm-12">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">培训人员：</label>
-                        <div class="col-sm-8">
-                            <input name="trainName" class="form-control" type="text">
+                        <label class="col-sm-2 control-label is-required">培训地点：</label>
+                        <div class="col-sm-10">
+                            <textarea name="trainAddress"  required class="form-control"></textarea>
                         </div>
                     </div>
                 </div>
             </div>
+
         </form>
     </div>
     <th:block th:include="include :: footer" />
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/edit.html b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
index 0203532..b5bb080 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
@@ -94,9 +94,13 @@
             <div class="row">
                 <div class="col-sm-12">
                     <div class="form-group">
-                        <label class="col-sm-2 control-label is-required">培训地点：</label>
+                        <label class="col-sm-2 control-label is-required">培训日期：</label>
                         <div class="col-sm-10">
-                            <textarea name="trainAddress" required class="form-control">[[*{trainAddress}]]</textarea>
+                            <div class="input-daterange input-group">
+                                <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
+                                <span class="input-group-addon">到</span>
+                                <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -104,13 +108,9 @@
             <div class="row">
                 <div class="col-sm-12">
                     <div class="form-group">
-                        <label class="col-sm-2 control-label is-required">培训日期：</label>
+                        <label class="col-sm-2 control-label is-required">培训地点：</label>
                         <div class="col-sm-10">
-                            <div class="input-daterange input-group">
-                                <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
-                                <span class="input-group-addon">到</span>
-                                <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
-                            </div>
+                            <textarea name="trainAddress" required class="form-control">[[*{trainAddress}]]</textarea>
                         </div>
                     </div>
                 </div>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
index 2fc062c..87b64fa 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
@@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="PART != null  and PART != ''"> and PART = #{PART}</if>
             <if test="TRAININFO != null  and TRAININFO != ''"> and TRAININFO = #{TRAININFO}</if>
         </where>
+        order by CREATE_DATE desc
     </select>
     
     <select id="selectTdTrainByID" parameterType="Long" resultMap="TdTrainResult">