Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/scoreManage.vue

@@ -182,15 +182,15 @@
 
 
 <script>
 <script>
 import {
 import {
-  scoreManageList,
-  delRelation,
   addRelation,
   addRelation,
+  delRelation,
+  getAddressInfo,
   handleEdit,
   handleEdit,
   scoreEnd,
   scoreEnd,
-  getAddressInfo
+  scoreManageList
 } from "@/api/smartSchool/openRecruitment";
 } from "@/api/smartSchool/openRecruitment";
 import {getToken} from "@/utils/auth";
 import {getToken} from "@/utils/auth";
-import {Gender, Nations} from "@/enums/common";
+import {Gender} from "@/enums/common";
 
 
 export default {
 export default {
   name: "Relation",
   name: "Relation",
@@ -254,7 +254,7 @@ export default {
         // 设置上传的请求头部
         // 设置上传的请求头部
         headers: {Authorization: "Bearer " + getToken()},
         headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + `/artExam/importScoreData/${this.examId}`,
+        url: process.env.VUE_APP_BASE_API + `/recruitExam/importScoreData/${this.examId}`,
       },
       },
       // 表单参数
       // 表单参数
       form: {},
       form: {},
@@ -436,7 +436,7 @@ export default {
     // },
     // },
     /** 导出按钮操作 */
     /** 导出按钮操作 */
     handleExport() {
     handleExport() {
-      this.download(`/artExam/exportScore/${this.examId}`, {
+      this.download(`/recruitExam/exportScore/${this.examId}`, {
         ...this.queryParams
         ...this.queryParams
       }, `成绩管理${Date.now()}.xlsx`)
       }, `成绩管理${Date.now()}.xlsx`)
     },
     },

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/examination/SchoolRecruitRelationController.java

+package yangtz.cs.liu.campus.controller.examination;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitRelation;
+import yangtz.cs.liu.campus.service.recruit.ISchoolRecruitRelationService;
+
+/**
+ * @author xuten
+ */
+@RestController
+@RequestMapping("/recruit-relation")
+public class SchoolRecruitRelationController extends BaseController {
+
+  @Autowired
+  private ISchoolRecruitRelationService recruitRelationService;
+
+  /**
+   * 考场分配/成绩管理-查看
+   */
+  @GetMapping("/getAddressInfo/{id}")
+  public AjaxResult getAddressInfo(@PathVariable Long id) {
+    return AjaxResult.success(recruitRelationService.getAddressInfo(id));
+  }
+
+  /**
+   * 考场分配/成绩管理-修改
+   */
+  @PutMapping("/edit")
+  public AjaxResult edit(@RequestBody SchoolRecruitRelation relation) {
+    if (StringUtils.isNull(relation.getId())) {
+      throw new ServiceException("id为空,请检查");
+    }
+    if (relation.getExamTime().contains("：")) {
+      String t = relation.getExamTime();
+      t = t.replace("：", ":");
+      relation.setExamTime(t);
+    }
+    relation.update();
+    return toAjax(recruitRelationService.updateById(relation));
+  }
+
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/recruit/RecruitExamAddressVo.java

@@ -3,9 +3,8 @@ package yangtz.cs.liu.campus.vo.recruit;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
-import lombok.Data;
-
 import java.util.Date;
 import java.util.Date;
+import lombok.Data;
 
 
 @Data
 @Data
 public class RecruitExamAddressVo extends OurBaseEntity {
 public class RecruitExamAddressVo extends OurBaseEntity {
@@ -24,12 +23,12 @@ public class RecruitExamAddressVo extends OurBaseEntity {
     private String studentName;
     private String studentName;
 
 
     /** 学籍号 */
     /** 学籍号 */
-    @Excel(name = "学籍号", width = 25)
+//    @Excel(name = "学籍号", width = 25)
     private String studentNumber;
     private String studentNumber;
 
 
     /** 初中学校id */
     /** 初中学校id */
     private Long juniorId;
     private Long juniorId;
-    @Excel(name = "初中学校", width = 25)
+    //    @Excel(name = "初中学校", width = 25)
     private String schoolName;
     private String schoolName;
 
 
     /** 测试项目id */
     /** 测试项目id */