submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -278,10 +278,10 @@ public class CommonController
     @ApiOperation("查询预开班官方班级编号")
     @PostMapping("common/free/officialGrade/num")
     public AjaxResult getOfficialGradeNum(@RequestBody ClassOfficialNumBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
-        }
-        return AjaxResult.success(iClassGradeService.getOfficialGradeNum(bo));
+//        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+//            return AjaxResult.error("签名错误");
+//        }
+        return AjaxResult.success("",iClassGradeService.getOfficialGradeNum(bo));
     }
 
     @ApiOperation("预报名班级开班")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -1204,7 +1204,13 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             List<ClassGrade> classGradesMax = map.get(sortBo.getKey()).stream().sorted(Comparator.comparing(ClassGrade::getCreateTime)).collect(Collectors.toList());
             if(bo.getSortNum() < classGradesMax.size()){
                 ClassGrade classGrade = classGradesMax.get(bo.getSortNum());
-               return classGrade.getOfficialName();
+                Map<String,String> result = new HashMap<>();
+                result.put("officialName",classGrade.getOfficialName());
+                ClassGradeQueryBo classGradeQueryBo = new ClassGradeQueryBo();
+                classGradeQueryBo.setOfficialName(classGrade.getOfficialName());
+                Integer count = baseMapper.queryOfficialGradeCount(classGradeQueryBo);
+                result.put("num",ObjectUtils.isNotNull(count.toString())?count.toString():"0");
+               return JSONObject.toJSONString(result);
             }else {
                 //创建新预报名班级
                 creatClass(goodsIds.get(0),tenantId,encoded);