Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
e0ddc92e
Commit
e0ddc92e
authored
Jul 01, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改接口
parent
b232e004
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
FireStationMapper.java
...in/amos/boot/module/jcs/api/mapper/FireStationMapper.java
+2
-0
DataDictionaryController.java
...t/module/jcs/biz/controller/DataDictionaryController.java
+0
-2
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireStationMapper.java
View file @
e0ddc92e
...
...
@@ -24,6 +24,7 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
+
"select * from cb_fire_station where cb_fire_station.is_delete=0 "
+
"<if test='par.name!=null'> and cb_fire_station.name like CONCAT('%',#{par.name},'%') </if>"
+
"<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"
+
"<if test='par.bizCompanyCode!=null'> and cb_fire_station.biz_company_code like CONCAT('',#{par.bizCompanyCode},'%') </if>"
+
"limit #{pageNum},#{pageSize}"
+
"</script>"
)
List
<
FireStationDto
>
getFireStation
(
@Param
(
"pageNum"
)
int
pageNum
,
@Param
(
"pageSize"
)
int
pageSize
,
@Param
(
"par"
)
FireStationDto
par
);
...
...
@@ -31,6 +32,7 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
+
"select COUNT(cb_fire_station.sequence_nbr) num from cb_fire_station where cb_fire_station.is_delete=0 "
+
"<if test='par.name!=null'> and cb_fire_station.name like CONCAT('%',#{par.name},'%') </if>"
+
"<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"
+
"<if test='par.bizCompanyCode!=null'> and cb_fire_station.biz_company_code like CONCAT('',#{par.bizCompanyCode},'%') </if>"
+
"</script>"
)
Map
<
String
,
Long
>
getFireStationCount
(
@Param
(
"par"
)
FireStationDto
par
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/DataDictionaryController.java
View file @
e0ddc92e
...
...
@@ -184,8 +184,6 @@ public class DataDictionaryController extends BaseController {
Collection
<
DataDictionary
>
list
=
iDataDictionaryService
.
list
(
queryWrapper
);
List
<
MenuFrom
>
menus
=
TreeParser
.
getTreexin
(
null
,
list
,
DataDictionary
.
class
.
getName
(),
"getCode"
,
0
,
"getName"
,
"getParent"
);
redisUtils
.
set
(
RedisKey
.
DATA_DICTIONARY_CODE
+
type
,
JSON
.
toJSON
(
menus
),
time
);
MenuFrom
Me
=
new
MenuFrom
(
"-1"
,
"-1"
,
"-1"
,
"危化品库"
,
"危化品库"
,
"危化品库"
,
"-1"
);
Me
.
setIsLeaf
(
false
);
Me
.
setChildren
(
menus
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment