Merge remote-tracking branch 'origin/master'

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/CmptScoreRuleMapper.java

@@ -41,8 +41,9 @@ public interface CmptScoreRuleMapper {
 
     int saveScoreRuleMap(@Param("scoreRuleMap") ScoreRuleMap scoreRuleMap);
 
+    /**
     Integer getCmptScoreRulesMapBymarkNoAndRuleId(@Param("markNo") String markNo,@Param("ruleId") Integer ruleId);
-
+    */
 
     CmptScoreRule getCmptScoreRulesById(int id);
 

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

@@ -50,11 +50,11 @@
         from gk_cmpt_score_rule_map
         where mark_no=#{markNo} and rule_id=#{ruleId}
     </select>
-    -->
+
     <select id="getCmptScoreRulesMapBymarkNoAndRuleId" resultType="java.lang.Integer">
        select rule_id as scoreItemId  from gk_cmpt_score_rule_scoreinfo  where mark_no=#{markNo} and rule_id=#{ruleId}
     </select>
-
+    -->
 
     <delete id="delete">
         delete from gk_cmpt_score_rule where id = #{id}

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

@@ -80,7 +80,7 @@ public interface CmptScoreRuleScoreInfoMapper {
      * @param cmptId
      * @return
      */
-    List<CmptScoreRuleScoreInfo> getScoreRuleScoreInfoByIds(Integer cmptId, int[] ids);
+    List<CmptScoreRuleScoreInfo> getScoreRuleScoreInfoByIds(@Param("cmptId")  Integer cmptId,  @Param("ids") int[] ids);
 
 
     /**
@@ -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,5 +114,13 @@ public interface CmptScoreRuleScoreInfoMapper {
      * @param cmptScoreRuleScoreId
      * @return
      */
-    int getCmptScoreRuleIdMapByMarkNoAndScoreId(String markNo,int cmptScoreRuleScoreId);
+    Integer getCmptScoreRuleIdMapByMarkNoAndScoreId(@Param("markNo") String markNo,@Param("cmptScoreRuleScoreId")  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

@@ -9,8 +9,8 @@
     <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} 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}
+    <select id="getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo" resultType="Integer">
+    select id from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and rule_id=#{ruleId} and mark_no=#{markNo} and isDelete=0
     </select>
     <select id="getCmptScoreRuleScoreInfoToalNumer" resultType="int">
     select count(1) from geerunner.cmpt_enroll as a left join gk_cmpt_score_rule_scoreinfo as b on a.cmpt_id=b.cmptId  and  a.nick_id=b.mark_no  where a.cmpt_id=#{cmptId}  and a.cmpt_item=#{roadId} and rule_id=#{ruleId} and checkStatus=#{checkStatus} and a.del_flg=0 and b.isDelete=0
@@ -34,11 +34,15 @@
         <foreach item="passedId" index="index" collection="passedIds"
                  open="(" separator="," close=")">
             #{passedId}
-    </foreach>
+        </foreach>
     </update>
 
     <select id="getScoreRuleScoreInfoByIds" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo">
-    select id,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and id=#{id}
+    select id,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and isDelete=0 and id in
+        <foreach item="id" index="index" collection="ids"
+                 open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </select>
 
     <select id="getCmptScoreRuleScoreInfoStatistics" resultType="hashmap">
@@ -56,9 +60,12 @@ gk_cmpt_score_rule_scoreinfo as b on a.cmpt_id=b.cmptId  and  a.nick_id=b.mark_n
     <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 id="getCmptScoreRuleIdMapByMarkNoAndScoreId" resultType="Integer">
+     select rule_id as ruleId from gk_cmpt_score_rule_scoreinfo where id=#{cmptScoreRuleScoreId} and isDelete=0 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/dao/mapper/FuncSettingMapper.xml

@@ -30,7 +30,7 @@
                 switch_mileage=#{setting.mileage},
             </if>
             <if test="setting.switchScoreReview != null">
-                switch_scoreReview=#{setting.switchScoreReview}
+                switch_scoreReview=#{setting.switchScoreReview},
             </if>
         </set>
         where cmpt_id = #{setting.cmptId}

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

@@ -116,13 +116,14 @@ public class CmptScoreRuleScoreInfoService {
      * @param ruleId
      * @parm checkstatus 1为已审核 0为未审核 2为未通过
      * @return
+     * size=10&page=0&cmptId=11888&checkstatus=0&roadId=21296&ruleId=79
      */
     public Page<List<CmptScoreRuleScoreInfo>> getCmptScoreRuleScoreInfo(Pageable page, int cmptId, int roadId, int ruleId,int checkstatus){
         long count = cmptScoreRuleScoreInfoMapper.getCmptScoreRuleScoreInfoToalNumer(cmptId,roadId,ruleId,checkstatus);
         List<CmptScoreRuleScoreInfo> list = cmptScoreRuleScoreInfoMapper.getCmptScoreRuleScoreInfoList(page,cmptId,roadId,ruleId,checkstatus);
         List<CmptScoreFieldValue> cmptScoreFieldValueList=cmptScoreFieldValueService.getCmptScoreFieldValueByCmptIdAndRuleId(cmptId,ruleId);
         for(CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo:list){
-            List<String> filterResutList=cmptScoreFieldValueList.parallelStream().filter(s->s.getMarkNo().equals(cmptScoreRuleScoreInfo.getMarkNo())).map(CmptScoreFieldValue::getScoreFieldValue).collect(Collectors.toList());
+            List<String> filterResutList=cmptScoreFieldValueList.parallelStream().filter(s->s.getMarkNo()!=null&&s.getMarkNo().equals(cmptScoreRuleScoreInfo.getMarkNo())).map(CmptScoreFieldValue::getScoreFieldValue).collect(Collectors.toList());
             cmptScoreRuleScoreInfo.setScoreFieldValueList(filterResutList);
         }
         return PageFactory.setContent(list, page, count);
@@ -196,5 +197,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/service/CmptScoreRuleService.java

@@ -57,10 +57,11 @@ public class CmptScoreRuleService {
     }
 
 
+    /**
     public Integer getCmptScoreRulesMapByMarkNoAndRuleId(String markNo, Integer ruleid) {
         return cmptScoreRuleMapper.getCmptScoreRulesMapBymarkNoAndRuleId(markNo,ruleid);
     }
-
+    */
     public CmptScoreRule getCmptScoreRulesById(int id) {
         return cmptScoreRuleMapper.getCmptScoreRulesById(id);
     }

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

@@ -60,11 +60,11 @@ public class CmptScoreRuleController {
             bean.setStartTime(rule.getStartTime());
             bean.setEndTime(rule.getEndTime());
             bean.setIndex(rule.getIndex());
-
-            Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(markNo, rule.getId());
+            Integer scoreItemId=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(cmptId,markNo, rule.getId());
+            //Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(markNo, rule.getId());
             if(scoreItemId != null){
                 CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(cmptId,markNo,rule.getId());
-                if(cmptScoreRuleScoreInfo.getMarkNo() != null){
+                if(cmptScoreRuleScoreInfo!=null && cmptScoreRuleScoreInfo.getMarkNo() != null){
                     bean.setUploaded(true);
                 }else{
                     bean.setUploaded(false);

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

@@ -945,8 +945,8 @@ public class MicroApiController {
         Map<String,Object> result = new HashMap<>();
         result.put("user",userInfo);
 //EnrollInfo(id=0, enrollId=10629228, userName=孙玉华, markNo=S100002, roadName=3公里, phone=18121278668, roadId=21296, remark=null, gender=男)
-        Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(userInfo.getMarkNo(),rule.getId());
-
+        //Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(userInfo.getMarkNo(),rule.getId());
+        Integer scoreItemId=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(score.getCmptId(),userInfo.getMarkNo(), rule.getId());
         //小程序添加里程的是否需要用户填写
         FuncSetting funcSetting =funcSettingService.getSettingByCmptId(score.getCmptId());
         int switchMileage=funcSetting.getMileage();
@@ -983,36 +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("请下载证书");
+            List<CmptScoreRuleScoreInfo> cmptScoreRuleScoreInfoList =cmptScoreRuleScoreInfoService.getScoreRuleScoreInfosBycmptIdAndMarkNo(Integer.valueOf(cmptId),keyword);
+            //如果有成绩提交记录，先检查成绩提交记录是否都审核完毕，如果没有成绩提交记录，检查扫码、自动打卡是否可以下载证书
+            if(cmptScoreRuleScoreInfoList.size()>0){
+                //查看赛事有几条成绩提交的规则，规则定义了几条，成绩记录也必须大于规则条数
+                List<CmptScoreRule> cmptScoreRuleList= cmptScoreRuleService.getCmptScoreRulesByCmptId(Integer.valueOf(cmptId));
+                if(cmptScoreRuleScoreInfoList.size()<cmptScoreRuleList.size()){
+                    return Result.fail().setMsg("成绩审核后,才能查看证书,请耐心等待");
+                }
+                for (CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo : cmptScoreRuleScoreInfoList) {
+                    //如果存在未审核，审核不通过的记录，不能下载完赛证书
+                    if(cmptScoreRuleScoreInfo.getCheckStatus()==0 || cmptScoreRuleScoreInfo.getCheckStatus()==2){
+                        return Result.fail().setMsg("成绩审核后,才能查看证书,请耐心等待");
+                    }
+                }
+                    return Result.success().setMsg("请下载证书");
             }else{
-                return Result.fail().setMsg("您尚未完赛，无法查看完赛证书");
-            }
-        }
-        //扫码打卡，自动打卡走计时证书的逻辑，需要验证是否可以下载证书
-        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){
-                    return Result.success().setMsg(obj.getString("message"));
-                }else if(status == 101){
-                    return Result.fail().setMsg("您尚未完赛，无法查看完赛证书");
-                }else if(status == 102){
-                    return Result.fail().setMsg("证书未发布，无法查看完赛证书");
-                }else{
-                    return Result.fail().setMsg(obj.getString("message"));
+            //扫码打卡，自动打卡走计时证书的逻辑，需要验证是否可以下载证书
+            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) {
+                        return Result.success().setMsg(obj.getString("message"));
+                    } else if (status == 101) {
+                        return Result.fail().setMsg("您尚未完赛，无法查看完赛证书");
+                    } else if (status == 102) {
+                        return Result.fail().setMsg("证书未发布，无法查看完赛证书");
+                    } else {
+                        return Result.fail().setMsg(obj.getString("message"));
+                    }
                 }
+                return Result.fail().setMsg(obj.getString("message"));
+            } else {
+                return Result.fail().setMsg("网络异常");
             }
-
-            return Result.fail().setMsg(obj.getString("message"));
-        }else{
-            return Result.fail().setMsg("网络异常");
         }
     }
 

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

@@ -99,9 +99,8 @@ public class ScoreController {
             Score score = new Score();
             score.setId(-1);
             scores.add(score);
-            Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(markNo,rule.getId());
-            if(scoreItemId == null) continue;
-
+//            Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(markNo,rule.getId());
+//            if(scoreItemId == null) continue;
             CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(cmptId,markNo,rule.getId());
             //ScoreItem content = scoreItem.getContent();
             if(cmptScoreRuleScoreInfo == null) continue;
@@ -161,7 +160,8 @@ public class ScoreController {
             rules.forEach(rule -> {
                 ruleMap.put(rule.getId(),0);
                 enrollUsers.forEach(user -> {
-                    Integer scoreId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(user.getMarkNo(), rule.getId());
+                    //Integer scoreId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(user.getMarkNo(), rule.getId());
+                    Integer scoreId=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(cmptId,user.getMarkNo(), rule.getId());
                     if(scoreId != null){// 标识有成绩
                         Integer integer = ruleMap.get(rule.getId());
                         if(integer == null){
@@ -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);
         }