diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 9d4216c..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 33ceb4c..fc4af0f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,47 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -108,7 +68,6 @@
-
@@ -158,6 +117,11 @@
+
+
+
+
@@ -171,7 +135,6 @@
1628082264190
-
@@ -215,6 +178,7 @@
+
diff --git a/controllers/Administrator.go b/controllers/Administrator.go
index 33ab748..99397eb 100644
--- a/controllers/Administrator.go
+++ b/controllers/Administrator.go
@@ -140,9 +140,20 @@ func (c *AdminApiController) ReadExcel(){
return
}
//supervisorId := requestBody.SupervisorId
- failPath := requestBody.FilePath
+ // filePath := requestBody.FilePath
+ bytes := requestBody.Excel
//----------------------------------------------------
- f, err := excelize.OpenFile(failPath)
+
+
+
+ //bytes, err := os.ReadFile(filePath)
+
+
+ file, err := os.Create("excelFile")
+ file.Write(bytes)
+
+
+ f, err := excelize.OpenFile("excelFile")
if err != nil {
fmt.Println(err)
return
@@ -206,6 +217,9 @@ func (c *AdminApiController) ReadExcel(){
topic.Import_number=int64(len(rows)-1)
topic.Update()
}
+
+ file.Close()
+ os.Remove("excelFile")
//------------------------------------------------
data := make(map[string]interface{})
data["data"] =nil
@@ -554,13 +568,10 @@ func (c *AdminApiController) Distribution(){
8.图片显示
*/
func (c *AdminApiController) Pic() {
-
defer c.ServeJSON()
var requestBody requests.ReadFile
var resp Response
var err error
-
-
err =json.Unmarshal(c.Ctx.Input.RequestBody, &requestBody)
if err!=nil {
resp = Response{"10001","cannot unmarshal",err}
@@ -612,3 +623,115 @@ func cutUser(oldData []models.User, n int) (newData[]models.User) {
}
return newData1
}
+
+/**
+9.大题展示列表
+*/
+
+
+func (c *AdminApiController) TopicList() {
+ defer c.ServeJSON()
+ var requestBody requests.TopicList
+ var resp Response
+ var err error
+
+ err =json.Unmarshal(c.Ctx.Input.RequestBody, &requestBody)
+ if err!=nil {
+ resp = Response{"10001","cannot unmarshal",err}
+ c.Data["json"] = resp
+ return
+ }
+ //supervisorId := requestBody.SupervisorId
+
+ //----------------------------------------------------
+ //获取大题列表
+ topics := make([]models.Topic,0)
+ err = models.FindTopicList(&topics)
+ if err!=nil {
+ resp = Response{"0000","FindTopicList err ",err}
+ c.Data["json"] = resp
+ return
+ }
+
+ var topicVOList = make([]responses.TopicVO,len(topics))
+ for i := 0; i < len(topics); i++ {
+
+ topicVOList[i].SubjectName=topics[i].Subject_name
+ topicVOList[i].TopicName=topics[i].Question_name
+ topicVOList[i].Score=topics[i].Question_score
+ topicVOList[i].StandardError=topics[i].Standard_error
+ topicVOList[i].ScoreType=topics[i].Score_type
+ topicVOList[i].TopicId=topics[i].Question_id
+ topicVOList[i].ImportTime=topics[i].Import_time
+
+ subTopics := make([]models.SubTopic, 0)
+ models.FindSubTopicsByQuestionId(topics[i].Question_id,&subTopics)
+ subTopicVOS := make([]responses.SubTopicVO, len(subTopics))
+ for j:=0;j