Merge remote-tracking branch 'origin/master'

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

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

@@ -22,6 +22,7 @@ public class CmptScoreRuleScoreInfo {
     private Integer subsectionscore;
     private Integer subsectionMileage;
     private Integer checkStatus;
+    private Integer cmptPace;
     private Integer isDelete;
     private String insertTime;
     private String updateTime;

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

@@ -13,11 +13,11 @@
     select id from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and rule_id=#{ruleId} and mark_no=#{markNo}
     </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   where cmptId=#{cmptId}  and a.cmpt_item=#{roadId} and rule_id=#{ruleId} and checkStatus=#{checkStatus} and a.del_flag=0 and b.isDelete=0
+    select count(1) from geerunner.cmpt_enroll as a left join gk_cmpt_score_rule_scoreinfo as b on a.cmpt_id=b.cmptId   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 a.cmpt_id as cmptId,rule_id as ruleId,b.mark_no as markNo,subsectionscore as subsectionscore,subsectionMileage as subsectionMileage,checkStatus from geerunner.cmpt_enroll as a left join
-gk_cmpt_score_rule_scoreinfo as b on a.cmpt_id=b.cmptId   where cmptId=#{cmptId}  and a.cmpt_item=#{roadId} and rule_id=#{ruleId} and checkStatus=#{checkStatus} and a.del_flag=0 and b.isDelete=0 order by subsectionTime desc limit #{page.offset},#{page.size}
+    select 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   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">
 

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

@@ -8,7 +8,9 @@ import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
@@ -35,7 +37,8 @@ public class CmptScoreRuleScoreInfoController {
      * @return
      */
     @RequestMapping("getCmptScoreRuleScoreInfo")
-    public Page<List<CmptScoreRuleScoreInfo>> getCmptScoreRuleScoreInfo(Pageable page, int cmptId, int roadId, int ruleId,int checkstatus) {
+    @ResponseBody
+    public Page<List<CmptScoreRuleScoreInfo>> getCmptScoreRuleScoreInfo(Pageable page,  int cmptId, int roadId,int ruleId,int checkstatus) {
         Page<List<CmptScoreRuleScoreInfo>> result = cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfo(page,cmptId,roadId,ruleId,checkstatus);
         result.setCode(200);
         return result;
@@ -50,9 +53,9 @@ public class CmptScoreRuleScoreInfoController {
      * @param checkstatus 1为已通过 ，2为未通过
      * @return
      */
-    @RequestMapping("uploadCmptScoreRuleScoreInfo")
-    public Page<List<CmptScoreRuleScoreInfo>> uploadCmptScoreRuleScoreInfo(Pageable page, int cmptId, int roadId, int ruleId,
-                                                                           int checkstatus,int[] noPassedIds,int[] passedIds){
+    @RequestMapping("uploadCmptScoreRuleScoreInfo/{cmptId}/{roadId}/{ruleId}/{checkstatus}/{noPassedIds}/{passedIds}")
+    @ResponseBody
+    public Page<List<CmptScoreRuleScoreInfo>> uploadCmptScoreRuleScoreInfo(Pageable page, int cmptId, int roadId, int ruleId,int checkstatus,int[] noPassedIds,int[] passedIds){
         boolean isOk= cmptScoreRuleScoreInfoService.uploadCmptScoreRuleScoreInfo(cmptId,roadId,ruleId,noPassedIds,passedIds);
         log.info("审核成绩"+isOk);
         Page<List<CmptScoreRuleScoreInfo>> result = cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfo(page,cmptId,roadId,ruleId,checkstatus);