luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:瀚高适配

Browse Source
hangao
wangxy 7 months ago
parent e6376dfd91
commit 8fb4af9178
18 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java
Unescape View File

@ -99,7 +99,7 @@ public class TdIndentureController extends BaseController
*/ */
@RequiresPermissions("system:indenture:edit") @RequiresPermissions("system:indenture:edit")
@GetMapping("/edit/{indentureId}") @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); TdIndenture tdIndenture = tdIndentureService.selectTdIndentureByIndentureId(indentureId);
mmap.put("tdIndenture", tdIndenture); mmap.put("tdIndenture", tdIndenture);

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java
Unescape View File

@ -109,11 +109,11 @@ public class TdTrainController extends BaseController
* 修改涉密人员培训 * 修改涉密人员培训
*/ */
@RequiresPermissions("system:train:edit") @RequiresPermissions("system:train:edit")
@GetMapping("/edit/{ID}") @GetMapping("/edit/{id}")
public String edit(@PathVariable("ID") Long ID, ModelMap mmap) public String edit(@PathVariable("id") Long id, ModelMap mmap)
{ {
TdTrain tdTrain = tdTrainService.selectTdTrainByID(ID); TdTrain tdTrain = tdTrainService.selectTdTrainByID(id);
mmap.put("tdTrain", tdTrain); mmap.put("tdTrain", tdTrain);
return prefix + "/edit"; return prefix + "/edit";
} }
@ -149,10 +149,10 @@ public class TdTrainController extends BaseController
* 培训记录详情 * 培训记录详情
*/ */
@RequiresPermissions("system:train:detail") @RequiresPermissions("system:train:detail")
@GetMapping("/detail/{ID}") @GetMapping("/detail/{id}")
public String detail(@PathVariable("ID") Long ID, ModelMap mmap) public String detail(@PathVariable("id") Long id, ModelMap mmap)
{ {
mmap.put("tdTrain", tdTrainService.selectTdTrainByID(ID)); mmap.put("tdTrain", tdTrainService.selectTdTrainByID(id));
SysUser user = getSysUser(); SysUser user = getSysUser();
mmap.put("user", user); mmap.put("user", user);
return prefix + "/detail"; return prefix + "/detail";
@ -162,10 +162,10 @@ public class TdTrainController extends BaseController
* 审核涉密人员培训 * 审核涉密人员培训
*/ */
@RequiresPermissions("system:train:examine") @RequiresPermissions("system:train:examine")
@GetMapping("/examine/{ID}") @GetMapping("/examine/{id}")
public String examine(@PathVariable("ID") Long ID, ModelMap mmap) public String examine(@PathVariable("id") Long id, ModelMap mmap)
{ {
TdTrain tdTrain = tdTrainService.selectTdTrainByID(ID); TdTrain tdTrain = tdTrainService.selectTdTrainByID(id);
SysUser user = getSysUser(); SysUser user = getSysUser();
mmap.put("tdTrain", tdTrain); mmap.put("tdTrain", tdTrain);
mmap.put("user", user); mmap.put("user", user);

10
ruoyi-admin/src/main/resources/templates/system/train/add.html
Unescape View File

@ -14,7 +14,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">所属地市：</label> <label class="col-sm-4 control-label is-required">所属地市：</label>
<div class="col-sm-8"> <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 value="">---请选择---</option>
<option v-for="option in CityList" :value="option.id" :key="option.id"> <option v-for="option in CityList" :value="option.id" :key="option.id">
{{ option.name }} {{ option.name }}
@ -27,7 +27,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">所属区县：</label> <label class="col-sm-4 control-label is-required">所属区县：</label>
<div class="col-sm-8"> <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 value="">---请选择---</option>
<option v-for="option in AreaList" :value="option.id" :key="option.id"> <option v-for="option in AreaList" :value="option.id" :key="option.id">
{{ option.name }} {{ option.name }}
@ -66,7 +66,7 @@
<div class="form-group" v-if="trainSubject == '0'"> <div class="form-group" v-if="trainSubject == '0'">
<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="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 value="">---请选择---</option>
<option v-for="option in userList" :value="option.userId" :key="option.userId"> <option v-for="option in userList" :value="option.userId" :key="option.userId">
{{ option.userName }} {{ option.userName }}
@ -77,13 +77,13 @@
<div class="form-group" v-if="trainSubject == '1'"> <div class="form-group" v-if="trainSubject == '1'">
<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="col-sm-10">
<textarea name="USERNAME" required placeholder="请输入人员姓名" class="form-control"></textarea> <textarea name="username" required placeholder="请输入人员姓名" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group" v-if="trainSubject == '2'"> <div class="form-group" v-if="trainSubject == '2'">
<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="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> </div>
</div> </div>

10
ruoyi-admin/src/main/resources/templates/system/train/detail.html
Unescape View File

@ -15,7 +15,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is- ">所属地市：</label> <label class="col-sm-4 control-label is- ">所属地市：</label>
<div class="col-sm-8"> <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 value="">---请选择---</option>
<option v-for="option in CityList" :value="option.id" :key="option.id"> <option v-for="option in CityList" :value="option.id" :key="option.id">
{{ option.name }} {{ option.name }}
@ -28,7 +28,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is- ">所属区县：</label> <label class="col-sm-4 control-label is- ">所属区县：</label>
<div class="col-sm-8"> <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 value="">---请选择---</option>
<option v-for="option in AreaList" :value="option.id" :key="option.id"> <option v-for="option in AreaList" :value="option.id" :key="option.id">
{{ option.name }} {{ option.name }}
@ -67,7 +67,7 @@
<div class="form-group" v-if="trainSubject == '0'"> <div class="form-group" v-if="trainSubject == '0'">
<label class="col-sm-2 control-label is- ">人员姓名：</label> <label class="col-sm-2 control-label is- ">人员姓名：</label>
<div class="col-sm-10"> <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 value="">---请选择---</option>
<option v-for="option in userList" :value="option.userId" :key="option.userId"> <option v-for="option in userList" :value="option.userId" :key="option.userId">
{{ option.userName }} {{ option.userName }}
@ -78,7 +78,7 @@
<div class="form-group" v-if="trainSubject == '1'"> <div class="form-group" v-if="trainSubject == '1'">
<label class="col-sm-2 control-label is- ">人员姓名：</label> <label class="col-sm-2 control-label is- ">人员姓名：</label>
<div class="col-sm-10"> <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> </div>
<div class="form-group" v-if="trainSubject == '2'"> <div class="form-group" v-if="trainSubject == '2'">
@ -157,7 +157,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">培训评价：</label> <label class="col-sm-2 control-label">培训评价：</label>
<div class="col-sm-10"> <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> </div>
</div> </div>

18
ruoyi-admin/src/main/resources/templates/system/train/edit.html
Unescape View File

@ -8,14 +8,14 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app"> <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
<form class="form-horizontal m" id="form-train-edit" th:object="${tdTrain}"> <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"> <input name="deptId" type="hidden" th:field="*{deptId}" id="treeId">
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">所属地市：</label> <label class="col-sm-4 control-label is-required">所属地市：</label>
<div class="col-sm-8"> <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 value="">---请选择---</option>
<option v-for="option in CityList" :value="option.id" :key="option.id"> <option v-for="option in CityList" :value="option.id" :key="option.id">
{{ option.name }} {{ option.name }}
@ -28,7 +28,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">所属区县：</label> <label class="col-sm-4 control-label is-required">所属区县：</label>
<div class="col-sm-8"> <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 value="">---请选择---</option>
<option v-for="option in AreaList" :value="option.id" :key="option.id"> <option v-for="option in AreaList" :value="option.id" :key="option.id">
{{ option.name }} {{ option.name }}
@ -67,7 +67,7 @@
<div class="form-group" v-if="trainSubject == '0'"> <div class="form-group" v-if="trainSubject == '0'">
<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="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 value="">---请选择---</option>
<option v-for="option in userList" :value="option.userId" :key="option.userId"> <option v-for="option in userList" :value="option.userId" :key="option.userId">
{{ option.userName }} {{ option.userName }}
@ -78,13 +78,13 @@
<div class="form-group" v-if="trainSubject == '1'"> <div class="form-group" v-if="trainSubject == '1'">
<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="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> </div>
<div class="form-group" v-if="trainSubject == '2'"> <div class="form-group" v-if="trainSubject == '2'">
<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="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> </div>
</div> </div>
@ -198,9 +198,9 @@
data: { data: {
CityList: [], CityList: [],
AreaList:[], AreaList:[],
City:[[${tdTrain.AREAID}]], City:[[${tdTrain.areaid}]],
Area:[[${tdTrain.FRAMEWORK}]], Area:[[${tdTrain.framework}]],
userName:[[${tdTrain.USERNAME}]], userName:[[${tdTrain.username}]],
userList:[], userList:[],
params:{ params:{
parentId:'', parentId:'',

20
ruoyi-admin/src/main/resources/templates/system/train/examine.html
Unescape View File

@ -9,13 +9,13 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app"> <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
<form class="form-horizontal m" id="form-train-examine" th:object="${tdTrain}"> <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="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is- ">所属地市：</label> <label class="col-sm-4 control-label is- ">所属地市：</label>
<div class="col-sm-8"> <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 value="">---请选择---</option>
<option v-for="option in CityList" :value="option.id" :key="option.id"> <option v-for="option in CityList" :value="option.id" :key="option.id">
{{ option.name }} {{ option.name }}
@ -28,7 +28,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is- ">所属区县：</label> <label class="col-sm-4 control-label is- ">所属区县：</label>
<div class="col-sm-8"> <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 value="">---请选择---</option>
<option v-for="option in AreaList" :value="option.id" :key="option.id"> <option v-for="option in AreaList" :value="option.id" :key="option.id">
{{ option.name }} {{ option.name }}
@ -67,7 +67,7 @@
<div class="form-group" v-if="trainSubject == '0'"> <div class="form-group" v-if="trainSubject == '0'">
<label class="col-sm-2 control-label is- ">人员姓名：</label> <label class="col-sm-2 control-label is- ">人员姓名：</label>
<div class="col-sm-10"> <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 value="">---请选择---</option>
<option v-for="option in userList" :value="option.userId" :key="option.userId"> <option v-for="option in userList" :value="option.userId" :key="option.userId">
{{ option.userName }} {{ option.userName }}
@ -78,13 +78,13 @@
<div class="form-group" v-if="trainSubject == '1'"> <div class="form-group" v-if="trainSubject == '1'">
<label class="col-sm-2 control-label is- ">人员姓名：</label> <label class="col-sm-2 control-label is- ">人员姓名：</label>
<div class="col-sm-10"> <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> </div>
<div class="form-group" v-if="trainSubject == '2'"> <div class="form-group" v-if="trainSubject == '2'">
<label class="col-sm-2 control-label is- ">人员姓名：</label> <label class="col-sm-2 control-label is- ">人员姓名：</label>
<div class="col-sm-10"> <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> </div>
</div> </div>
@ -151,7 +151,7 @@
<div class="form-group"> <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="col-sm-10">
<textarea name="TRAININFO" required class="form-control">[[*{TRAININFO}]]</textarea> <textarea name="traininfo" required class="form-control">[[*{traininfo}]]</textarea>
</div> </div>
</div> </div>
</div> </div>
@ -223,9 +223,9 @@
data: { data: {
CityList: [], CityList: [],
AreaList:[], AreaList:[],
City:[[${tdTrain.AREAID}]], City:[[${tdTrain.areaid}]],
Area:[[${tdTrain.FRAMEWORK}]], Area:[[${tdTrain.framework}]],
userName:[[${tdTrain.USERNAME}]], userName:[[${tdTrain.username}]],
userList:[], userList:[],
params:{ params:{
parentId:'', parentId:'',

4
ruoyi-admin/src/main/resources/templates/system/train/train.html
Unescape View File

@ -16,7 +16,7 @@
</li> </li>
<li> <li>
<label>所属地区：</label> <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 value="">请选择</option>
<option v-for="option in CityList" :value="option.id" :key="option.id"> <option v-for="option in CityList" :value="option.id" :key="option.id">
{{ option.name }} {{ option.name }}
@ -104,7 +104,7 @@
}, },
{ {
field: 'id', field: 'id',
title: 'ID', title: 'id',
visible: false visible: false
}, },
{ {

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdIndentureMapper.java
Unescape View File

@ -17,7 +17,7 @@ public interface TdIndentureMapper
* @param indentureId 维修商主键 * @param indentureId 维修商主键
* @return 维修商 * @return 维修商
*/ */
public TdIndenture selectTdIndentureByIndentureId(String indentureId); public TdIndenture selectTdIndentureByIndentureId(Long indentureId);
/** /**
* 查询维修商列表 * 查询维修商列表
@ -57,5 +57,5 @@ public interface TdIndentureMapper
* @param indentureIds 需要删除的数据主键集合 * @param indentureIds 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteTdIndentureByIndentureIds(String[] indentureIds); public int deleteTdIndentureByIndentureIds(Long[] indentureIds);
} }

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdLeaveMapper.java
Unescape View File

@ -59,5 +59,5 @@ public interface TdLeaveMapper extends BaseMapper<TdLeave>
* @param ids 需要删除的数据主键集合 * @param ids 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteTdLeaveByIds(String[] ids); public int deleteTdLeaveByIds(Long[] ids);
} }

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdTrainMapper.java
Unescape View File

@ -61,7 +61,7 @@ public interface TdTrainMapper extends BaseMapper<TdTrain>
* @param IDs 需要删除的数据主键集合 * @param IDs 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteTdTrainByIDs(String[] IDs); public int deleteTdTrainByIDs(Long[] IDs);
public TrainCountDTO selectCountList(); public TrainCountDTO selectCountList();
} }

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ITdIndentureService.java
Unescape View File

@ -17,7 +17,7 @@ public interface ITdIndentureService
* @param indentureId 维修商主键 * @param indentureId 维修商主键
* @return 维修商 * @return 维修商
*/ */
public TdIndenture selectTdIndentureByIndentureId(String indentureId); public TdIndenture selectTdIndentureByIndentureId(Long indentureId);
/** /**
* 查询维修商列表 * 查询维修商列表

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdIndentureServiceImpl.java
Unescape View File

@ -29,7 +29,7 @@ public class TdIndentureServiceImpl implements ITdIndentureService
* @return 维修商 * @return 维修商
*/ */
@Override @Override
public TdIndenture selectTdIndentureByIndentureId(String indentureId) public TdIndenture selectTdIndentureByIndentureId(Long indentureId)
{ {
return tdIndentureMapper.selectTdIndentureByIndentureId(indentureId); return tdIndentureMapper.selectTdIndentureByIndentureId(indentureId);
} }
@ -80,7 +80,7 @@ public class TdIndentureServiceImpl implements ITdIndentureService
@Override @Override
public int deleteTdIndentureByIndentureIds(String indentureIds) public int deleteTdIndentureByIndentureIds(String indentureIds)
{ {
return tdIndentureMapper.deleteTdIndentureByIndentureIds(Convert.toStrArray(indentureIds)); return tdIndentureMapper.deleteTdIndentureByIndentureIds(Convert.toLongArray(indentureIds));
} }
/** /**

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java
Unescape View File

@ -81,7 +81,7 @@ public class TdLeaveServiceImpl implements ITdLeaveService
@Override @Override
public int deleteTdLeaveByIds(String ids) public int deleteTdLeaveByIds(String ids)
{ {
return tdLeaveMapper.deleteTdLeaveByIds(Convert.toStrArray(ids)); return tdLeaveMapper.deleteTdLeaveByIds(Convert.toLongArray(ids));
} }
/** /**

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdTrainServiceImpl.java
Unescape View File

@ -87,7 +87,7 @@ public class TdTrainServiceImpl extends ServiceImpl<TdTrainMapper,TdTrain> imple
@Override @Override
public int deleteTdTrainByIDs(String IDs) public int deleteTdTrainByIDs(String IDs)
{ {
return tdTrainMapper.deleteTdTrainByIDs(Convert.toStrArray(IDs)); return tdTrainMapper.deleteTdTrainByIDs(Convert.toLongArray(IDs));
} }
/** /**

8
ruoyi-system/src/main/resources/mapper/system/TdIndentureMapper.xml
Unescape View File

@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectTdIndentureByIndentureId" parameterType="String" resultMap="TdIndentureResult"> <select id="selectTdIndentureByIndentureId" parameterType="Long" resultMap="TdIndentureResult">
<include refid="selectTdIndentureVo"/> <include refid="selectTdIndentureVo"/>
where indenture_id = #{indentureId} where indenture_id = #{indentureId}
</select> </select>
@ -103,11 +103,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<delete id="deleteTdIndentureByIndentureId" parameterType="String"> <delete id="deleteTdIndentureByIndentureId" parameterType="String">
delete from td_indenture where INDENTURE_ID = #{indentureId} delete from td_indenture where indenture_id = #{indentureId}
</delete> </delete>
<delete id="deleteTdIndentureByIndentureIds" parameterType="String"> <delete id="deleteTdIndentureByIndentureIds" parameterType="Long">
delete from td_indenture where INDENTURE_ID in delete from td_indenture where indenture_id in
<foreach item="indentureId" collection="array" open="(" separator="," close=")"> <foreach item="indentureId" collection="array" open="(" separator="," close=")">
#{indentureId} #{indentureId}
</foreach> </foreach>

2
ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
Unescape View File

@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from td_leave where id = #{id} delete from td_leave where id = #{id}
</delete> </delete>
<delete id="deleteTdLeaveByIds" parameterType="String"> <delete id="deleteTdLeaveByIds" parameterType="Long">
delete from td_leave where id in delete from td_leave where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}

10
ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
Unescape View File

@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="propertyName" column="property_name" /> <result property="propertyName" column="property_name" />
<result property="computerType" column="computer_type_" /> <result property="computerType" column="computer_type_" />
<result property="propertyMiji" column="property_miji" /> <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="remark" column="remark" />
<result property="isCurcial" column="is_curcial" /> <result property="isCurcial" column="is_curcial" />
<result property="isSoftware" column="is_software" /> <result property="isSoftware" column="is_software" />
@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTdPropertyInfoVo"> <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> </sql>
<select id="selectTdPropertyInfoList" parameterType="TdPropertyInfo" resultMap="TdPropertyInfoResult"> <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="propertyName != null and propertyName != ''"> and property_name like concat('%', #{propertyName}, '%')</if>
<if test="computerType != null and computerType != ''"> and computer_type_ = #{computerType}</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="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="isCurcial != null and isCurcial != ''"> and is_curcial = #{isCurcial}</if>
<if test="isSoftware != null and isSoftware != ''"> and is_software = #{isSoftware}</if> <if test="isSoftware != null and isSoftware != ''"> and is_software = #{isSoftware}</if>
<if test="username != null and username != ''"> and username like concat('%', #{username}, '%')</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="propertyName != null">property_name,</if>
<if test="computerType != null">computer_type_,</if> <if test="computerType != null">computer_type_,</if>
<if test="propertyMiji != null">property_miji,</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="remark != null">remark,</if>
<if test="isCurcial != null">is_curcial,</if> <if test="isCurcial != null">is_curcial,</if>
<if test="isSoftware != null">is_software,</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="propertyName != null">property_name = #{propertyName},</if>
<if test="computerType != null">computer_type_ = #{computerType},</if> <if test="computerType != null">computer_type_ = #{computerType},</if>
<if test="propertyMiji != null">property_miji = #{propertyMiji},</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="remark != null">remark = #{remark},</if>
<if test="isCurcial != null">is_curcial = #{isCurcial},</if> <if test="isCurcial != null">is_curcial = #{isCurcial},</if>
<if test="isSoftware != null">is_software = #{isSoftware},</if> <if test="isSoftware != null">is_software = #{isSoftware},</if>

4
ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
Unescape View File

@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTdTrainList" parameterType="TdTrain" resultMap="TdTrainResult"> <select id="selectTdTrainList" parameterType="TdTrain" resultMap="TdTrainResult">
<include refid="selectTdTrainVo"/> <include refid="selectTdTrainVo"/>
<where> <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="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="trainType != null and trainType != ''"> and train_type = #{trainType}</if> <if test="trainType != null and trainType != ''"> and train_type = #{trainType}</if>
<if test="trainSubject != null and trainSubject != ''"> and train_subject = #{trainSubject}</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 from td_train where id = #{id}
</delete> </delete>
<delete id="deleteTdTrainByIDs" parameterType="String"> <delete id="deleteTdTrainByIDs" parameterType="Long">
delete from td_train where id in delete from td_train where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}

Write Preview
Loading…
Cancel
Save