Commit a4daff48 authored by sunyuhua's avatar sunyuhua

修改删除成绩,没有删除成绩照片记录的问题

parent 7735575c
......@@ -90,7 +90,7 @@ public interface CmptScoreRuleScoreInfoMapper {
* @param ruleId
* @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
......@@ -99,14 +99,14 @@ public interface CmptScoreRuleScoreInfoMapper {
* @param ruleId
* @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
* @return
*/
int deleteCmptScoreRuleScoreInfoById(int cmptScoreRuleScoreId);
int deleteCmptScoreRuleScoreInfoById(@Param("cmptScoreRuleScoreId") int cmptScoreRuleScoreId);
/**
* 获取ruleId,根据markNo和cmptscoreRuleScoreId
......@@ -114,7 +114,7 @@ public interface CmptScoreRuleScoreInfoMapper {
* @param cmptScoreRuleScoreId
* @return
*/
Integer getCmptScoreRuleIdMapByMarkNoAndScoreId(String markNo,int cmptScoreRuleScoreId);
Integer getCmptScoreRuleIdMapByMarkNoAndScoreId(@Param("markNo") String markNo,@Param("cmptScoreRuleScoreId") int cmptScoreRuleScoreId);
/**
* 根据cmptId和markNo获取所有提交成绩的记录,包括,审核通过,未审核,待审核
......
......@@ -244,9 +244,8 @@ public class ScoreController {
//Integer ruleId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndScoreId(markNo,scoreItemId);
//scoreService.deleteScoreItem(scoreItemId);//20200520修改
//cmptScoreRuleService.deleteScoreMap(markNo,scoreItemId);
cmptScoreRuleScoreInfoService.deleteCmptScoreRuleScoreInfoById(scoreItemId);//成绩详情中主键Id
Integer ruleId = cmptScoreRuleScoreInfoService.getCmptScoreRuleIdMapByMarkNoAndScoreId(markNo,scoreItemId);
cmptScoreRuleScoreInfoService.deleteCmptScoreRuleScoreInfoById(scoreItemId);//成绩详情中主键Id
if(ruleId != null){
cmptScoreFieldValueService.deleteFieldValueByRuleIdAndMarkNo(ruleId,markNo);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment