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
8d011bcc
Commit
8d011bcc
authored
Nov 01, 2021
by
李腾威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG 3312 3340
parent
64663fd6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
13 deletions
+23
-13
OrgUsrMapper.java
...join/amos/boot/module/common/api/mapper/OrgUsrMapper.java
+1
-1
OrgUsrMapper.xml
...ule-common-api/src/main/resources/mapper/OrgUsrMapper.xml
+21
-11
AlertCalledController.java
...boot/module/jcs/biz/controller/AlertCalledController.java
+1
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
View file @
8d011bcc
...
@@ -19,7 +19,7 @@ import java.util.Map;
...
@@ -19,7 +19,7 @@ import java.util.Map;
public
interface
OrgUsrMapper
extends
BaseMapper
<
OrgUsr
>
{
public
interface
OrgUsrMapper
extends
BaseMapper
<
OrgUsr
>
{
String
selectUpUnitByParam
(
@Param
(
"id"
)
String
biz_org_code
);
String
selectUpUnitByParam
(
@Param
(
"id"
)
String
biz_org_code
);
int
selectPersonListCount
(
Map
<
String
,
Object
>
map
);
int
selectPersonListCount
(
@Param
(
"map"
)
Map
<
String
,
Object
>
map
);
List
<
Map
<
String
,
Object
>>
selectPersonList
(
@Param
(
"map"
)
Map
<
String
,
Object
>
map
);
List
<
Map
<
String
,
Object
>>
selectPersonList
(
@Param
(
"map"
)
Map
<
String
,
Object
>
map
);
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @
8d011bcc
...
@@ -57,18 +57,28 @@
...
@@ -57,18 +57,28 @@
on u.sequence_nbr = g.instance_id
on u.sequence_nbr = g.instance_id
where
where
u.biz_org_type = 'person'
u.biz_org_type = 'person'
AND
AND
u.is_delete = 0
u.is_delete = 0
<if
test=
"map.bizOrgName != null"
>
GROUP BY
AND u.biz_org_name like concat('%',#{map.bizOrgName},'%')
u.sequence_nbr ,
</if>
u.biz_org_name ,
<if
test=
"map.personNumber!= null"
>
u.biz_org_code
AND v.field_value like concat('%',#{map.personNumber},'%')
order by u.rec_date desc
</if>
)a where a.sequenceNbr is not null
<if
test=
"map.bizOrgCode != null and map.bizOrgCode != '-1'"
>
AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
</select>
</if>
GROUP BY
u.sequence_nbr ,
u.biz_org_name ,
u.biz_org_code
order by u.rec_date desc
)a where a.sequenceNbr is not null
<if
test=
"map.fieldsValue != null"
>
<foreach
collection=
"map.fieldsValue.keys"
item=
"item"
>
AND a.${item} = #{map.fieldsValue[${item}]}
</foreach>
</if>
</select>
<!--机场单位人员按时间倒叙排列add order by u.rec_date desc 2021-09-08 by kongfm -->
<!--机场单位人员按时间倒叙排列add order by u.rec_date desc 2021-09-08 by kongfm -->
<select
id=
"selectPersonList"
resultType=
"Map"
>
<select
id=
"selectPersonList"
resultType=
"Map"
>
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java
View file @
8d011bcc
...
@@ -441,7 +441,7 @@ public class AlertCalledController extends BaseController {
...
@@ -441,7 +441,7 @@ public class AlertCalledController extends BaseController {
AlarmGiveStatisticsDto
dto
=
new
AlarmGiveStatisticsDto
();
AlarmGiveStatisticsDto
dto
=
new
AlarmGiveStatisticsDto
();
LambdaQueryWrapper
<
AlertCalled
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
AlertCalled
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
isNull
(
AlertCalled:
:
getFatherAlert
);
queryWrapper
.
isNull
(
AlertCalled:
:
getFatherAlert
);
queryWrapper
.
eq
(
AlertCalled:
:
getAlertStatus
,
tru
e
);
queryWrapper
.
eq
(
AlertCalled:
:
getAlertStatus
,
fals
e
);
queryWrapper
.
eq
(
AlertCalled:
:
getIsDelete
,
false
);
queryWrapper
.
eq
(
AlertCalled:
:
getIsDelete
,
false
);
Integer
alertNum
=
iAlertCalledService
.
getBaseMapper
().
selectCount
(
queryWrapper
);
Integer
alertNum
=
iAlertCalledService
.
getBaseMapper
().
selectCount
(
queryWrapper
);
dto
.
setAlarmNum
(
alertNum
);
dto
.
setAlarmNum
(
alertNum
);
...
...
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