LingxinMeng 1 vuosi sitten
vanhempi
commit
6dda0fdbe8

+ 2 - 1
amd64/score_server/dao/mapper/mapper_exam.go

@@ -60,7 +60,8 @@ func UpdateDeductScoreOffline(e *webServerEntity.ExamOfflinePao) {
 		e.DeductScoreOffline_11_3,
 		e.DeductScoreOffline_12_1,
 		e.DeductScoreOffline_12_2,
-		e.Id,
+		e.Topic,
+		e.TeamName,
 	}); err != nil {
 		c_log.GlobalLogger.Error("插入数据报错:", err)
 		return

+ 36 - 35
amd64/score_server/entity/e_exam.go

@@ -88,41 +88,42 @@ type ExamReportPao struct {
 }
 
 type ExamOfflinePao struct {
-	Id                      int `json:"id"`
-	DeductScoreOffline_1_1  int `json:"deductScoreOffline_1_1" db:"deduct_score_offline_1_1"`
-	DeductScoreOffline_1_2  int `json:"deductScoreOffline_1_2" db:"deduct_score_offline_1_2"`
-	DeductScoreOffline_1_3  int `json:"deductScoreOffline_1_3" db:"deduct_score_offline_1_3"`
-	DeductScoreOffline_1_4  int `json:"deductScoreOffline_1_4" db:"deduct_score_offline_1_4"`
-	DeductScoreOffline_2_1  int `json:"deductScoreOffline_2_1" db:"deduct_score_offline_2_1"`
-	DeductScoreOffline_2_2  int `json:"deductScoreOffline_2_2" db:"deduct_score_offline_2_2"`
-	DeductScoreOffline_3_1  int `json:"deductScoreOffline_3_1" db:"deduct_score_offline_3_1"`
-	DeductScoreOffline_3_2  int `json:"deductScoreOffline_3_2" db:"deduct_score_offline_3_2"`
-	DeductScoreOffline_3_3  int `json:"deductScoreOffline_3_3" db:"deduct_score_offline_3_3"`
-	DeductScoreOffline_3_4  int `json:"deductScoreOffline_3_4" db:"deduct_score_offline_3_4"`
-	DeductScoreOffline_4_1  int `json:"deductScoreOffline_4_1" db:"deduct_score_offline_4_1"`
-	DeductScoreOffline_4_2  int `json:"deductScoreOffline_4_2" db:"deduct_score_offline_4_2"`
-	DeductScoreOffline_4_3  int `json:"deductScoreOffline_4_3" db:"deduct_score_offline_4_3"`
-	DeductScoreOffline_5_1  int `json:"deductScoreOffline_5_1" db:"deduct_score_offline_5_1"`
-	DeductScoreOffline_5_2  int `json:"deductScoreOffline_5_2" db:"deduct_score_offline_5_2"`
-	DeductScoreOffline_5_3  int `json:"deductScoreOffline_5_3" db:"deduct_score_offline_5_3"`
-	DeductScoreOffline_6_1  int `json:"deductScoreOffline_6_1" db:"deduct_score_offline_6_1"`
-	DeductScoreOffline_6_2  int `json:"deductScoreOffline_6_2" db:"deduct_score_offline_6_2"`
-	DeductScoreOffline_7_1  int `json:"deductScoreOffline_7_1" db:"deduct_score_offline_7_1"`
-	DeductScoreOffline_7_2  int `json:"deductScoreOffline_7_2" db:"deduct_score_offline_7_2"`
-	DeductScoreOffline_7_3  int `json:"deductScoreOffline_7_3" db:"deduct_score_offline_7_3"`
-	DeductScoreOffline_8_1  int `json:"deductScoreOffline_8_1" db:"deduct_score_offline_8_1"`
-	DeductScoreOffline_8_2  int `json:"deductScoreOffline_8_2" db:"deduct_score_offline_8_2"`
-	DeductScoreOffline_8_3  int `json:"deductScoreOffline_8_3" db:"deduct_score_offline_8_3"`
-	DeductScoreOffline_9_1  int `json:"deductScoreOffline_9_1" db:"deduct_score_offline_9_1"`
-	DeductScoreOffline_9_2  int `json:"deductScoreOffline_9_2" db:"deduct_score_offline_9_2"`
-	DeductScoreOffline_9_3  int `json:"deductScoreOffline_9_3" db:"deduct_score_offline_9_3"`
-	DeductScoreOffline_10_1 int `json:"deductScoreOffline_10_1" db:"deduct_score_offline_10_1"`
-	DeductScoreOffline_10_2 int `json:"deductScoreOffline_10_2" db:"deduct_score_offline_10_2"`
-	DeductScoreOffline_11_1 int `json:"deductScoreOffline_11_1" db:"deduct_score_offline_11_1"`
-	DeductScoreOffline_11_2 int `json:"deductScoreOffline_11_2" db:"deduct_score_offline_11_2"`
-	DeductScoreOffline_11_3 int `json:"deductScoreOffline_11_3" db:"deduct_score_offline_11_3"`
-	DeductScoreOffline_12_1 int `json:"deductScoreOffline_12_1" db:"deduct_score_offline_12_1"`
-	DeductScoreOffline_12_2 int `json:"deductScoreOffline_12_2" db:"deduct_score_offline_12_2"`
+	Topic                   string `json:"topic"`
+	TeamName                string `json:"teamName"`
+	DeductScoreOffline_1_1  int    `json:"deductScoreOffline_1_1" db:"deduct_score_offline_1_1"`
+	DeductScoreOffline_1_2  int    `json:"deductScoreOffline_1_2" db:"deduct_score_offline_1_2"`
+	DeductScoreOffline_1_3  int    `json:"deductScoreOffline_1_3" db:"deduct_score_offline_1_3"`
+	DeductScoreOffline_1_4  int    `json:"deductScoreOffline_1_4" db:"deduct_score_offline_1_4"`
+	DeductScoreOffline_2_1  int    `json:"deductScoreOffline_2_1" db:"deduct_score_offline_2_1"`
+	DeductScoreOffline_2_2  int    `json:"deductScoreOffline_2_2" db:"deduct_score_offline_2_2"`
+	DeductScoreOffline_3_1  int    `json:"deductScoreOffline_3_1" db:"deduct_score_offline_3_1"`
+	DeductScoreOffline_3_2  int    `json:"deductScoreOffline_3_2" db:"deduct_score_offline_3_2"`
+	DeductScoreOffline_3_3  int    `json:"deductScoreOffline_3_3" db:"deduct_score_offline_3_3"`
+	DeductScoreOffline_3_4  int    `json:"deductScoreOffline_3_4" db:"deduct_score_offline_3_4"`
+	DeductScoreOffline_4_1  int    `json:"deductScoreOffline_4_1" db:"deduct_score_offline_4_1"`
+	DeductScoreOffline_4_2  int    `json:"deductScoreOffline_4_2" db:"deduct_score_offline_4_2"`
+	DeductScoreOffline_4_3  int    `json:"deductScoreOffline_4_3" db:"deduct_score_offline_4_3"`
+	DeductScoreOffline_5_1  int    `json:"deductScoreOffline_5_1" db:"deduct_score_offline_5_1"`
+	DeductScoreOffline_5_2  int    `json:"deductScoreOffline_5_2" db:"deduct_score_offline_5_2"`
+	DeductScoreOffline_5_3  int    `json:"deductScoreOffline_5_3" db:"deduct_score_offline_5_3"`
+	DeductScoreOffline_6_1  int    `json:"deductScoreOffline_6_1" db:"deduct_score_offline_6_1"`
+	DeductScoreOffline_6_2  int    `json:"deductScoreOffline_6_2" db:"deduct_score_offline_6_2"`
+	DeductScoreOffline_7_1  int    `json:"deductScoreOffline_7_1" db:"deduct_score_offline_7_1"`
+	DeductScoreOffline_7_2  int    `json:"deductScoreOffline_7_2" db:"deduct_score_offline_7_2"`
+	DeductScoreOffline_7_3  int    `json:"deductScoreOffline_7_3" db:"deduct_score_offline_7_3"`
+	DeductScoreOffline_8_1  int    `json:"deductScoreOffline_8_1" db:"deduct_score_offline_8_1"`
+	DeductScoreOffline_8_2  int    `json:"deductScoreOffline_8_2" db:"deduct_score_offline_8_2"`
+	DeductScoreOffline_8_3  int    `json:"deductScoreOffline_8_3" db:"deduct_score_offline_8_3"`
+	DeductScoreOffline_9_1  int    `json:"deductScoreOffline_9_1" db:"deduct_score_offline_9_1"`
+	DeductScoreOffline_9_2  int    `json:"deductScoreOffline_9_2" db:"deduct_score_offline_9_2"`
+	DeductScoreOffline_9_3  int    `json:"deductScoreOffline_9_3" db:"deduct_score_offline_9_3"`
+	DeductScoreOffline_10_1 int    `json:"deductScoreOffline_10_1" db:"deduct_score_offline_10_1"`
+	DeductScoreOffline_10_2 int    `json:"deductScoreOffline_10_2" db:"deduct_score_offline_10_2"`
+	DeductScoreOffline_11_1 int    `json:"deductScoreOffline_11_1" db:"deduct_score_offline_11_1"`
+	DeductScoreOffline_11_2 int    `json:"deductScoreOffline_11_2" db:"deduct_score_offline_11_2"`
+	DeductScoreOffline_11_3 int    `json:"deductScoreOffline_11_3" db:"deduct_score_offline_11_3"`
+	DeductScoreOffline_12_1 int    `json:"deductScoreOffline_12_1" db:"deduct_score_offline_12_1"`
+	DeductScoreOffline_12_2 int    `json:"deductScoreOffline_12_2" db:"deduct_score_offline_12_2"`
 }
 
 /*

+ 8 - 0
amd64/score_server/handler/h_exam.go

@@ -724,6 +724,14 @@ func Offline(c *gin.Context) {
 		})
 		return
 	}
+	if param.Topic != "表演赛" && param.Topic != "预赛" && param.Topic != "决赛" {
+		c_log.GlobalLogger.Error("比赛阶段错误:", param.Topic)
+		c.JSON(http.StatusBadRequest, commonEntity.Response{
+			Code: 400,
+			Msg:  "比赛阶段错误(表演赛、预赛、决赛)。",
+		})
+		return
+	}
 	mapper.UpdateDeductScoreOffline(param)
 	c.JSON(http.StatusOK, commonEntity.Response{
 		Code: 200,

+ 2 - 1
amd64/score_server/sql/exam-update-deduct_score_offline-by-id.sql

@@ -33,5 +33,6 @@ set deduct_score_offline_1_1  = ?,
     deduct_score_offline_11_3 = ?,
     deduct_score_offline_12_1 = ?,
     deduct_score_offline_12_2 = ?
-where id = ?
+where topic = ?
+  and team_name = ?