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
fbf56b53
Commit
fbf56b53
authored
Jun 03, 2023
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改问题
parent
589cb373
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
CheckController.java
...join/amos/patrol/business/controller/CheckController.java
+2
-1
PointServiceImpl.java
...n/amos/patrol/business/service/impl/PointServiceImpl.java
+8
-7
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 @
fbf56b53
...
@@ -123,8 +123,9 @@ public class CheckController extends AbstractBaseController {
...
@@ -123,8 +123,9 @@ public class CheckController extends AbstractBaseController {
@ApiParam
(
value
=
"查询条件"
,
required
=
false
)
@RequestBody
(
required
=
false
)
CheckInfoPageParam
param
,
@ApiParam
(
value
=
"查询条件"
,
required
=
false
)
@RequestBody
(
required
=
false
)
CheckInfoPageParam
param
,
@ApiParam
(
value
=
"分页参数"
,
required
=
true
)
CommonPageable
commonPageable
)
{
@ApiParam
(
value
=
"分页参数"
,
required
=
true
)
CommonPageable
commonPageable
)
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
ReginParams
reginParams
=
getSelectedOrgInfo
();
param
.
setBizOrgCode
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
());
param
.
setOrderBy
(
"checkDate desc"
);
param
.
setOrderBy
(
"checkDate desc"
);
param
.
setBizOrgCode
(
"3"
.
equals
(
param
.
getIsOK
())
?
null
:
ObjectUtils
.
isEmpty
(
param
.
getBizOrgCode
())
?
reginParams
.
getPersonIdentity
().
getBizOrgCode
()
:
param
.
getBizOrgCode
());
if
(
commonPageable
!=
null
){
if
(
commonPageable
!=
null
){
param
.
setPageNumber
(
commonPageable
.
getPageNumber
()-
1
);
param
.
setPageNumber
(
commonPageable
.
getPageNumber
()-
1
);
param
.
setPageSize
(
commonPageable
.
getPageSize
());
param
.
setPageSize
(
commonPageable
.
getPageSize
());
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java
View file @
fbf56b53
...
@@ -1440,17 +1440,18 @@ public class PointServiceImpl implements IPointService {
...
@@ -1440,17 +1440,18 @@ public class PointServiceImpl implements IPointService {
String
passRate
=
""
;
String
passRate
=
""
;
String
passMiss
=
""
;
String
passMiss
=
""
;
if
(
over_num
==
0
)
{
if
(
over_num
==
0
)
{
passRate
=
0
+
""
;
passRate
=
0
+
""
;
}
else
{
}
else
{
passRate
=
getPercent
(
over_num
,
today_num
);
passRate
=
getPercent
(
over_num
,
today_num
);
}
}
today_num
=
miss_num
+
today_num
;
// today_num = miss_num +
today_num;
if
(
miss_num
==
0
)
{
if
(
miss_num
==
0
)
{
passMiss
=
0
+
""
;
passMiss
=
0
+
""
;
}
else
{
}
else
{
passMiss
=
getPercent
(
miss_num
,
today_num
);
passMiss
=
getPercent
(
miss_num
,
today_num
);
}
}
passRate
=
passRate
.
replace
(
"%"
,
""
);
passMiss
=
passMiss
.
replace
(
"%"
,
""
);
maps
.
put
(
"passRate"
,
passRate
);
maps
.
put
(
"passRate"
,
passRate
);
maps
.
put
(
"passMiss"
,
passMiss
);
maps
.
put
(
"passMiss"
,
passMiss
);
return
maps
;
return
maps
;
...
...
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