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
8004815c
Commit
8004815c
authored
Aug 15, 2022
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
4f01e2a4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
CheckController.java
...join/amos/patrol/business/controller/CheckController.java
+1
-1
PlanController.java
...ejoin/amos/patrol/business/controller/PlanController.java
+1
-1
RouteController.java
...join/amos/patrol/business/controller/RouteController.java
+2
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java
View file @
8004815c
...
...
@@ -125,7 +125,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam
(
value
=
"查询条件"
,
required
=
false
)
@RequestBody
(
required
=
false
)
CheckInfoPageParam
param
,
@ApiParam
(
value
=
"分页参数"
,
required
=
true
)
CommonPageable
commonPageable
)
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
param
.
setBizOrgCode
(
reginParams
.
getPersonIdentity
().
get
Company
BizOrgCode
());
param
.
setBizOrgCode
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
());
param
.
setOrderBy
(
"checkDate desc"
);
if
(
commonPageable
!=
null
){
param
.
setPageNumber
(
commonPageable
.
getPageNumber
()-
1
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java
View file @
8004815c
...
...
@@ -80,7 +80,7 @@ public class PlanController extends AbstractBaseController {
PlanInfoPageParam
param
=
new
PlanInfoPageParam
();
ReginParams
reginParams
=
getSelectedOrgInfo
();
param
.
setBizOrgCode
(
reginParams
.
getPersonIdentity
().
get
Company
BizOrgCode
());
param
.
setBizOrgCode
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
());
List
<
HashMap
<
String
,
Object
>>
list
=
planService
.
getPlanInfoNoPage
(
param
);
return
CommonResponseUtil
.
success
(
list
);
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/RouteController.java
View file @
8004815c
...
...
@@ -95,7 +95,7 @@ public class RouteController extends AbstractBaseController {
try
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
//获取所在公司code
String
bizOrgCode
=
reginParams
.
getPersonIdentity
().
get
Company
BizOrgCode
();
String
bizOrgCode
=
reginParams
.
getPersonIdentity
().
getBizOrgCode
();
queryRequests
.
setBizOrgCode
(
bizOrgCode
);
if
(
commonPageable
!=
null
){
queryRequests
.
setPageNumber
(
commonPageable
.
getPageNumber
()-
1
);
...
...
@@ -143,7 +143,7 @@ public class RouteController extends AbstractBaseController {
try
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
String
orgCode
=
reginParams
.
getPersonIdentity
().
get
Company
BizOrgCode
();
String
orgCode
=
reginParams
.
getPersonIdentity
().
getBizOrgCode
();
//2.查询
List
<
Route
>
routeList
=
routeService
.
queryRouteListNew
(
orgCode
);
List
<
Route
>
list
=
routeList
.
stream
().
filter
(
e
->
e
.
getIsExist
().
equals
(
"true"
)).
collect
(
Collectors
.
toList
());
...
...
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