🐛 签到bug

internal/application/cpdaily/task/sign.go

@@ -384,18 +384,14 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 	}
 	list = append(list, dto)
 
-	var current uint = 1
-
 	if isPhoto := rows["isPhoto"]; isPhoto != nil && isPhoto.Int() == 1 {
 		dto = &formtype.CpTaskFormItem{
 			Title:    "签到照片",
 			ColName:  "signImg",
 			Type:     formtype.ItemTypeImage,
 			Required: true,
-			Number:   current,
 		}
 		list = append(list, dto)
-		current++
 	}
 
 	// 是否范围外签到
@@ -404,7 +400,6 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 		ColName:  "isMalposition",
 		Type:     formtype.ItemTypeSingle,
 		Required: true,
-		Number:   current,
 		Options: []formtype.CpTaskFormItemOption{
 			{
 				Content:      "是",
@@ -418,7 +413,6 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 		},
 	}
 	list = append(list, dto)
-	current++
 
 	// 范围外签到原因
 	dto = &formtype.CpTaskFormItem{
@@ -427,16 +421,15 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 		Type:     formtype.ItemTypeInput,
 		Required: true,
 		LogicWid: "abnormalReason",
-		Number:   current,
 	}
 	list = append(list, dto)
-	current++
 
+	current := uint(1)
 	// 处理额外字段
 	if isNeedExtra := rows["isNeedExtra"]; isNeedExtra != nil && isNeedExtra.Int() == 1 {
 		extraField := rows["extraField"].Array()
-		for i, field := range extraField {
-			fieldObj := field.(map[string]*gvar.Var)
+		for _, field := range extraField {
+			fieldObj := gvar.New(field).MapStrVar()
 			title := fieldObj["title"].String()
 			isRequired := fieldObj["isRequired"].Bool()
 			hasOtherItems := fieldObj["hasOtherItems"].Bool()
@@ -445,16 +438,17 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 				Title:    title,
 				ColName:  title,
 				Type:     formtype.ItemTypeSingle,
-				Number:   uint(i),
+				Number:   current,
 				Required: isRequired,
 				IsOther:  hasOtherItems,
 			}
+			current++
 
 			// 处理选项
 			extraFieldItems := fieldObj["extraFieldItems"].Array()
 			var options []formtype.CpTaskFormItemOption
 			for _, item := range extraFieldItems {
-				itemObj := item.(map[string]*gvar.Var)
+				itemObj := gvar.New(item).MapStrVar()
 				option := formtype.CpTaskFormItemOption{
 					Content:      itemObj["content"].String(),
 					IsOtherItems: itemObj["isOtherItems"].Bool(),
@@ -577,8 +571,9 @@ func (c *CpdailyAutoSignTask) FillCustomForm(ctx context.Context, form map[strin
 		var extraFieldItemValues []map[string]*gvar.Var
 
 		for i, field := range extraField {
+			current := uint(i) + 1
 			// 检查数字是否在范围内
-			found := slices.Contains(numbers, uint(i))
+			found := slices.Contains(numbers, current)
 			if !found {
 				utils.OkOrPanic(errors.NewBusinessError(500, "非法的额外信息数据"), oops.WithContext(ctx).Wrap)
 			}

internal/application/cpdaily/task/sleepcheck.go

@@ -463,18 +463,15 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 	}
 	list = append(list, dto)
 
-	var current uint = 1
-
 	if isPhoto := rows["isPhoto"]; isPhoto != nil && isPhoto.Int() == 1 {
 		dto = &formtype.CpTaskFormItem{
 			Title:    "查寝照片",
 			ColName:  "signImg",
 			Type:     formtype.ItemTypeImage,
 			Required: true,
-			Number:   current,
 		}
 		list = append(list, dto)
-		current++
+
 	}
 
 	// 是否范围外签到
@@ -483,7 +480,6 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 		ColName:  "isMalposition",
 		Type:     formtype.ItemTypeSingle,
 		Required: true,
-		Number:   current,
 		Options: []formtype.CpTaskFormItemOption{
 			{
 				Content:      "是",
@@ -497,7 +493,6 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 		},
 	}
 	list = append(list, dto)
-	current++
 
 	for key, item := range list {
 		list[key].Show = item.LogicWid == ""