commit

amd64/score_server/dao/mapper/mapper_exam.go

@@ -7,6 +7,44 @@ import (
 	"cicv-data-closedloop/common/util"
 )
 
+func SelectPage(teamName string, topic string, offset int, size int) ([]webServerEntity.ExamPo, []int) {
+	var resultPos []webServerEntity.ExamPo
+	var resultPosTotal []int
+	var pageSql string
+	var totalSql string
+	if teamName == "" && topic == "" {
+		pageSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-page.sql"])
+		totalSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-total.sql"])
+		err := c_db.MysqlDb.Select(&resultPos, pageSql, offset, size)
+		if err != nil {
+			c_log.GlobalLogger.Error(err)
+		}
+		err = c_db.MysqlDb.Select(&resultPosTotal, totalSql)
+		if err != nil {
+			c_log.GlobalLogger.Error(err)
+		}
+	}
+	if teamName != "" && topic == "" {
+		pageSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-page-by-team_name.sql"])
+		totalSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-total-by-team_name.sql"])
+		_ = c_db.MysqlDb.Select(&resultPos, pageSql, "%"+teamName+"%", offset, size)
+		_ = c_db.MysqlDb.Select(&resultPosTotal, totalSql, "%"+teamName+"%")
+	}
+	if teamName == "" && topic != "" {
+		pageSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-page-by-topic.sql"])
+		totalSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-total-by-topic.sql"])
+		_ = c_db.MysqlDb.Select(&resultPos, pageSql, "%"+topic+"%", offset, size)
+		_ = c_db.MysqlDb.Select(&resultPosTotal, totalSql, "%"+topic+"%")
+	}
+	if teamName != "" && topic != "" {
+		pageSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-page-by-team_name-and-topic.sql"])
+		totalSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-total-by-team_name-and-topic.sql"])
+		_ = c_db.MysqlDb.Select(&resultPos, pageSql, "%"+teamName+"%", "%"+topic+"%", offset, size)
+		_ = c_db.MysqlDb.Select(&resultPosTotal, totalSql, "%"+teamName+"%", "%"+topic+"%")
+	}
+	return resultPos, resultPosTotal
+}
+
 func SelectAllFromExam() []webServerEntity.ExamPo {
 	var result []webServerEntity.ExamPo
 	selectSql, err := util.ReadFile(c_db.SqlFilesMap["exam-select-all.sql"])

amd64/score_server/entity/e_exam.go

@@ -55,22 +55,60 @@ type ExamPo struct {
 	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"`
+	DeductScoreOffline_12_3 int            `json:"deductScoreOffline_12_3" db:"deduct_score_offline_12_3"`
+	DeductScoreOffline_13_1 int            `json:"deductScoreOffline_13_1" db:"deduct_score_offline_13_1"`
+	DeductScoreOffline_13_2 int            `json:"deductScoreOffline_13_2" db:"deduct_score_offline_13_2"`
 }
 
 type ExamVo struct {
-	Id              int     `json:"id" ` // 自增id
-	TeamName        string  `json:"teamName"`
-	Topic           string  `json:"topic" `
-	BeginTime       string  `json:"beginTime" `
-	EndTime         string  `json:"endTime"`
-	ScoreOnline     float64 `json:"scoreOnline" `
-	ScoreOffline    float64 `json:"scoreOffline" `
-	ScoreFinal      float64 `json:"scoreFinal"`
-	Details         string  `json:"details" `
-	ScoreReportPath string  `json:"ScoreReportPath" `
+	Id                      int     `json:"id" ` // 自增id
+	TeamName                string  `json:"teamName"`
+	Topic                   string  `json:"topic" `
+	BeginTime               string  `json:"beginTime" `
+	EndTime                 string  `json:"endTime"`
+	ScoreOnline             float64 `json:"scoreOnline" `
+	ScoreOffline            float64 `json:"scoreOffline" `
+	ScoreFinal              float64 `json:"scoreFinal"`
+	Details                 string  `json:"details" `
+	ScoreReportPath         string  `json:"ScoreReportPath" `
+	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_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"`
+	DeductScoreOffline_12_3 int     `json:"deductScoreOffline_12_3" db:"deduct_score_offline_12_3"`
+	DeductScoreOffline_13_1 int     `json:"deductScoreOffline_13_1" db:"deduct_score_offline_13_1"`
+	DeductScoreOffline_13_2 int     `json:"deductScoreOffline_13_2" db:"deduct_score_offline_13_2"`
 }
 
 type ExamPagePao struct {

amd64/score_server/handler/h_exam.go

@@ -242,56 +242,57 @@ func ExamEndTicker() {
 func Page(c *gin.Context) {
 	param := new(webServerEntity.ExamPagePao)
 	_ = c.ShouldBindJSON(&param)
-	var resultPos []webServerEntity.ExamPo
-	var resultPosTotal []int
-	var pageSql string
-	var totalSql string
-	offset := (param.CurrentPage - 1) * param.PageSize
-	size := param.PageSize
-	if param.TeamName == "" && param.Topic == "" {
-		pageSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-page.sql"])
-		totalSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-total.sql"])
-		err := c_db.MysqlDb.Select(&resultPos, pageSql, offset, size)
-		if err != nil {
-			c_log.GlobalLogger.Error(err)
-		}
-		err = c_db.MysqlDb.Select(&resultPosTotal, totalSql)
-		if err != nil {
-			c_log.GlobalLogger.Error(err)
-		}
-	}
-	if param.TeamName != "" && param.Topic == "" {
-		pageSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-page-by-team_name.sql"])
-		totalSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-total-by-team_name.sql"])
-		_ = c_db.MysqlDb.Select(&resultPos, pageSql, "%"+param.TeamName+"%", offset, size)
-		_ = c_db.MysqlDb.Select(&resultPosTotal, totalSql, "%"+param.TeamName+"%")
-	}
-	if param.TeamName == "" && param.Topic != "" {
-		pageSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-page-by-topic.sql"])
-		totalSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-total-by-topic.sql"])
-		_ = c_db.MysqlDb.Select(&resultPos, pageSql, "%"+param.Topic+"%", offset, size)
-		_ = c_db.MysqlDb.Select(&resultPosTotal, totalSql, "%"+param.Topic+"%")
-	}
-	if param.TeamName != "" && param.Topic != "" {
-		pageSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-page-by-team_name-and-topic.sql"])
-		totalSql, _ = util.ReadFile(c_db.SqlFilesMap["exam-select-total-by-team_name-and-topic.sql"])
-		_ = c_db.MysqlDb.Select(&resultPos, pageSql, "%"+param.TeamName+"%", "%"+param.Topic+"%", offset, size)
-		_ = c_db.MysqlDb.Select(&resultPosTotal, totalSql, "%"+param.TeamName+"%", "%"+param.Topic+"%")
-	}
+	resultPos, resultPosTotal := mapper.SelectPage(param.TeamName, param.Topic, (param.CurrentPage-1)*param.PageSize, param.PageSize)
 	var resultVos []webServerEntity.ExamVo
 	for _, po := range resultPos {
 
 		resultVos = append(resultVos, webServerEntity.ExamVo{
-			Id:              po.Id,
-			TeamName:        po.TeamName,
-			Topic:           po.Topic,
-			BeginTime:       util.GetTimeString(po.BeginTime),
-			EndTime:         util.GetTimeString(po.EndTime),
-			ScoreOnline:     po.ScoreOnline,
-			ScoreOffline:    po.ScoreOffline,
-			ScoreFinal:      po.ScoreFinal,
-			Details:         po.Details.String,
-			ScoreReportPath: po.ScoreReportPath,
+			Id:                      po.Id,
+			TeamName:                po.TeamName,
+			Topic:                   po.Topic,
+			BeginTime:               util.GetTimeString(po.BeginTime),
+			EndTime:                 util.GetTimeString(po.EndTime),
+			ScoreOnline:             po.ScoreOnline,
+			ScoreOffline:            po.ScoreOffline,
+			ScoreFinal:              po.ScoreFinal,
+			Details:                 po.Details.String,
+			ScoreReportPath:         po.ScoreReportPath,
+			DeductScoreOffline_1_1:  po.DeductScoreOffline_1_1,
+			DeductScoreOffline_1_2:  po.DeductScoreOffline_1_2,
+			DeductScoreOffline_1_3:  po.DeductScoreOffline_1_3,
+			DeductScoreOffline_1_4:  po.DeductScoreOffline_1_4,
+			DeductScoreOffline_2_1:  po.DeductScoreOffline_2_1,
+			DeductScoreOffline_2_2:  po.DeductScoreOffline_2_2,
+			DeductScoreOffline_3_1:  po.DeductScoreOffline_3_1,
+			DeductScoreOffline_3_2:  po.DeductScoreOffline_3_2,
+			DeductScoreOffline_3_3:  po.DeductScoreOffline_3_3,
+			DeductScoreOffline_3_4:  po.DeductScoreOffline_3_4,
+			DeductScoreOffline_4_1:  po.DeductScoreOffline_4_1,
+			DeductScoreOffline_4_2:  po.DeductScoreOffline_4_2,
+			DeductScoreOffline_4_3:  po.DeductScoreOffline_4_3,
+			DeductScoreOffline_5_1:  po.DeductScoreOffline_5_1,
+			DeductScoreOffline_5_2:  po.DeductScoreOffline_5_2,
+			DeductScoreOffline_5_3:  po.DeductScoreOffline_5_3,
+			DeductScoreOffline_6_1:  po.DeductScoreOffline_6_1,
+			DeductScoreOffline_6_2:  po.DeductScoreOffline_6_2,
+			DeductScoreOffline_7_1:  po.DeductScoreOffline_7_1,
+			DeductScoreOffline_7_2:  po.DeductScoreOffline_7_2,
+			DeductScoreOffline_7_3:  po.DeductScoreOffline_7_3,
+			DeductScoreOffline_8_1:  po.DeductScoreOffline_8_1,
+			DeductScoreOffline_8_2:  po.DeductScoreOffline_8_2,
+			DeductScoreOffline_8_3:  po.DeductScoreOffline_8_3,
+			DeductScoreOffline_9_1:  po.DeductScoreOffline_9_1,
+			DeductScoreOffline_9_2:  po.DeductScoreOffline_9_2,
+			DeductScoreOffline_9_3:  po.DeductScoreOffline_9_3,
+			DeductScoreOffline_10_1: po.DeductScoreOffline_10_1,
+			DeductScoreOffline_10_2: po.DeductScoreOffline_10_2,
+			DeductScoreOffline_11_1: po.DeductScoreOffline_11_1,
+			DeductScoreOffline_11_2: po.DeductScoreOffline_11_2,
+			DeductScoreOffline_12_1: po.DeductScoreOffline_12_1,
+			DeductScoreOffline_12_2: po.DeductScoreOffline_12_2,
+			DeductScoreOffline_12_3: po.DeductScoreOffline_12_3,
+			DeductScoreOffline_13_1: po.DeductScoreOffline_13_1,
+			DeductScoreOffline_13_2: po.DeductScoreOffline_13_2,
 		})
 	}
 

amd64/score_server/sql/exam-select-page-by-team_name-and-topic.sql

@@ -7,7 +7,43 @@ select id,
        score_offline,
        score_final,
        details,
-       score_report_path
+       score_report_path,
+       deduct_score_offline_1_1,
+       deduct_score_offline_1_2,
+       deduct_score_offline_1_3,
+       deduct_score_offline_1_4,
+       deduct_score_offline_2_1,
+       deduct_score_offline_2_2,
+       deduct_score_offline_3_1,
+       deduct_score_offline_3_2,
+       deduct_score_offline_3_3,
+       deduct_score_offline_3_4,
+       deduct_score_offline_4_1,
+       deduct_score_offline_4_2,
+       deduct_score_offline_4_3,
+       deduct_score_offline_5_1,
+       deduct_score_offline_5_2,
+       deduct_score_offline_5_3,
+       deduct_score_offline_6_1,
+       deduct_score_offline_6_2,
+       deduct_score_offline_7_1,
+       deduct_score_offline_7_2,
+       deduct_score_offline_7_3,
+       deduct_score_offline_8_1,
+       deduct_score_offline_8_2,
+       deduct_score_offline_8_3,
+       deduct_score_offline_9_1,
+       deduct_score_offline_9_2,
+       deduct_score_offline_9_3,
+       deduct_score_offline_10_1,
+       deduct_score_offline_10_2,
+       deduct_score_offline_11_1,
+       deduct_score_offline_11_2,
+       deduct_score_offline_12_1,
+       deduct_score_offline_12_2,
+       deduct_score_offline_12_3,
+       deduct_score_offline_13_1,
+       deduct_score_offline_13_2
 from exam
 where team_name like ? and topic like ?
 limit ?,?

amd64/score_server/sql/exam-select-page-by-team_name.sql

@@ -7,7 +7,43 @@ select id,
        score_offline,
        score_final,
        details,
-       score_report_path
+       score_report_path,
+       deduct_score_offline_1_1,
+       deduct_score_offline_1_2,
+       deduct_score_offline_1_3,
+       deduct_score_offline_1_4,
+       deduct_score_offline_2_1,
+       deduct_score_offline_2_2,
+       deduct_score_offline_3_1,
+       deduct_score_offline_3_2,
+       deduct_score_offline_3_3,
+       deduct_score_offline_3_4,
+       deduct_score_offline_4_1,
+       deduct_score_offline_4_2,
+       deduct_score_offline_4_3,
+       deduct_score_offline_5_1,
+       deduct_score_offline_5_2,
+       deduct_score_offline_5_3,
+       deduct_score_offline_6_1,
+       deduct_score_offline_6_2,
+       deduct_score_offline_7_1,
+       deduct_score_offline_7_2,
+       deduct_score_offline_7_3,
+       deduct_score_offline_8_1,
+       deduct_score_offline_8_2,
+       deduct_score_offline_8_3,
+       deduct_score_offline_9_1,
+       deduct_score_offline_9_2,
+       deduct_score_offline_9_3,
+       deduct_score_offline_10_1,
+       deduct_score_offline_10_2,
+       deduct_score_offline_11_1,
+       deduct_score_offline_11_2,
+       deduct_score_offline_12_1,
+       deduct_score_offline_12_2,
+       deduct_score_offline_12_3,
+       deduct_score_offline_13_1,
+       deduct_score_offline_13_2
 from exam
 where team_name like ?
 limit ?,?

amd64/score_server/sql/exam-select-page-by-topic.sql

@@ -7,7 +7,43 @@ select id,
        score_offline,
        score_final,
        details,
-       score_report_path
+       score_report_path,
+       deduct_score_offline_1_1,
+       deduct_score_offline_1_2,
+       deduct_score_offline_1_3,
+       deduct_score_offline_1_4,
+       deduct_score_offline_2_1,
+       deduct_score_offline_2_2,
+       deduct_score_offline_3_1,
+       deduct_score_offline_3_2,
+       deduct_score_offline_3_3,
+       deduct_score_offline_3_4,
+       deduct_score_offline_4_1,
+       deduct_score_offline_4_2,
+       deduct_score_offline_4_3,
+       deduct_score_offline_5_1,
+       deduct_score_offline_5_2,
+       deduct_score_offline_5_3,
+       deduct_score_offline_6_1,
+       deduct_score_offline_6_2,
+       deduct_score_offline_7_1,
+       deduct_score_offline_7_2,
+       deduct_score_offline_7_3,
+       deduct_score_offline_8_1,
+       deduct_score_offline_8_2,
+       deduct_score_offline_8_3,
+       deduct_score_offline_9_1,
+       deduct_score_offline_9_2,
+       deduct_score_offline_9_3,
+       deduct_score_offline_10_1,
+       deduct_score_offline_10_2,
+       deduct_score_offline_11_1,
+       deduct_score_offline_11_2,
+       deduct_score_offline_12_1,
+       deduct_score_offline_12_2,
+       deduct_score_offline_12_3,
+       deduct_score_offline_13_1,
+       deduct_score_offline_13_2
 from exam
 where  topic like ?
 limit ?,?