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

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

@@ -43,14 +43,6 @@ public interface CmptScoreRuleMapper {
 
     Integer getCmptScoreRulesMapBymarkNoAndRuleId(@Param("markNo") String markNo,@Param("ruleId") Integer ruleId);
 
-    /**
-     * 根据markNO和ruleId，检查本条规则，这个号码牌是否提交过成绩
-     * @param cmptId
-     * @param markNo
-     * @param ruleId
-     * @return
-     */
-    Integer getCmptScoreRulesMapBymarkNoAndRuleId(@Param("cmptId") Integer cmptId,@Param("markNo") String markNo,@Param("ruleId") Integer ruleId);
 
     CmptScoreRule getCmptScoreRulesById(int id);
 

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

@@ -91,5 +91,5 @@ public interface CmptScoreRuleScoreInfoMapper {
      * @param ruleId
      * @return
      */
-    List<HashMap<String,Object>> getCmptScoreRuleScoreInfoStatistics(int cmptId, int roadId, int ruleId);
+    HashMap<String,Object> getCmptScoreRuleScoreInfoStatistics(int cmptId, int roadId, int ruleId);
 }

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

@@ -41,12 +41,11 @@
     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 id="getCmptScoreRuleScoreInfoStatistics" resultType="hashmap">
+   	SELECT
+	count(case when checkStatus=0 then 1 end) as 'Unprocessed',
+	count(case when checkStatus=1 then 1 end) as 'pass',
+	count(case when checkStatus=2 then 1 end) as 'nopass' 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 a.del_flg=0 and b.isDelete=0
    </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

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -159,8 +160,8 @@ public class CmptScoreRuleScoreInfoService {
      * @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);
+    public  HashMap<String,Object> getCmptScoreRuleScoreInfoStatistics(int cmptId,int roadId,int ruleId){
+        HashMap<String,Object> cmptScoreRuleScoreInfoStatistics=cmptScoreRuleScoreInfoMapper.getCmptScoreRuleScoreInfoStatistics(cmptId,roadId,ruleId);
         return cmptScoreRuleScoreInfoStatistics;
     }
 

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

@@ -69,7 +69,7 @@ public class CmptScoreRuleScoreInfoController {
     @RequestMapping("getCmptScoreRuleScoreInfoStatistics")
     @ResponseBody
     public Result getCmptScoreRuleScoreInfoStatistics(int cmptId,int roadId,int ruleId){
-        List<HashMap<String,Object>> resultList=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoStatistics(cmptId,roadId,ruleId);
+        HashMap<String,Object> resultList=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoStatistics(cmptId,roadId,ruleId);
         return new Result().success().setContent(resultList);
     }