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
d36320b4
Commit
d36320b4
authored
May 13, 2020
by
yangshuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改提交成绩查看成绩,图片多次显示问题
parent
bcc25ca7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
4 deletions
+17
-4
pom.xml
pom.xml
+1
-1
CmptScoreFieldValueMapper.java
...dp/plugins/cmpt/dao/mapper/CmptScoreFieldValueMapper.java
+2
-0
CmptScoreFieldValueMapper.xml
...adp/plugins/cmpt/dao/mapper/CmptScoreFieldValueMapper.xml
+8
-0
CmptScoreFieldValueService.java
...jadp/plugins/cmpt/service/CmptScoreFieldValueService.java
+4
-0
MicroApiController.java
...om/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
+1
-1
score.js
src/main/webapp/static/js/score.js
+1
-2
No files found.
pom.xml
View file @
d36320b4
...
@@ -293,7 +293,7 @@
...
@@ -293,7 +293,7 @@
<dependency>
<dependency>
<groupId>
com.neusoft.www
</groupId>
<groupId>
com.neusoft.www
</groupId>
<artifactId>
geexek-utils
</artifactId>
<artifactId>
geexek-utils
</artifactId>
<version>
1.
0-SNAPSHOT
</version>
<version>
1.
1.1
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
junit
</groupId>
<groupId>
junit
</groupId>
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreFieldValueMapper.java
View file @
d36320b4
...
@@ -34,4 +34,6 @@ public interface CmptScoreFieldValueMapper {
...
@@ -34,4 +34,6 @@ public interface CmptScoreFieldValueMapper {
List
<
CmptScoreFieldValue
>
getCmptScoreFieldValueByRuleIdAndMarkNo
(
@Param
(
"ruleId"
)
Integer
ruleId
,
@Param
(
"markNo"
)
String
markNo
);
List
<
CmptScoreFieldValue
>
getCmptScoreFieldValueByRuleIdAndMarkNo
(
@Param
(
"ruleId"
)
Integer
ruleId
,
@Param
(
"markNo"
)
String
markNo
);
void
deleteFieldValueByRuleIdAndMarkNo
(
@Param
(
"ruleId"
)
Integer
ruleId
,
@Param
(
"markNo"
)
String
markNo
);
void
deleteFieldValueByRuleIdAndMarkNo
(
@Param
(
"ruleId"
)
Integer
ruleId
,
@Param
(
"markNo"
)
String
markNo
);
List
<
CmptScoreFieldValue
>
getCmptScoreFieldValueByCmptIdAndMarkNoAndRuleId
(
@Param
(
"cmptId"
)
Integer
cmptId
,
@Param
(
"ruleId"
)
int
ruleId
,
@Param
(
"markNo"
)
String
markNo
);
}
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreFieldValueMapper.xml
View file @
d36320b4
...
@@ -39,4 +39,12 @@
...
@@ -39,4 +39,12 @@
<update
id=
"deleteFieldValueByRuleIdAndMarkNo"
>
<update
id=
"deleteFieldValueByRuleIdAndMarkNo"
>
update gk_cmpt_score_field_value set isDelete=1 where rule_id =#{ruleId} and markNo=#{markNo}
update gk_cmpt_score_field_value set isDelete=1 where rule_id =#{ruleId} and markNo=#{markNo}
</update>
</update>
<select
id=
"getCmptScoreFieldValueByCmptIdAndMarkNoAndRuleId"
resultType=
"CmptScoreFieldValue"
>
select a.field_name scoreFieldName,a.id scoreFieldId, b.scoreFieldValue,a.cmpt_id cmptId
from gk_cmpt_score_field a
left join gk_cmpt_score_field_value b
on a.id = b.scoreFieldId and b.markNo=#{markNo} and b.isDelete=0 and b.rule_id=#{ruleId}
where a.cmpt_id=#{cmptId} and a.is_delete=0 order by a.id
</select>
</mapper>
</mapper>
\ No newline at end of file
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptScoreFieldValueService.java
View file @
d36320b4
...
@@ -53,4 +53,8 @@ public class CmptScoreFieldValueService {
...
@@ -53,4 +53,8 @@ public class CmptScoreFieldValueService {
public
void
deleteFieldValueByRuleIdAndMarkNo
(
Integer
ruleId
,
String
markNo
)
{
public
void
deleteFieldValueByRuleIdAndMarkNo
(
Integer
ruleId
,
String
markNo
)
{
cmptScoreFieldValueMapper
.
deleteFieldValueByRuleIdAndMarkNo
(
ruleId
,
markNo
);
cmptScoreFieldValueMapper
.
deleteFieldValueByRuleIdAndMarkNo
(
ruleId
,
markNo
);
}
}
public
List
<
CmptScoreFieldValue
>
getCmptScoreFieldValueByCmptIdAndMarkNoAndRuleId
(
Integer
cmptId
,
String
markNo
,
int
ruleId
)
{
return
cmptScoreFieldValueMapper
.
getCmptScoreFieldValueByCmptIdAndMarkNoAndRuleId
(
cmptId
,
ruleId
,
markNo
);
}
}
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
View file @
d36320b4
...
@@ -910,7 +910,7 @@ public class MicroApiController {
...
@@ -910,7 +910,7 @@ public class MicroApiController {
}
}
List
<
CmptScoreFieldValue
>
list
=
cmptScoreFieldValueService
.
getCmptScoreFieldValueByCmptIdAndMarkNo
(
score
.
getCmptId
(),
score
.
getMarkNo
());
List
<
CmptScoreFieldValue
>
list
=
cmptScoreFieldValueService
.
getCmptScoreFieldValueByCmptIdAndMarkNo
AndRuleId
(
score
.
getCmptId
(),
score
.
getMarkNo
(),
rule
.
getId
());
result
.
put
(
"items"
,
list
);
result
.
put
(
"items"
,
list
);
return
Result
.
success
().
setContent
(
result
);
return
Result
.
success
().
setContent
(
result
);
...
...
src/main/webapp/static/js/score.js
View file @
d36320b4
...
@@ -239,12 +239,11 @@ $(document).ready(function () {
...
@@ -239,12 +239,11 @@ $(document).ready(function () {
$
(
'#score-body'
).
on
(
'click'
,
'.opt'
,
function
()
{
$
(
'#score-body'
).
on
(
'click'
,
'.opt'
,
function
()
{
var
tr
=
$
(
this
).
parents
(
'tr'
);
var
tr
=
$
(
this
).
parents
(
'tr'
);
var
id
=
tr
.
attr
(
'data-id'
);
var
id
=
tr
.
attr
(
'data-id'
);
var
markNO
=
tr
.
find
(
'td:eq(2)'
).
text
();
if
(
id
){
if
(
id
){
qikoo
.
dialog
.
confirm
(
'确认要删除?'
,
qikoo
.
dialog
.
confirm
(
'确认要删除?'
,
function
()
{
function
()
{
$
.
ajax
({
$
.
ajax
({
url
:
'/gk/score/delScore/'
+
markNO
+
'/'
+
id
,
url
:
'/gk/score/delScore/'
+
$
(
'.search'
).
val
()
+
'/'
+
id
,
type
:
'post'
,
type
:
'post'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
if
(
data
.
status
){
if
(
data
.
status
){
...
...
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