删除scoreservice使用的地方代码

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

@@ -7,7 +7,7 @@
     VALUES(#{cmptScoreRuleScoreInfo.cmptId},#{cmptScoreRuleScoreInfo.ruleId},#{cmptScoreRuleScoreInfo.markNo},#{cmptScoreRuleScoreInfo.subsectionTime},#{cmptScoreRuleScoreInfo.subsectionscore},#{cmptScoreRuleScoreInfo.subsectionMileage},#{cmptScoreRuleScoreInfo.cmptPace},0,now(),now())
     </insert>
     <select id="getScoreRuleScoreInfoByMarkNo" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo">
-    select id,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage,cmptPace  from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and mark_no=#{markNo}
+    select id,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage,cmptPace  from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and mark_no=#{markNo} and checkStatus=1 and isDelete=0
     </select>
     <select id="getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo" resultType="int">
     select id from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and rule_id=#{ruleId} and mark_no=#{markNo}

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

@@ -40,4 +40,12 @@ public interface CmptSettingMapper {
     List<CmptSettingTemplate> queryAllCmptSetting();
 
     void insert(CmptSetting setting);
+
+    /**
+     * cmptId 和 type 查看指定配置是否被开启
+     * @param cmptId
+     * @param type
+     * @return
+     */
+    int getCmptSettingsVisibilityByCmptIdAndType(int cmptId,int type);
 }

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

@@ -160,4 +160,12 @@
         from gk_cmptsetting
     </select>
 
+    <select id="getCmptSettingsVisibilityByCmptIdAndType" resultType="int">
+        SELECT
+        visibility
+        FROM gk_cmptsetting
+        WHERE cmptid = #{cmptId} and type=#{type} and del_flag=0 limit 1
+    </select>
+
+
 </mapper>
\ No newline at end of file

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

@@ -82,4 +82,14 @@ public class CmptSettingService {
 
     }
 
+    /**
+     * cmptId,type判断指定功能是否被开启
+     * @param cmptId
+     * @param type
+     * @return
+     */
+    public  int getCmptSettingsVisibilityByCmptIdAndType(int cmptId,int type){
+        return cmptSettingMapper.getCmptSettingsVisibilityByCmptIdAndType(cmptId,type);
+    }
+
 }

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

@@ -951,6 +951,17 @@ public class MicroApiController {
     public Result getScore(HttpServletRequest request) {
         String cmptId = request.getParameter("cmptId");
         String keyword = request.getParameter("keyword");
+        //如果是提交成绩，成绩审核通过后直接显示证书
+        int visibility=cmptSetting.getCmptSettingsVisibilityByCmptIdAndType(Integer.valueOf(cmptId),12);
+        if(visibility==1){
+            HashMap<String,Object>  scoreMap=cmptScoreRuleScoreInfoService.getUserScoreByMarkNo(Integer.valueOf(cmptId),keyword);
+            if((int)scoreMap.get("userTotalScore")>0){
+                return Result.success().setMsg("请下载证书");
+            }else{
+                return Result.fail().setMsg("您尚未完赛，无法查看完赛证书");
+            }
+        }
+        //扫码打卡，自动打卡走计时证书的逻辑，需要验证是否可以下载证书
         String result = remoteService.checkCert(cmptId,keyword);
         if(request != null){
             JSONObject obj = JSONObject.parseObject(result);