chen

.idea/workspace.xml

@@ -4,14 +4,11 @@
     <list default="true" id="90d49d24-cd7e-4f14-b075-c6e5fe5ae2ce" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/controllers/Administrator.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/Administrator.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/controllers/score.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/score.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/controllers/supervisor.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/supervisor.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lastupdate.tmp" beforeDir="false" afterPath="$PROJECT_DIR$/lastupdate.tmp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/testPaper.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/testPaper.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/testPaperInfo.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/testPaperInfo.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/underCorrectedPaper.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/underCorrectedPaper.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/requests/admin.go" beforeDir="false" afterPath="$PROJECT_DIR$/requests/admin.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/requests/supervisor.go" beforeDir="false" afterPath="$PROJECT_DIR$/requests/supervisor.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/responses/supervisor.go" beforeDir="false" afterPath="$PROJECT_DIR$/responses/supervisor.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/routers/router.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/router.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -192,11 +189,6 @@
           <line>708</line>
           <option name="timeStamp" value="3" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/controllers/supervisor.go</url>
-          <line>1447</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>

controllers/Administrator.go

@@ -947,8 +947,9 @@ func (c *AdminApiController) DeleteTest(){
 		testPaperInfos :=make([]models.TestPaperInfo,0)
 		models.FindTestPaperInfoByQuestionDetailId(subTopic.Question_detail_id,&testPaperInfos)
 			for k:=0;k<len(testPaperInfos);k++ {
-				//imgSrc :=testPaperInfos[k].Pic_src
+				picName :=testPaperInfos[k].Pic_src
-				//删除图片
+				src := "./img/" + picName
+				os.Remove(src)
 				testPaperInfos[k].Delete()
 			}
 		}

controllers/supervisor.go

@@ -1289,6 +1289,52 @@ func (c *SupervisorApiController) ProblemUnmarkList() {
 	resp = Response{"10000", "OK", data}
 	c.Data["json"] = resp
 
+}
+/**
+20.自评卷列表
+ */
+func (c *SupervisorApiController) SelfUnmarkList() {
+	defer c.ServeJSON()
+	var requestBody requests.SelfUnmarkList
+	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
+	questionId := requestBody.QuestionId
+	//------------------------------------------------
+
+
+	//根据大题号找到自评卷
+	selfUnderCorrectedPaper :=make([]models.UnderCorrectedPaper ,0)
+	models.FindSelfUnderCorrectedPaperByQuestionId(&selfUnderCorrectedPaper,questionId)
+	if err!=nil {
+		resp = Response{"20027","FindSelfUnderCorrectedPaperByQuestionId  fail",err}
+		c.Data["json"] = resp
+		return
+	}
+	//输出标准
+	selfUnmarkVOList := make([]responses.SelfUnmarkListVO,len(selfUnderCorrectedPaper))
+
+	//求阅卷输出
+	for i:=0 ;i<len(selfUnderCorrectedPaper);i++ {
+		//存testId
+		selfUnmarkVOList[i].TestId=selfUnderCorrectedPaper[i].Test_id
+	}
+
+	//--------------------------------------------------
+
+	data := make(map[string]interface{})
+	data["selfUnmarkVOList"] =selfUnmarkVOList
+
+	resp = Response{"10000", "OK", data}
+	c.Data["json"] = resp
+
 }
 
 /**

lastupdate.tmp

@@ -1 +1 @@
-{"C:\\Users\\chen\\go\\src\\open-ct\\controllers":1632585323161191500}
+{"C:\\Users\\chen\\go\\src\\open-ct\\controllers":1632587620127206100}

models/underCorrectedPaper.go

@@ -157,6 +157,14 @@ func FindProblemUnderCorrectedPaperByQuestionId(problemUnderCorrectedPaper *[] U
 	}
  return err
 }
+func FindSelfUnderCorrectedPaperByQuestionId(selfUnderCorrectedPaper *[] UnderCorrectedPaper,questionId int64) error{
+
+	err := x.Where("question_id=?", questionId).Where(" test_question_type =?", 7).Find(selfUnderCorrectedPaper)
+	if err!=nil {
+		log.Println("FindSelfUnderCorrectedPaperByQuestionId err ")
+	}
+ return err
+}
 func FindSelfMarkPaperByQuestionId(selfMarkUnderCorrectedPaper *[]UnderCorrectedPaper,questionId int64) error{
 
 	err := x.Where("question_id=?", questionId).Where(" test_question_type =?", 7).Find(selfMarkUnderCorrectedPaper)

requests/supervisor.go

@@ -57,6 +57,10 @@ type ProblemUnmarkList struct {
 	SupervisorId string   `joson:"supervisorId"`
 	QuestionId int64 	`json:"questionId"`
 }
+type SelfUnmarkList struct {
+	SupervisorId string   `joson:"supervisorId"`
+	QuestionId int64 	`json:"questionId"`
+}
 type ScoreDeviation struct {
 	SupervisorId string   `joson:"supervisorId"`
 	QuestionId int64  `joson:"questionId"`

responses/supervisor.go

@@ -59,6 +59,9 @@ type ProblemUnderCorrectedPaperVO struct {
 type ProblemUnmarkListVO struct {
 	TestId int64
 }
+type SelfUnmarkListVO struct {
+	TestId int64
+}
 
 type  ArbitramentTestVO struct {
 	TestId int64

routers/router.go

@@ -48,6 +48,7 @@ func init() {
 	beego.Router("/openct/marking/supervisor/point", &controllers.SupervisorApiController{}, "post:SupervisorPoint")
 	beego.Router("/openct/marking/supervisor/arbitrament/unmark/list", &controllers.SupervisorApiController{}, "post:ArbitramentUnmarkList")
 	beego.Router("/openct/marking/supervisor/selfMark/list", &controllers.SupervisorApiController{}, "post:SelfMarkList")
+	beego.Router("/openct/marking/supervisor/selfMark/unmark/list", &controllers.SupervisorApiController{}, "post:SelfUnmarkList")
 	beego.Router("/openct/marking/supervisor/problem/unmark/list", &controllers.SupervisorApiController{}, "post:ProblemUnmarkList")
 	beego.Router("/openct/marking/supervisor/score/deviation", &controllers.SupervisorApiController{}, "post:ScoreDeviation")