From 8fb4af9178356d60bbd71d33bb96b7704da26622 Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Thu, 7 Nov 2024 15:43:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=80=9A=E9=AB=98=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/system/TdIndentureController.java  |  2 +-
 .../system/system/TdTrainController.java      | 18 ++++++++---------
 .../resources/templates/system/train/add.html | 10 +++++-----
 .../templates/system/train/detail.html        | 10 +++++-----
 .../templates/system/train/edit.html          | 18 ++++++++---------
 .../templates/system/train/examine.html       | 20 +++++++++----------
 .../templates/system/train/train.html         |  4 ++--
 .../system/mapper/TdIndentureMapper.java      |  4 ++--
 .../ruoyi/system/mapper/TdLeaveMapper.java    |  2 +-
 .../ruoyi/system/mapper/TdTrainMapper.java    |  2 +-
 .../system/service/ITdIndentureService.java   |  2 +-
 .../service/impl/TdIndentureServiceImpl.java  |  4 ++--
 .../service/impl/TdLeaveServiceImpl.java      |  2 +-
 .../service/impl/TdTrainServiceImpl.java      |  2 +-
 .../mapper/system/TdIndentureMapper.xml       |  8 ++++----
 .../resources/mapper/system/TdLeaveMapper.xml |  2 +-
 .../mapper/system/TdPropertyInfoMapper.xml    | 10 +++++-----
 .../resources/mapper/system/TdTrainMapper.xml |  4 ++--
 18 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java
index 270b517..4272ac4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java
@@ -99,7 +99,7 @@ public class TdIndentureController extends BaseController
      */
     @RequiresPermissions("system:indenture:edit")
     @GetMapping("/edit/{indentureId}")
-    public String edit(@PathVariable("indentureId") String indentureId, ModelMap mmap)
+    public String edit(@PathVariable("indentureId") Long indentureId, ModelMap mmap)
     {
         TdIndenture tdIndenture = tdIndentureService.selectTdIndentureByIndentureId(indentureId);
         mmap.put("tdIndenture", tdIndenture);
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 a0af4d3..51be34b 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
@@ -109,11 +109,11 @@ public class TdTrainController extends BaseController
      * 修改涉密人员培训
      */
     @RequiresPermissions("system:train:edit")
-    @GetMapping("/edit/{ID}")
-    public String edit(@PathVariable("ID") Long ID, ModelMap mmap)
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
     {
 
-        TdTrain tdTrain = tdTrainService.selectTdTrainByID(ID);
+        TdTrain tdTrain = tdTrainService.selectTdTrainByID(id);
         mmap.put("tdTrain", tdTrain);
         return prefix + "/edit";
     }
@@ -149,10 +149,10 @@ public class TdTrainController extends BaseController
      * 培训记录详情
      */
     @RequiresPermissions("system:train:detail")
-    @GetMapping("/detail/{ID}")
-    public String detail(@PathVariable("ID") Long ID, ModelMap mmap)
+    @GetMapping("/detail/{id}")
+    public String detail(@PathVariable("id") Long id, ModelMap mmap)
     {
-        mmap.put("tdTrain", tdTrainService.selectTdTrainByID(ID));
+        mmap.put("tdTrain", tdTrainService.selectTdTrainByID(id));
         SysUser user = getSysUser();
         mmap.put("user", user);
         return prefix + "/detail";
@@ -162,10 +162,10 @@ public class TdTrainController extends BaseController
      * 审核涉密人员培训
      */
     @RequiresPermissions("system:train:examine")
-    @GetMapping("/examine/{ID}")
-    public String examine(@PathVariable("ID") Long ID, ModelMap mmap)
+    @GetMapping("/examine/{id}")
+    public String examine(@PathVariable("id") Long id, ModelMap mmap)
     {
-        TdTrain tdTrain = tdTrainService.selectTdTrainByID(ID);
+        TdTrain tdTrain = tdTrainService.selectTdTrainByID(id);
         SysUser user = getSysUser();
         mmap.put("tdTrain", tdTrain);
         mmap.put("user", user);
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 587edc7..bbd1d44 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/add.html
@@ -14,7 +14,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">所属地市：</label>
                         <div class="col-sm-8">
-                            <select id="City" name="AREAID" required @change="getAreaList()" v-model="City" class="form-control m-b">
+                            <select id="City" name="areaid" required @change="getAreaList()" v-model="City" class="form-control m-b">
                                 <option value="">---请选择---</option>
                                 <option v-for="option in CityList" :value="option.id" :key="option.id">
                                     {{ option.name }}
@@ -27,7 +27,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">所属区县：</label>
                         <div class="col-sm-8">
-                            <select id="Area" name="FRAMEWORK" required v-model="Area" class="form-control m-b">
+                            <select id="Area" name="framework" required v-model="Area" class="form-control m-b">
                                 <option value="">---请选择---</option>
                                 <option v-for="option in AreaList" :value="option.id" :key="option.id">
                                     {{ option.name }}
@@ -66,7 +66,7 @@
                     <div class="form-group" v-if="trainSubject == '0'">
                         <label class="col-sm-2 control-label is-required">人员姓名：</label>
                         <div class="col-sm-10">
-                            <select id="User" name="USERNAME" required  class="form-control m-b">
+                            <select id="User" name="username" required  class="form-control m-b">
                                 <option value="">---请选择---</option>
                                 <option v-for="option in userList" :value="option.userId" :key="option.userId">
                                     {{ option.userName }}
@@ -77,13 +77,13 @@
                     <div class="form-group" v-if="trainSubject == '1'">
                         <label class="col-sm-2 control-label is-required">人员姓名：</label>
                         <div class="col-sm-10">
-                            <textarea name="USERNAME" required placeholder="请输入人员姓名" class="form-control"></textarea>
+                            <textarea name="username" required placeholder="请输入人员姓名" class="form-control"></textarea>
                         </div>
                     </div>
                     <div class="form-group" v-if="trainSubject == '2'">
                         <label class="col-sm-2 control-label is-required">人员姓名：</label>
                         <div class="col-sm-10">
-                            <input name="USERNAME" readonly th:value="'全体人员'" placeholder="全体人员" class="form-control" type="text">
+                            <input name="username" readonly th:value="'全体人员'" placeholder="全体人员" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/detail.html b/ruoyi-admin/src/main/resources/templates/system/train/detail.html
index fa48230..007595a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/detail.html
@@ -15,7 +15,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is- ">所属地市：</label>
                     <div class="col-sm-8">
-                        <select id="City" name="AREAID" disabled  @change="getAreaList()" v-model="City" class="form-control m-b">
+                        <select id="City" name="areaid" disabled  @change="getAreaList()" v-model="City" class="form-control m-b">
                             <option value="">---请选择---</option>
                             <option v-for="option in CityList" :value="option.id" :key="option.id">
                                 {{ option.name }}
@@ -28,7 +28,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is- ">所属区县：</label>
                     <div class="col-sm-8">
-                        <select id="Area" name="FRAMEWORK" disabled  v-model="Area" class="form-control m-b">
+                        <select id="Area" name="framework" disabled  v-model="Area" class="form-control m-b">
                             <option value="">---请选择---</option>
                             <option v-for="option in AreaList" :value="option.id" :key="option.id">
                                 {{ option.name }}
@@ -67,7 +67,7 @@
                 <div class="form-group" v-if="trainSubject == '0'">
                     <label class="col-sm-2 control-label is- ">人员姓名：</label>
                     <div class="col-sm-10">
-                        <select id="User" disabled v-model="userName" name="USERNAME"    class="form-control m-b">
+                        <select id="User" disabled v-model="userName" name="username"    class="form-control m-b">
                             <option value="">---请选择---</option>
                             <option v-for="option in userList" :value="option.userId" :key="option.userId">
                                 {{ option.userName }}
@@ -78,7 +78,7 @@
                 <div class="form-group" v-if="trainSubject == '1'">
                     <label class="col-sm-2 control-label is- ">人员姓名：</label>
                     <div class="col-sm-10">
-                        <textarea name="USERNAME" disabled th:field="*{USERNAME}"   placeholder="请输入人员姓名" class="form-control" type="text"></textarea>
+                        <textarea name="USERNAME" disabled th:field="*{username}"   placeholder="请输入人员姓名" class="form-control" type="text"></textarea>
                     </div>
                 </div>
                 <div class="form-group" v-if="trainSubject == '2'">
@@ -157,7 +157,7 @@
                 <div class="form-group">
                     <label class="col-sm-2 control-label">培训评价：</label>
                     <div class="col-sm-10">
-                        <textarea name="TRAININFO" disabled class="form-control">[[*{TRAININFO}]]</textarea>
+                        <textarea name="traininfo" disabled class="form-control">[[*{traininfo}]]</textarea>
                     </div>
                 </div>
             </div>
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 59272ee..fa9d15b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
@@ -8,14 +8,14 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
         <form class="form-horizontal m" id="form-train-edit" th:object="${tdTrain}">
-            <input name="ID" th:field="*{ID}" type="hidden">
+            <input name="id" th:field="*{id}" type="hidden">
             <input name="deptId"  type="hidden"  th:field="*{deptId}" id="treeId">
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">所属地市：</label>
                         <div class="col-sm-8">
-                            <select id="City" name="AREAID" required @change="getAreaList()" v-model="City" class="form-control m-b">
+                            <select id="City" name="areaid" required @change="getAreaList()" v-model="City" class="form-control m-b">
                                 <option value="">---请选择---</option>
                                 <option v-for="option in CityList" :value="option.id" :key="option.id">
                                     {{ option.name }}
@@ -28,7 +28,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">所属区县：</label>
                         <div class="col-sm-8">
-                            <select id="Area" name="FRAMEWORK" required v-model="Area" class="form-control m-b">
+                            <select id="Area" name="framework" required v-model="Area" class="form-control m-b">
                                 <option value="">---请选择---</option>
                                 <option v-for="option in AreaList" :value="option.id" :key="option.id">
                                     {{ option.name }}
@@ -67,7 +67,7 @@
                     <div class="form-group" v-if="trainSubject == '0'">
                         <label class="col-sm-2 control-label is-required">人员姓名：</label>
                         <div class="col-sm-10">
-                            <select id="User" v-model="userName" name="USERNAME" required  class="form-control m-b">
+                            <select id="User" v-model="userName" name="username" required  class="form-control m-b">
                                 <option value="">---请选择---</option>
                                 <option v-for="option in userList" :value="option.userId" :key="option.userId">
                                     {{ option.userName }}
@@ -78,13 +78,13 @@
                     <div class="form-group" v-if="trainSubject == '1'">
                         <label class="col-sm-2 control-label is-required">人员姓名：</label>
                         <div class="col-sm-10">
-                            <textarea name="USERNAME"  id="userSubjectName" th:field="*{USERNAME}" required placeholder="请输入人员姓名" class="form-control"></textarea>
+                            <textarea name="username"  id="userSubjectName" th:field="*{username}" required placeholder="请输入人员姓名" class="form-control"></textarea>
                         </div>
                     </div>
                     <div class="form-group" v-if="trainSubject == '2'">
                         <label class="col-sm-2 control-label is-required">人员姓名：</label>
                         <div class="col-sm-10">
-                            <input name="USERNAME" readonly th:value="'全体人员'" placeholder="全体人员" class="form-control" type="text">
+                            <input name="username" readonly th:value="'全体人员'" placeholder="全体人员" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
@@ -198,9 +198,9 @@
             data: {
                 CityList: [],
                 AreaList:[],
-                City:[[${tdTrain.AREAID}]],
-                Area:[[${tdTrain.FRAMEWORK}]],
-                userName:[[${tdTrain.USERNAME}]],
+                City:[[${tdTrain.areaid}]],
+                Area:[[${tdTrain.framework}]],
+                userName:[[${tdTrain.username}]],
                 userList:[],
                 params:{
                     parentId:'',
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/examine.html b/ruoyi-admin/src/main/resources/templates/system/train/examine.html
index 5d7121b..fc3d0bc 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/examine.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/examine.html
@@ -9,13 +9,13 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
     <form class="form-horizontal m" id="form-train-examine" th:object="${tdTrain}">
-        <input name="ID" th:field="*{ID}" type="hidden">
+        <input name="id" th:field="*{id}" type="hidden">
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
                     <label class="col-sm-4 control-label is- ">所属地市：</label>
                     <div class="col-sm-8">
-                        <select id="City" name="AREAID" disabled  @change="getAreaList()" v-model="City" class="form-control m-b">
+                        <select id="City" name="areaid" disabled  @change="getAreaList()" v-model="City" class="form-control m-b">
                             <option value="">---请选择---</option>
                             <option v-for="option in CityList" :value="option.id" :key="option.id">
                                 {{ option.name }}
@@ -28,7 +28,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is- ">所属区县：</label>
                     <div class="col-sm-8">
-                        <select id="Area" name="FRAMEWORK" disabled  v-model="Area" class="form-control m-b">
+                        <select id="Area" name="framework" disabled  v-model="Area" class="form-control m-b">
                             <option value="">---请选择---</option>
                             <option v-for="option in AreaList" :value="option.id" :key="option.id">
                                 {{ option.name }}
@@ -67,7 +67,7 @@
                 <div class="form-group" v-if="trainSubject == '0'">
                     <label class="col-sm-2 control-label is- ">人员姓名：</label>
                     <div class="col-sm-10">
-                        <select id="User" disabled v-model="userName" name="USERNAME"    class="form-control m-b">
+                        <select id="User" disabled v-model="userName" name="username"    class="form-control m-b">
                             <option value="">---请选择---</option>
                             <option v-for="option in userList" :value="option.userId" :key="option.userId">
                                 {{ option.userName }}
@@ -78,13 +78,13 @@
                 <div class="form-group" v-if="trainSubject == '1'">
                     <label class="col-sm-2 control-label is- ">人员姓名：</label>
                     <div class="col-sm-10">
-                        <textarea name="USERNAME" disabled th:field="*{USERNAME}"   placeholder="请输入人员姓名" class="form-control" type="text"></textarea>
+                        <textarea name="username" disabled th:field="*{username}"   placeholder="请输入人员姓名" class="form-control" type="text"></textarea>
                     </div>
                 </div>
                 <div class="form-group" v-if="trainSubject == '2'">
                     <label class="col-sm-2 control-label is- ">人员姓名：</label>
                     <div class="col-sm-10">
-                        <input name="USERNAME" readonly th:value="'全体人员'" placeholder="全体人员" class="form-control" type="text">
+                        <input name="username" readonly th:value="'全体人员'" placeholder="全体人员" class="form-control" type="text">
                     </div>
                 </div>
             </div>
@@ -151,7 +151,7 @@
                 <div class="form-group">
                     <label class="col-sm-2 control-label is-required">培训评价：</label>
                     <div class="col-sm-10">
-                        <textarea name="TRAININFO" required class="form-control">[[*{TRAININFO}]]</textarea>
+                        <textarea name="traininfo" required class="form-control">[[*{traininfo}]]</textarea>
                     </div>
                 </div>
             </div>
@@ -223,9 +223,9 @@
         data: {
             CityList: [],
             AreaList:[],
-            City:[[${tdTrain.AREAID}]],
-            Area:[[${tdTrain.FRAMEWORK}]],
-            userName:[[${tdTrain.USERNAME}]],
+            City:[[${tdTrain.areaid}]],
+            Area:[[${tdTrain.framework}]],
+            userName:[[${tdTrain.username}]],
             userList:[],
             params:{
                 parentId:'',
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/train.html b/ruoyi-admin/src/main/resources/templates/system/train/train.html
index b116070..0b93225 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/train.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/train.html
@@ -16,7 +16,7 @@
                             </li>
                              <li>
                                  <label>所属地区：</label>
-                                 <select id="City" name="AREAID" @change="getAreaList()" v-model="City">
+                                 <select id="City" name="areaid" @change="getAreaList()" v-model="City">
                                      <option value="">请选择</option>
                                      <option v-for="option in CityList" :value="option.id" :key="option.id">
                                          {{ option.name }}
@@ -104,7 +104,7 @@
                 },
                 {
                     field: 'id',
-                    title: 'ID',
+                    title: 'id',
                     visible: false
                 },
                 {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdIndentureMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdIndentureMapper.java
index 242735d..0633b61 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdIndentureMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdIndentureMapper.java
@@ -17,7 +17,7 @@ public interface TdIndentureMapper
      * @param indentureId 维修商主键
      * @return 维修商
      */
-    public TdIndenture selectTdIndentureByIndentureId(String indentureId);
+    public TdIndenture selectTdIndentureByIndentureId(Long indentureId);
 
     /**
      * 查询维修商列表
@@ -57,5 +57,5 @@ public interface TdIndentureMapper
      * @param indentureIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteTdIndentureByIndentureIds(String[] indentureIds);
+    public int deleteTdIndentureByIndentureIds(Long[] indentureIds);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdLeaveMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdLeaveMapper.java
index 83e48cd..640d699 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdLeaveMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdLeaveMapper.java
@@ -59,5 +59,5 @@ public interface TdLeaveMapper extends BaseMapper<TdLeave>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteTdLeaveByIds(String[] ids);
+    public int deleteTdLeaveByIds(Long[] ids);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdTrainMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdTrainMapper.java
index 18fff2a..cf1735e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdTrainMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdTrainMapper.java
@@ -61,7 +61,7 @@ public interface TdTrainMapper extends BaseMapper<TdTrain>
      * @param IDs 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteTdTrainByIDs(String[] IDs);
+    public int deleteTdTrainByIDs(Long[] IDs);
 
     public TrainCountDTO selectCountList();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdIndentureService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdIndentureService.java
index 20350ac..087bc65 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdIndentureService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdIndentureService.java
@@ -17,7 +17,7 @@ public interface ITdIndentureService
      * @param indentureId 维修商主键
      * @return 维修商
      */
-    public TdIndenture selectTdIndentureByIndentureId(String indentureId);
+    public TdIndenture selectTdIndentureByIndentureId(Long indentureId);
 
     /**
      * 查询维修商列表
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdIndentureServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdIndentureServiceImpl.java
index 1790d30..5ad3a2e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdIndentureServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdIndentureServiceImpl.java
@@ -29,7 +29,7 @@ public class TdIndentureServiceImpl implements ITdIndentureService
      * @return 维修商
      */
     @Override
-    public TdIndenture selectTdIndentureByIndentureId(String indentureId)
+    public TdIndenture selectTdIndentureByIndentureId(Long indentureId)
     {
         return tdIndentureMapper.selectTdIndentureByIndentureId(indentureId);
     }
@@ -80,7 +80,7 @@ public class TdIndentureServiceImpl implements ITdIndentureService
     @Override
     public int deleteTdIndentureByIndentureIds(String indentureIds)
     {
-        return tdIndentureMapper.deleteTdIndentureByIndentureIds(Convert.toStrArray(indentureIds));
+        return tdIndentureMapper.deleteTdIndentureByIndentureIds(Convert.toLongArray(indentureIds));
     }
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java
index 16b9a34..ba7a1c3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java
@@ -81,7 +81,7 @@ public class TdLeaveServiceImpl implements ITdLeaveService
     @Override
     public int deleteTdLeaveByIds(String ids)
     {
-        return tdLeaveMapper.deleteTdLeaveByIds(Convert.toStrArray(ids));
+        return tdLeaveMapper.deleteTdLeaveByIds(Convert.toLongArray(ids));
     }
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdTrainServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdTrainServiceImpl.java
index 7ebd5bf..4deb5b4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdTrainServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdTrainServiceImpl.java
@@ -87,7 +87,7 @@ public class TdTrainServiceImpl extends ServiceImpl<TdTrainMapper,TdTrain> imple
     @Override
     public int deleteTdTrainByIDs(String IDs)
     {
-        return tdTrainMapper.deleteTdTrainByIDs(Convert.toStrArray(IDs));
+        return tdTrainMapper.deleteTdTrainByIDs(Convert.toLongArray(IDs));
     }
 
     /**
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdIndentureMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdIndentureMapper.xml
index 881f65a..2c33a0e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdIndentureMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdIndentureMapper.xml
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectTdIndentureByIndentureId" parameterType="String" resultMap="TdIndentureResult">
+    <select id="selectTdIndentureByIndentureId" parameterType="Long" resultMap="TdIndentureResult">
         <include refid="selectTdIndentureVo"/>
         where indenture_id = #{indentureId}
     </select>
@@ -103,11 +103,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteTdIndentureByIndentureId" parameterType="String">
-        delete from td_indenture where INDENTURE_ID = #{indentureId}
+        delete from td_indenture where indenture_id = #{indentureId}
     </delete>
 
-    <delete id="deleteTdIndentureByIndentureIds" parameterType="String">
-        delete from td_indenture where INDENTURE_ID in 
+    <delete id="deleteTdIndentureByIndentureIds" parameterType="Long">
+        delete from td_indenture where indenture_id in
         <foreach item="indentureId" collection="array" open="(" separator="," close=")">
             #{indentureId}
         </foreach>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
index 9ef1011..d7d7666 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from td_leave where id = #{id}
     </delete>
 
-    <delete id="deleteTdLeaveByIds" parameterType="String">
+    <delete id="deleteTdLeaveByIds" parameterType="Long">
         delete from td_leave where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
index ee2e722..b4a254e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="propertyName"    column="property_name"    />
         <result property="computerType"    column="computer_type_"    />
         <result property="propertyMiji"    column="property_miji"    />
-        <result property="propertySn"    column="property_SN"    />
+        <result property="propertySn"    column="property_sn"    />
         <result property="remark"    column="remark"    />
         <result property="isCurcial"    column="is_curcial"    />
         <result property="isSoftware"    column="is_software"    />
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTdPropertyInfoVo">
-        select id, use_id, property_brand, property_mac, property_netstyle, property_type, property_no, property_name, computer_type_, property_miji, property_SN, remark, is_curcial, is_software, username, maintain_depart, maintain_user, maintain_date, maintain_state, destory_state, destory_depart, destory_user, destory_date, destory_type, property_refer, maintain_remark, shemichengdu, part from td_property_info
+        select id, use_id, property_brand, property_mac, property_netstyle, property_type, property_no, property_name, computer_type_, property_miji, property_sn, remark, is_curcial, is_software, username, maintain_depart, maintain_user, maintain_date, maintain_state, destory_state, destory_depart, destory_user, destory_date, destory_type, property_refer, maintain_remark, shemichengdu, part from td_property_info
     </sql>
 
     <select id="selectTdPropertyInfoList" parameterType="TdPropertyInfo" resultMap="TdPropertyInfoResult">
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="propertyName != null  and propertyName != ''"> and property_name like concat('%', #{propertyName}, '%')</if>
             <if test="computerType != null  and computerType != ''"> and computer_type_ = #{computerType}</if>
             <if test="propertyMiji != null  and propertyMiji != ''"> and property_miji = #{propertyMiji}</if>
-            <if test="propertySn != null  and propertySn != ''"> and property_SN = #{propertySn}</if>
+            <if test="propertySn != null  and propertySn != ''"> and property_sn = #{propertySn}</if>
             <if test="isCurcial != null  and isCurcial != ''"> and is_curcial = #{isCurcial}</if>
             <if test="isSoftware != null  and isSoftware != ''"> and is_software = #{isSoftware}</if>
             <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="propertyName != null">property_name,</if>
             <if test="computerType != null">computer_type_,</if>
             <if test="propertyMiji != null">property_miji,</if>
-            <if test="propertySn != null">property_SN,</if>
+            <if test="propertySn != null">property_sn,</if>
             <if test="remark != null">remark,</if>
             <if test="isCurcial != null">is_curcial,</if>
             <if test="isSoftware != null">is_software,</if>
@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="propertyName != null">property_name = #{propertyName},</if>
             <if test="computerType != null">computer_type_ = #{computerType},</if>
             <if test="propertyMiji != null">property_miji = #{propertyMiji},</if>
-            <if test="propertySn != null">property_SN = #{propertySn},</if>
+            <if test="propertySn != null">property_sn = #{propertySn},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="isCurcial != null">is_curcial = #{isCurcial},</if>
             <if test="isSoftware != null">is_software = #{isSoftware},</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
index e120f9c..e764126 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTdTrainList" parameterType="TdTrain" resultMap="TdTrainResult">
         <include refid="selectTdTrainVo"/>
         <where>  
-            <if test="username != null  and username != ''"> and username like concat('%', #{USERNAME}, '%')</if>
+            <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="trainType != null  and trainType != ''"> and train_type = #{trainType}</if>
             <if test="trainSubject != null  and trainSubject != ''"> and train_subject = #{trainSubject}</if>
@@ -145,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from td_train where id = #{id}
     </delete>
 
-    <delete id="deleteTdTrainByIDs" parameterType="String">
+    <delete id="deleteTdTrainByIDs" parameterType="Long">
         delete from td_train where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}