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/bo/ClassUserNumBo.java

@@ -0,0 +1,21 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年02月08日 11:23
+ */
+@Data
+public class ClassUserNumBo implements Serializable {
+
+    @ApiModelProperty("业务层次名称")
+    private String aliasName;
+
+    @ApiModelProperty("序号")
+    private Integer num;
+}

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

@@ -95,7 +95,7 @@ public interface IClassGradeService extends IService<ClassGrade> {
 
 	List<ClassNpUserInfoVo> officialGradeDetail(ClassNpUserInfoBo bo);
 
-	String getOfficialGradeNum(ClassOfficialNumBo bo);
+	ClassUserNumBo getOfficialGradeNum(ClassOfficialNumBo bo);
 
 	List<ClassGrade> getGradeListByTenant(ClassGradeListBo bgListBo);
 

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

@@ -1170,7 +1170,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     }
 
     @Override
-    public String getOfficialGradeNum(ClassOfficialNumBo bo) {
+    public ClassUserNumBo getOfficialGradeNum(ClassOfficialNumBo bo) {
         List<Long> subIds = iCourseSubjectService.getIdsByTenant(Arrays.asList(bo.getSubName()));
         //获取业务层次下所有班级
         ClassGradeListBo bgListBo = new ClassGradeListBo();
@@ -1204,26 +1204,26 @@ 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());
-                Map<String,String> result = new HashMap<>();
-                result.put("officialName",classGrade.getOfficialName());
+                ClassUserNumBo classUserNumBo = new ClassUserNumBo();
+                classUserNumBo.setAliasName(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);
+                classUserNumBo.setNum(ObjectUtils.isNotNull(count)?count:0);
+               return classUserNumBo;
             }else {
                 //创建新预报名班级
                 creatClass(goodsIds.get(0),tenantId,encoded);
             }
         }
 
-        Map<String,String> result = new HashMap<>();
-        result.put("officialName",encoded);
+        ClassUserNumBo classUserNumBo = new ClassUserNumBo();
+        classUserNumBo.setAliasName(encoded);
         ClassGradeQueryBo classGradeQueryBo = new ClassGradeQueryBo();
         classGradeQueryBo.setOfficialName(encoded);
         Integer count = baseMapper.queryOfficialGradeCount(classGradeQueryBo);
-        result.put("num",ObjectUtils.isNotNull(count.toString())?count.toString():"0");
-        return JSONObject.toJSONString(result);
+        classUserNumBo.setNum(ObjectUtils.isNotNull(count)?count:0);
+        return classUserNumBo;
     }
 
     @Override