Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomController.java

@@ -0,0 +1,38 @@
+package com.keao.edu.user.controller;
+
+import com.keao.edu.common.controller.BaseController;
+import com.keao.edu.common.entity.HttpResponseResult;
+import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.common.page.QueryInfo;
+import com.keao.edu.user.api.entity.ExamRoom;
+import com.keao.edu.user.service.ExamRoomService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.06.18
+ */
+@RestController
+@RequestMapping("examRoom")
+@Api(tags = "考级项目代理商服务")
+public class ExamRoomController extends BaseController {
+
+    @Autowired
+    private ExamRoomService examRoomService;
+
+    @ApiOperation("分页查询")
+    @GetMapping(value = "/list")
+    public HttpResponseResult<PageInfo<ExamRoom>> getList(QueryInfo queryInfo) {
+        return succeed(examRoomService.queryPage(queryInfo));
+    }
+
+    @ApiOperation("更新考级项目与代理商关联信息")
+    @PostMapping(value = "/updateExamAgencyRelation")
+    public HttpResponseResult updateExamAgencyRelation(@RequestBody ExamRoom examRoom){
+        examRoomService.update(examRoom);
+        return succeed();
+    }
+}