Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gk
Project
Project
Details
Activity
Releases
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
micro_app
gk
Commits
87ecacb7
Commit
87ecacb7
authored
May 13, 2020
by
yangshuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改提交成绩查看成绩,图片多次显示问题
parent
9dd3899d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
MicroApiController.java
...om/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
+1
-3
ScoreController.java
...a/com/dlbridge/jadp/plugins/cmpt/web/ScoreController.java
+6
-3
score.js
src/main/webapp/static/js/score.js
+1
-1
No files found.
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
View file @
87ecacb7
...
@@ -910,15 +910,13 @@ public class MicroApiController {
...
@@ -910,15 +910,13 @@ public class MicroApiController {
Integer
switchMileage
=
funcSetting
.
getMileage
();
Integer
switchMileage
=
funcSetting
.
getMileage
();
Integer
subsectionMileage
=
0
;
Integer
subsectionMileage
=
0
;
if
(
scoreItemId
!=
null
){
if
(
scoreItemId
!=
null
){
Result
<
ScoreItem
>
scoreItem
=
scoreService
.
getScoreItem
(
scoreItemId
);
Result
<
ScoreItem
>
scoreItem
=
scoreService
.
getScoreItem
(
scoreItemId
);
ScoreItem
content
=
scoreItem
.
getContent
();
ScoreItem
content
=
scoreItem
.
getContent
();
if
(
content
.
getSubsectionMileage
()==
null
)
if
(
content
.
getSubsectionMileage
()==
null
)
subsectionMileage
=
0
;
subsectionMileage
=
0
;
result
.
put
(
"score"
,
new
Score
().
setDate
(
content
.
getSubsectionTime
().
substring
(
0
,
10
)).
setDuration
(
content
.
getSubsectionscore
()).
setMileage
(
subsectionMileage
).
setSwitchMileage
(
switchMileage
));
result
.
put
(
"score"
,
new
Score
().
setDate
(
content
.
getSubsectionTime
().
substring
(
0
,
10
)).
setDuration
(
content
.
getSubsectionscore
()).
setMileage
(
subsectionMileage
).
setSwitchMileage
(
switchMileage
));
}
else
{
}
else
{
//初始阶段没有上传成绩,json也显示score,方便前端判断
//初始阶段没有上传成绩,json也显示score,方便前端判断
result
.
put
(
"score"
,
new
Score
().
setDate
(
"0000-00-00"
).
setDuration
(
0
).
setMileage
(
subsectionMileage
).
setSwitchMileage
(
switchMileage
));
result
.
put
(
"score"
,
new
Score
().
setDate
(
"0000-00-00"
).
setDuration
(
0
).
setMileage
(
subsectionMileage
).
setSwitchMileage
(
switchMileage
));
}
}
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ScoreController.java
View file @
87ecacb7
...
@@ -102,18 +102,21 @@ public class ScoreController {
...
@@ -102,18 +102,21 @@ public class ScoreController {
long
duration
=
0
;
long
duration
=
0
;
String
date
=
""
;
String
date
=
""
;
for
(
CmptScoreRule
rule
:
rules
){
for
(
CmptScoreRule
rule
:
rules
){
Score
score
=
new
Score
();
score
.
setId
(-
1
);
scores
.
add
(
score
);
Integer
scoreItemId
=
cmptScoreRuleService
.
getCmptScoreRulesMapByMarkNoAndRuleId
(
markNo
,
rule
.
getId
());
Integer
scoreItemId
=
cmptScoreRuleService
.
getCmptScoreRulesMapByMarkNoAndRuleId
(
markNo
,
rule
.
getId
());
if
(
scoreItemId
==
null
)
continue
;
if
(
scoreItemId
==
null
)
continue
;
Result
<
ScoreItem
>
scoreItem
=
scoreService
.
getScoreItem
(
scoreItemId
);
Result
<
ScoreItem
>
scoreItem
=
scoreService
.
getScoreItem
(
scoreItemId
);
ScoreItem
content
=
scoreItem
.
getContent
();
ScoreItem
content
=
scoreItem
.
getContent
();
if
(
content
==
null
)
continue
;
if
(
content
==
null
)
continue
;
Score
score
=
new
Score
()
.
setDate
(
content
.
getSubsectionTime
().
substring
(
0
,
10
))
score
.
setDate
(
content
.
getSubsectionTime
().
substring
(
0
,
10
))
.
setDuration
(
content
.
getSubsectionscore
())
.
setDuration
(
content
.
getSubsectionscore
())
.
setDurationStr
(
DateUtil
.
formatDate
(
content
.
getSubsectionscore
())).
setMileage
(
content
.
getSubsectionMileage
())
.
setDurationStr
(
DateUtil
.
formatDate
(
content
.
getSubsectionscore
())).
setMileage
(
content
.
getSubsectionMileage
())
.
setId
(
content
.
getId
());
.
setId
(
content
.
getId
());
scores
.
add
(
score
);
duration
+=
content
.
getSubsectionscore
();
duration
+=
content
.
getSubsectionscore
();
date
=
score
.
getDate
();
date
=
score
.
getDate
();
}
}
...
...
src/main/webapp/static/js/score.js
View file @
87ecacb7
...
@@ -47,7 +47,7 @@ $(document).ready(function () {
...
@@ -47,7 +47,7 @@ $(document).ready(function () {
'<td></td>'
+
'<td></td>'
+
'</tr>'
);
'</tr>'
);
$
.
each
(
result
.
scores
,
function
(
i
,
e
)
{
$
.
each
(
result
.
scores
,
function
(
i
,
e
)
{
if
(
e
.
id
<
0
)
return
true
;
$
(
'#score-body'
).
append
(
" <tr class='line-tr' data-id='"
+
e
.
id
+
"'>
\n
"
+
$
(
'#score-body'
).
append
(
" <tr class='line-tr' data-id='"
+
e
.
id
+
"'>
\n
"
+
" <td></td>
\n
"
+
" <td></td>
\n
"
+
" <td></td>
\n
"
+
" <td></td>
\n
"
+
...
...
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