成绩证书下载逻辑修改，提交成绩有一个没有审核通过的，都不能下载证书

src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/CmptScoreRuleScoreInfo.java

@@ -27,7 +27,7 @@ public class CmptScoreRuleScoreInfo {
     private Integer subsectionscore;
     private int subsectionMileage;
     //成绩审核的状态，0为未审核，1为审核通过，2为审核未通过
-    private Integer checkStatus;
+    private int checkStatus;
     private float cmptPace;
     //用户提交的成绩依据材料路径
     private List<String> scoreFieldValueList;

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

@@ -115,4 +115,12 @@ public interface CmptScoreRuleScoreInfoMapper {
      * @return
      */
     int getCmptScoreRuleIdMapByMarkNoAndScoreId(String markNo,int cmptScoreRuleScoreId);
+
+    /**
+     * 根据cmptId和markNo获取所有提交成绩的记录，包括，审核通过，未审核，待审核
+     * @param cmptId
+     * @param markNo
+     * @return
+     */
+    List<CmptScoreRuleScoreInfo> getScoreRuleScoreInfosBycmptIdAndMarkNo(@Param("cmptId") int cmptId, @Param("markNo") String markNo);
 }

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

@@ -60,5 +60,8 @@ gk_cmpt_score_rule_scoreinfo as b on a.cmpt_id=b.cmptId  and  a.nick_id=b.mark_n
      select rule_id as ruleId from gk_cmpt_score_rule_scoreinfo where id=#{cmptScoreRuleScoreId} LIMIT 1
     </select>
 
+    <select id="getScoreRuleScoreInfosBycmptIdAndMarkNo" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo">
+        select id,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage,cmptPace,checkStatus  from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and mark_no=#{markNo} and isDelete=0
+    </select>
 
 </mapper>
\ No newline at end of file

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

@@ -196,5 +196,17 @@ public class CmptScoreRuleScoreInfoService {
         return cmptScoreRuleScoreInfoMapper.getCmptScoreRuleIdMapByMarkNoAndScoreId(markNo,cmptScoreRuleScoreId);
     }
 
+    /**
+     * 根据cmptId和markNo获取所有提交的记录，审核通过、未审核通过、待审核的
+     * @param cmptId
+     * @param markNo
+     * @return
+     */
+    public List<CmptScoreRuleScoreInfo> getScoreRuleScoreInfosBycmptIdAndMarkNo(int cmptId,String markNo){
+        List<CmptScoreRuleScoreInfo> cmptScoreRuleScoreInfoList=cmptScoreRuleScoreInfoMapper.getScoreRuleScoreInfosBycmptIdAndMarkNo(cmptId,markNo);
+        return cmptScoreRuleScoreInfoList;
+    }
+
+
 
 }

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

@@ -983,38 +983,42 @@ 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((long)scoreMap.get("userTotalScore")>0){
-                return Result.success().setMsg("请下载证书");
-            }else{
-                return Result.fail().setMsg("您尚未完赛，无法查看完赛证书");
+//        //如果是提交成绩，成绩审核通过后直接显示证书
+//        int visibility=cmptSetting.getCmptSettingsVisibilityByCmptIdAndType(Integer.valueOf(cmptId),12);
+//        if(visibility==1){
+            List<CmptScoreRuleScoreInfo> cmptScoreRuleScoreInfoList =cmptScoreRuleScoreInfoService.getScoreRuleScoreInfosBycmptIdAndMarkNo(Integer.valueOf(cmptId),keyword);
+            //如果有成绩提交记录，先检查成绩提交记录是否都审核完毕，如果没有成绩提交记录，检查扫码、自动打卡是否可以下载证书
+            if(cmptScoreRuleScoreInfoList.size()>0){
+                for (CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo : cmptScoreRuleScoreInfoList) {
+                    //如果存在未审核，审核不通过的记录，不能下载完赛证书
+                    if(cmptScoreRuleScoreInfo.getCheckStatus()==0 || cmptScoreRuleScoreInfo.getCheckStatus()==2){
+                        return Result.fail().setMsg("提交成绩后，成绩审核后才能查看证书");
                     }
                 }
+                    return Result.success().setMsg("请下载证书");
+            }else{
             //扫码打卡，自动打卡走计时证书的逻辑，需要验证是否可以下载证书
-        String result = remoteService.checkCert(cmptId,keyword);
-        if(request != null){
+            String result = remoteService.checkCert(cmptId, keyword);
+            if (request != null) {
                 JSONObject obj = JSONObject.parseObject(result);
                 Integer status = obj.getIntValue("status");
-            if(status != null){
-                if(status == 0){
+                if (status != null) {
+                    if (status == 0) {
                         return Result.success().setMsg(obj.getString("message"));
-                }else if(status == 101){
+                    } else if (status == 101) {
                         return Result.fail().setMsg("您尚未完赛，无法查看完赛证书");
-                }else if(status == 102){
+                    } else if (status == 102) {
                         return Result.fail().setMsg("证书未发布，无法查看完赛证书");
-                }else{
+                    } else {
                         return Result.fail().setMsg(obj.getString("message"));
                     }
                 }
-
                 return Result.fail().setMsg(obj.getString("message"));
-        }else{
+            } else {
                 return Result.fail().setMsg("网络异常");
             }
         }
+    }
 
     /**
      * 获取携带gps坐标的打卡点