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
a4daff48
Commit
a4daff48
authored
May 23, 2020
by
sunyuhua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改删除成绩,没有删除成绩照片记录的问题
parent
7735575c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
CmptScoreRuleScoreInfoMapper.java
...plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.java
+4
-4
ScoreController.java
...a/com/dlbridge/jadp/plugins/cmpt/web/ScoreController.java
+1
-2
No files found.
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.java
View file @
a4daff48
...
@@ -90,7 +90,7 @@ public interface CmptScoreRuleScoreInfoMapper {
...
@@ -90,7 +90,7 @@ public interface CmptScoreRuleScoreInfoMapper {
* @param ruleId
* @param ruleId
* @return
* @return
*/
*/
HashMap
<
String
,
Object
>
getCmptScoreRuleScoreInfoStatistics
(
int
cmptId
,
int
roadId
,
int
ruleId
);
HashMap
<
String
,
Object
>
getCmptScoreRuleScoreInfoStatistics
(
@Param
(
"cmptId"
)
int
cmptId
,
@Param
(
"roadId"
)
int
roadId
,
@Param
(
"ruleId"
)
int
ruleId
);
/**
/**
* 根据markNo,ruleId获取CmptScoreRuleScoreInfo
* 根据markNo,ruleId获取CmptScoreRuleScoreInfo
...
@@ -99,14 +99,14 @@ public interface CmptScoreRuleScoreInfoMapper {
...
@@ -99,14 +99,14 @@ public interface CmptScoreRuleScoreInfoMapper {
* @param ruleId
* @param ruleId
* @return
* @return
*/
*/
CmptScoreRuleScoreInfo
getCmptScoreRuleScoreInfoByruleIdAndMarkNo
(
int
cmptId
,
String
markNo
,
int
ruleId
);
CmptScoreRuleScoreInfo
getCmptScoreRuleScoreInfoByruleIdAndMarkNo
(
@Param
(
"cmptId"
)
int
cmptId
,
@Param
(
"markNo"
)
String
markNo
,
@Param
(
"ruleId"
)
int
ruleId
);
/**
/**
* 根据主键删除成绩记录
* 根据主键删除成绩记录
* @param cmptScoreRuleScoreId
* @param cmptScoreRuleScoreId
* @return
* @return
*/
*/
int
deleteCmptScoreRuleScoreInfoById
(
int
cmptScoreRuleScoreId
);
int
deleteCmptScoreRuleScoreInfoById
(
@Param
(
"cmptScoreRuleScoreId"
)
int
cmptScoreRuleScoreId
);
/**
/**
* 获取ruleId,根据markNo和cmptscoreRuleScoreId
* 获取ruleId,根据markNo和cmptscoreRuleScoreId
...
@@ -114,7 +114,7 @@ public interface CmptScoreRuleScoreInfoMapper {
...
@@ -114,7 +114,7 @@ public interface CmptScoreRuleScoreInfoMapper {
* @param cmptScoreRuleScoreId
* @param cmptScoreRuleScoreId
* @return
* @return
*/
*/
Integer
getCmptScoreRuleIdMapByMarkNoAndScoreId
(
String
markNo
,
int
cmptScoreRuleScoreId
);
Integer
getCmptScoreRuleIdMapByMarkNoAndScoreId
(
@Param
(
"markNo"
)
String
markNo
,
@Param
(
"cmptScoreRuleScoreId"
)
int
cmptScoreRuleScoreId
);
/**
/**
* 根据cmptId和markNo获取所有提交成绩的记录,包括,审核通过,未审核,待审核
* 根据cmptId和markNo获取所有提交成绩的记录,包括,审核通过,未审核,待审核
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ScoreController.java
View file @
a4daff48
...
@@ -244,9 +244,8 @@ public class ScoreController {
...
@@ -244,9 +244,8 @@ public class ScoreController {
//Integer ruleId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndScoreId(markNo,scoreItemId);
//Integer ruleId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndScoreId(markNo,scoreItemId);
//scoreService.deleteScoreItem(scoreItemId);//20200520修改
//scoreService.deleteScoreItem(scoreItemId);//20200520修改
//cmptScoreRuleService.deleteScoreMap(markNo,scoreItemId);
//cmptScoreRuleService.deleteScoreMap(markNo,scoreItemId);
cmptScoreRuleScoreInfoService
.
deleteCmptScoreRuleScoreInfoById
(
scoreItemId
);
//成绩详情中主键Id
Integer
ruleId
=
cmptScoreRuleScoreInfoService
.
getCmptScoreRuleIdMapByMarkNoAndScoreId
(
markNo
,
scoreItemId
);
Integer
ruleId
=
cmptScoreRuleScoreInfoService
.
getCmptScoreRuleIdMapByMarkNoAndScoreId
(
markNo
,
scoreItemId
);
cmptScoreRuleScoreInfoService
.
deleteCmptScoreRuleScoreInfoById
(
scoreItemId
);
//成绩详情中主键Id
if
(
ruleId
!=
null
){
if
(
ruleId
!=
null
){
cmptScoreFieldValueService
.
deleteFieldValueByRuleIdAndMarkNo
(
ruleId
,
markNo
);
cmptScoreFieldValueService
.
deleteFieldValueByRuleIdAndMarkNo
(
ruleId
,
markNo
);
}
}
...
...
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