删除scoreservice使用的地方代码

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.java

@@ -92,6 +92,27 @@ public interface CmptScoreRuleScoreInfoMapper {
      */
     HashMap<String,Object> getCmptScoreRuleScoreInfoStatistics(int cmptId, int roadId, int ruleId);
 
-
+    /**
+     * 根据markNo，ruleId获取CmptScoreRuleScoreInfo
+     * @param cmptId
+     * @param markNo
+     * @param ruleId
+     * @return
+     */
     CmptScoreRuleScoreInfo getCmptScoreRuleScoreInfoByruleIdAndMarkNo(int cmptId,String markNo,int ruleId);
+
+    /**
+     * 根据主键删除成绩记录
+     * @param cmptScoreRuleScoreId
+     * @return
+     */
+    int deleteCmptScoreRuleScoreInfoById(int cmptScoreRuleScoreId);
+
+    /**
+     * 获取ruleId，根据markNo和cmptscoreRuleScoreId
+     * @param markNo
+     * @param cmptScoreRuleScoreId
+     * @return
+     */
+    int getCmptScoreRuleIdMapByMarkNoAndScoreId(String markNo,int cmptScoreRuleScoreId);
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.xml

@@ -52,4 +52,13 @@ gk_cmpt_score_rule_scoreinfo as b on a.cmpt_id=b.cmptId  and  a.nick_id=b.mark_n
     <select id="getCmptScoreRuleScoreInfoByruleIdAndMarkNo" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo">
     select id as cmptScoreRuleScoreId,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and rule_id=#{ruleId} and mark_no=#{markNo}
     </select>
+
+    <update id="deleteCmptScoreRuleScoreInfoById">
+        UPDATE gk_cmpt_score_rule_scoreinfo as b set b.isDelete=1 where b.id=#{cmptScoreRuleScoreId}
+    </update>
+    <select id="getCmptScoreRuleIdMapByMarkNoAndScoreId" resultType="int">
+     select rule_id as ruleId from gk_cmpt_score_rule_scoreinfo where id=#{cmptScoreRuleScoreId} LIMIT 1
+    </select>
+
+
 </mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptScoreRuleScoreInfoService.java

@@ -178,5 +178,24 @@ public class CmptScoreRuleScoreInfoService {
         return cmptScoreRuleScoreInfoMapper.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(cmptId,markNo,ruleId);
     }
 
+    /**
+     * 根据主键Id删除成绩记录
+     * @param cmptScoreRuleScoreId
+     * @return
+     */
+    public  Integer deleteCmptScoreRuleScoreInfoById(int cmptScoreRuleScoreId){
+        return cmptScoreRuleScoreInfoMapper.deleteCmptScoreRuleScoreInfoById(cmptScoreRuleScoreId);
+    }
+
+    /**
+     * 校验的接口，根据id和markno获取是第几条规则
+     * @param markNo
+     * @param cmptScoreRuleScoreId
+     * @return
+     */
+    public Integer getCmptScoreRuleIdMapByMarkNoAndScoreId(String markNo,int cmptScoreRuleScoreId){
+        return cmptScoreRuleScoreInfoMapper.getCmptScoreRuleIdMapByMarkNoAndScoreId(markNo,cmptScoreRuleScoreId);
+    }
+
 
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ScoreController.java

@@ -229,14 +229,24 @@ public class ScoreController {
         return Result.success().setContent(response);
     }
 
+    /**
+     * 删除单条成绩记录
+     * @param markNo
+     * @param scoreItemId
+     * @param response
+     * @return
+     */
     @RequestMapping("delScore/{markNo}/{scoreItemId}")
     @ResponseBody
-    public Result charts(@PathVariable("markNo") String markNo,
+    public Result delScore(@PathVariable("markNo") String markNo,
                          @PathVariable("scoreItemId") Integer scoreItemId,
                          HttpServletResponse response) {
-        Integer ruleId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndScoreId(markNo,scoreItemId);
-        //scoreService.deleteScoreItem(scoreItemId);//20200520记得修改
-        cmptScoreRuleService.deleteScoreMap(markNo,scoreItemId);
+        //Integer ruleId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndScoreId(markNo,scoreItemId);
+        //scoreService.deleteScoreItem(scoreItemId);//20200520修改
+        //cmptScoreRuleService.deleteScoreMap(markNo,scoreItemId);
+        cmptScoreRuleScoreInfoService.deleteCmptScoreRuleScoreInfoById(scoreItemId);//成绩详情中主键Id
+        Integer ruleId = cmptScoreRuleScoreInfoService.getCmptScoreRuleIdMapByMarkNoAndScoreId(markNo,scoreItemId);
+
         if(ruleId != null){
             cmptScoreFieldValueService.deleteFieldValueByRuleIdAndMarkNo(ruleId,markNo);
         }

src/main/resources/application.properties

-spring.profiles.active=dev
+spring.profiles.active=test