commit

dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go

@@ -39,7 +39,7 @@ func GetByIds(ids []string) ([]models.TBaseClass, error) {
 }
 
 //判断是不是有在指定班号范围内的班级
-func CheckClassNumValid(schoolId string, stageId string, rxnf int32, startBh int32, endBh int32) (bool, error) {
+func CheckClassNumValid(schoolId string, stageId int32, rxnf int32, startBh int32, endBh int32) (bool, error) {
 	classModel := new(models.TBaseClass)
 	//between是包含边界值
 	total, err := db.Where("bureau_id=? and b_use=1 and stage_id=? and rxnf=? and  (bh between ? and ?)", schoolId, stageId, rxnf, startBh, endBh).Count(classModel)
@@ -173,7 +173,7 @@ func GetStageMap(schoolId string) map[string]string {
 }
 
 //根据学校ID和学部(学段)ID获取入学年份
-func GetRxnf(schoolId string, stageId string) ([]map[string]interface{}, int32, error) {
+func GetRxnf(schoolId string, stageId int32) ([]map[string]interface{}, int32, error) {
 	var myBuilder = builder.Dialect(builder.MYSQL).Select("distinct rxnf").
 		From("t_base_class").
 		Where(builder.Eq{"bureau_id": schoolId}).

dsBaseRpc/RpcService/BaseClass/BaseClassService/BaseClassService.go

@@ -105,7 +105,7 @@ func (s *Rpc) AddBaseClass(ctx context.Context, in *BaseClassProto.ModelArg) (*B
 		//入学年份
 		model.Rxnf = in.Rxnf
 		//ClassCode是我来规定的,规则是入学年份+1位学段码+两位班号，前补零
-		model.ClassCode = CommonUtil.ConvertInt32ToString(in.Rxnf) + in.StageId + fmt.Sprintf("%02d", i)
+		model.ClassCode = CommonUtil.ConvertInt32ToString(in.Rxnf) + CommonUtil.ConvertInt32ToString(in.StageId) + fmt.Sprintf("%02d", i)
 		//ClassName  --->入学年份+班号
 		model.ClassName = CommonUtil.ConvertInt32ToString(in.Rxnf) + "级" + CommonUtil.ConvertInt32ToString(i) + "班"
 		//ClassAlias --->入学年份+班号