Merge branch 'master' of https://gitlab.geexek.com.cn/micro_app/gk

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

 package com.dlbridge.jadp.plugins.cmpt.bean;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,7 +22,7 @@ public class CmptScoreRuleScoreInfo {
     private int ruleId;
     private String markNo;
     private String name;
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private String subsectionTime;
     private Integer subsectionscore;
     private Integer subsectionMileage;
@@ -29,8 +30,11 @@ public class CmptScoreRuleScoreInfo {
     private Integer cmptPace;
     //用户提交的成绩依据材料路径
     private List<String> scoreFieldValueList;
+    @JsonIgnore
     private Integer isDelete;
+    @JsonIgnore
     private String insertTime;
+    @JsonIgnore
     private String updateTime;
 
 }

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

@@ -6,6 +6,7 @@ import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo;
 import com.dlbridge.jadp.plugins.cmpt.bean.UserScoreExcelBean;
 import org.springframework.data.domain.Pageable;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface CmptScoreRuleScoreInfoMapper {
@@ -75,4 +76,20 @@ public interface CmptScoreRuleScoreInfoMapper {
      */
      Integer uploadCmptScoreRuleScoreInfoByPassedIds(int cmptId, int roadId, int ruleId,int[] passedIds);
 
+    /**
+     * 根据提交成绩Id，获取这个人号码牌
+     * @param cmptId
+     * @return
+     */
+    List<CmptScoreRuleScoreInfo> getScoreRuleScoreInfoByIds(Integer cmptId, int[] ids);
+
+
+    /**
+     * 获取待审核，审核，未通过的人数统计
+     * @param cmptId
+     * @param roadId
+     * @param ruleId
+     * @return
+     */
+    List<HashMap<String,Object>> getCmptScoreRuleScoreInfoStatistics(int cmptId, int roadId, int ruleId);
 }

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

@@ -16,7 +16,7 @@
     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
     </select>
     <select id="getCmptScoreRuleScoreInfoList" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo">
-    select b.id as cmptScoreRuleScoreId,a.member_name as name,a.cmpt_id as cmptId,rule_id as ruleId,b.mark_no as markNo,subsectionscore as subsectionscore,subsectionMileage as subsectionMileage,checkStatus,cmptPace  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 order by subsectionTime desc limit #{page.offset},#{page.size}
+    select b.id as cmptScoreRuleScoreId,a.member_name as name,a.cmpt_id as cmptId,rule_id as ruleId,b.mark_no as markNo,subsectionscore as subsectionscore,subsectionTime,subsectionMileage as subsectionMileage,checkStatus,cmptPace  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 order by subsectionTime desc limit #{page.offset},#{page.size}
     </select>
 
     <update id="uploadCmptScoreRuleScoreInfoByNoPassedIds">
@@ -37,5 +37,16 @@
     </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>
 
+    <select id="getCmptScoreRuleScoreInfoStatistics" resultMap="BaseResultMap" >
+   		select checkStatus,count(checkStatus) as checkStatusNum 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=11843  and a.cmpt_item=21177 and rule_id=21  and a.del_flg=0 and b.isDelete=0  GROUP BY checkStatus
+   </select>
+    <resultMap id="BaseResultMap" type="Map">
+        <result column="state" property="state" jdbcType="INTEGER" />
+        <result column="num" property="num" jdbcType="INTEGER" />
+    </resultMap>
 </mapper>
\ No newline at end of file

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

@@ -17,6 +17,7 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -137,10 +138,31 @@ public class CmptScoreRuleScoreInfoService {
     public boolean uploadCmptScoreRuleScoreInfo(int cmptId, int roadId, int ruleId,int[] noPassedIds,int[] passedIds){
        Integer uploadNumberNoPassedIds= cmptScoreRuleScoreInfoMapper.uploadCmptScoreRuleScoreInfoByNoPassedIds(cmptId,roadId,ruleId,noPassedIds);
        Integer uploadNumberPassedIds= cmptScoreRuleScoreInfoMapper.uploadCmptScoreRuleScoreInfoByPassedIds(cmptId,roadId,ruleId,passedIds);
+       if(uploadNumberNoPassedIds>0){
+           List<CmptScoreRuleScoreInfo> cmptScoreRuleScoreInfoList=cmptScoreRuleScoreInfoMapper.getScoreRuleScoreInfoByIds(cmptId,passedIds);
+           for (CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo:cmptScoreRuleScoreInfoList) {
+               String markNo=cmptScoreRuleScoreInfo.getMarkNo();
+               //成绩通过将成绩发送到计时系统
+               scoreReviewByMarkNo(cmptId,markNo,1);
+           }
+       }
        if(uploadNumberNoPassedIds>0 ||uploadNumberPassedIds>0){
            return true;
        }
        return false;
     }
 
+    /**
+     * 获取待审核，审核，未通过的人数统计
+     * @param cmptId
+     * @param roadId
+     * @param ruleId
+     * @return
+     */
+    public  List<HashMap<String,Object>> getCmptScoreRuleScoreInfoStatistics(int cmptId,int roadId,int ruleId){
+        List<HashMap<String,Object>> cmptScoreRuleScoreInfoStatistics=cmptScoreRuleScoreInfoMapper.getCmptScoreRuleScoreInfoStatistics(cmptId,roadId,ruleId);
+        return cmptScoreRuleScoreInfoStatistics;
+    }
+
+
 }

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -58,6 +59,21 @@ public class CmptScoreRuleScoreInfoController {
         return new Result().success();
     }
 
+    /**
+     * 获取待审核，审核，未通过的人数列表
+     * @param cmptId
+     * @param roadId
+     * @param ruleId
+     * @return
+     */
+    @RequestMapping("getCmptScoreRuleScoreInfoStatistics")
+    @ResponseBody
+    public Result getCmptScoreRuleScoreInfoStatistics(int cmptId,int roadId,int ruleId){
+        List<HashMap<String,Object>> resultList=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoStatistics(cmptId,roadId,ruleId);
+        return new Result().success().setContent(resultList);
+    }
+
+
 
 
 }