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
3a543738
Commit
3a543738
authored
Aug 15, 2022
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改线路单位
parent
8004815c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
PlanTaskController.java
...n/amos/patrol/business/controller/PlanTaskController.java
+1
-1
dbTemplate_plan.xml
...m-patrol/src/main/resources/db/mapper/dbTemplate_plan.xml
+2
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java
View file @
3a543738
...
@@ -75,7 +75,7 @@ public class PlanTaskController extends AbstractBaseController {
...
@@ -75,7 +75,7 @@ public class PlanTaskController extends AbstractBaseController {
@ApiParam
(
value
=
"查询条件"
,
required
=
false
)
@RequestBody
(
required
=
false
)
PlanTaskPageParam
params
,
@ApiParam
(
value
=
"查询条件"
,
required
=
false
)
@RequestBody
(
required
=
false
)
PlanTaskPageParam
params
,
@ApiParam
(
value
=
"分页参数"
,
required
=
true
)
CommonPageable
commonPageable
)
{
@ApiParam
(
value
=
"分页参数"
,
required
=
true
)
CommonPageable
commonPageable
)
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
ReginParams
reginParams
=
getSelectedOrgInfo
();
params
.
setBizOrgCode
(
reginParams
.
getPersonIdentity
().
get
Company
BizOrgCode
());
params
.
setBizOrgCode
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
());
if
(!
ObjectUtils
.
isEmpty
(
commonPageable
))
{
if
(!
ObjectUtils
.
isEmpty
(
commonPageable
))
{
params
.
setPageNumber
(
commonPageable
.
getPageNumber
()-
1
);
params
.
setPageNumber
(
commonPageable
.
getPageNumber
()-
1
);
...
...
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan.xml
View file @
3a543738
...
@@ -143,7 +143,8 @@
...
@@ -143,7 +143,8 @@
when 0 THEN '否'
when 0 THEN '否'
else '是' END) as isFixedDateName,
else '是' END) as isFixedDateName,
IFNULL(a.plan_end,"") planEnd,a.plan_end planEnd,a.plan_type planType,
IFNULL(a.plan_end,"") planEnd,a.plan_end planEnd,a.plan_type planType,
b.name routeName,a.route_id routeId,a.is_fixed_date isFixedDate,a.remark,a.remark1
b.name routeName,a.route_id routeId,a.is_fixed_date isFixedDate,a.remark,a.remark1,
b.dept_name bizOrgCode
FROM
FROM
p_plan a,
p_plan a,
p_route b
p_route b
...
...
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