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

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

@@ -4,6 +4,7 @@ package com.dlbridge.jadp.plugins.cmpt.web;
 import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo;
 import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreRuleScoreInfoService;
 import com.dlbridge.jadp.plugins.cmpt.utils.Page;
+import com.neusoft.www.utils.web.Result;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Controller;
@@ -44,21 +45,17 @@ public class CmptScoreRuleScoreInfoController {
 
     /**
      * 批量审核成绩为通过或者未通过
-     * @param page
      * @param cmptId
      * @param roadId
      * @param ruleId
-     * @param checkstatus 1为已通过 ，2为未通过
      * @return
      */
     @RequestMapping("uploadCmptScoreRuleScoreInfo")
     @ResponseBody
-    public Page<List<CmptScoreRuleScoreInfo>> uploadCmptScoreRuleScoreInfo(Pageable page, int cmptId, int roadId, int ruleId,int checkstatus,int[] noPassedIds,int[] passedIds){
+    public Result uploadCmptScoreRuleScoreInfo(int cmptId, int roadId, int ruleId, 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);
-        result.setCode(200);
-        return result;
+        return new Result().success();
     }