浏览代码

增加老师签到

周箭河 5 年之前
父节点
当前提交
3bba15f59c

+ 43 - 0
mec-web/src/main/java/com/ym/mec/web/controller/TeacherAttendanceController.java

@@ -0,0 +1,43 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.security.SecurityUtils;
+import com.ym.mec.web.dal.entity.Teacher;
+import com.ym.mec.web.dal.entity.TeacherAttendance;
+import com.ym.mec.web.dal.page.TeacherAttendanceQueryInfo;
+import com.ym.mec.web.dal.page.TeacherQueryInfo;
+import com.ym.mec.web.service.ClassGroupService;
+import com.ym.mec.web.service.TeacherAttendanceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+@RequestMapping("teacherAttendance")
+@Api(tags = "教师签到服务")
+@RestController
+public class TeacherAttendanceController extends BaseController {
+
+    @Autowired
+    private TeacherAttendanceService teacherAttendanceService;
+
+    @ApiOperation(value = "新增教师签到")
+    @PostMapping("/add")
+    public Object add(@RequestBody TeacherAttendance teacherAttendance) {
+        Date date = new Date();
+        teacherAttendance.setSignInTime(date);
+        teacherAttendance.setCreateTime(date);
+        teacherAttendanceService.insert(teacherAttendance);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询教师签到列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(@RequestBody TeacherAttendanceQueryInfo queryInfo) {
+        return succeed(teacherAttendanceService.queryPage(queryInfo));
+    }
+
+}

+ 9 - 1
mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -35,6 +35,10 @@ public class TeacherController extends BaseController {
         if (teacherServiceByCertificateNum != null) {
             return failed("系统已存在该证件号的老师,请核查");
         }
+        Integer organId = SecurityUtils.getUser().getOrganId();
+        if(organId != null){
+            teacher.setOrganId(organId);
+        }
         Date date = new Date();
         teacher.setCreateTime(date);
         teacher.setUpdateTime(date);
@@ -52,6 +56,10 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "修改教师")
     @PutMapping("/update")
     public Object update(@RequestBody Teacher teacher) {
+        Integer organId = SecurityUtils.getUser().getOrganId();
+        if(organId != null){
+            teacher.setOrganId(organId);
+        }
         Teacher teacherServiceByCertificateNum = teacherService.findByCertificateNum(teacher.getCertificateNum());
         if (teacherServiceByCertificateNum != null && !teacherServiceByCertificateNum.getUserId().equals(teacher.getUserId())) {
             return failed("系统已存在该证件号的老师,请核查");
@@ -74,7 +82,7 @@ public class TeacherController extends BaseController {
     }
 
     @ApiOperation(value = "根据教师编号查询教师课程班列表")
-    @GetMapping("/getclass/{id}")
+    @GetMapping("/getClass/{id}")
     public Object getClassGroup(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
         return succeed(classGroupService.findClassGroup4Teacher(id));
     }

+ 6 - 0
mec-web/src/main/java/com/ym/mec/web/dal/page/TeacherAttendanceQueryInfo.java

@@ -0,0 +1,6 @@
+package com.ym.mec.web.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class TeacherAttendanceQueryInfo extends QueryInfo {
+}