瀏覽代碼

add 回访功能

周箭河 5 年之前
父節點
當前提交
2dbacc83db

+ 7 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/StudentVisitService.java

@@ -12,6 +12,13 @@ import java.util.List;
 
 
 public interface StudentVisitService extends BaseService<Integer, StudentVisit> {
 public interface StudentVisitService extends BaseService<Integer, StudentVisit> {
 
 
+
+    /**
+     * 添加访问记录
+     * @param studentVisit
+     * @return
+     */
+    StudentVisit addVisit(StudentVisit studentVisit);
     /**
     /**
      * 获取访问详情
      * 获取访问详情
      *
      *

+ 15 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentVisitServiceImpl.java

@@ -5,21 +5,19 @@ import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dao.StudentVisitDao;
 import com.ym.mec.biz.dal.dao.StudentVisitDao;
 import com.ym.mec.biz.dal.dto.PageInfoDegree;
 import com.ym.mec.biz.dal.dto.PageInfoDegree;
 import com.ym.mec.biz.dal.dto.StudentVisitDto;
 import com.ym.mec.biz.dal.dto.StudentVisitDto;
-import com.ym.mec.biz.dal.entity.DegreeRegistration;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.StudentVisit;
 import com.ym.mec.biz.dal.entity.StudentVisit;
-import com.ym.mec.biz.dal.page.DegreeQueryInfo;
 import com.ym.mec.biz.dal.page.StudentVisitQueryInfo;
 import com.ym.mec.biz.dal.page.StudentVisitQueryInfo;
 import com.ym.mec.biz.service.StudentVisitService;
 import com.ym.mec.biz.service.StudentVisitService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -42,6 +40,20 @@ public class StudentVisitServiceImpl extends BaseServiceImpl<Integer, StudentVis
     }
     }
 
 
     @Override
     @Override
+    public StudentVisit addVisit(StudentVisit studentVisit) {
+        if (studentVisit.getMusicGroupId() == null) {
+            throw new BizException("请选择乐团");
+        }
+        MusicGroup musicGroup = musicGroupDao.get(studentVisit.getMusicGroupId());
+        if (musicGroup == null) {
+            throw new BizException("选择的乐团不存在");
+        }
+        studentVisit.setOrganId(musicGroup.getOrganId());
+        studentVisitDao.insert(studentVisit);
+        return studentVisit;
+    }
+
+    @Override
     public StudentVisitDto getInfo(Integer id) {
     public StudentVisitDto getInfo(Integer id) {
         return studentVisitDao.getInfo(id);
         return studentVisitDao.getInfo(id);
     }
     }

+ 1 - 1
mec-teacher/src/main/java/com/ym/mec/teacher/controller/VisitController.java

@@ -45,7 +45,7 @@ public class VisitController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         studentVisit.setTeacherId(sysUser.getId());
         studentVisit.setTeacherId(sysUser.getId());
         studentVisit.setVisiterType(StudentVisit.VisiterTypeEnum.TEACHER);
         studentVisit.setVisiterType(StudentVisit.VisiterTypeEnum.TEACHER);
-        studentVisitService.insert(studentVisit);
+        studentVisitService.addVisit(studentVisit);
         return succeed(studentVisit);
         return succeed(studentVisit);
     }
     }
 
 

+ 1 - 2
mec-web/src/main/java/com/ym/mec/web/controller/VisitController.java

@@ -67,8 +67,7 @@ public class VisitController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         studentVisit.setTeacherId(sysUser.getId());
         studentVisit.setTeacherId(sysUser.getId());
         studentVisit.setVisiterType(StudentVisit.VisiterTypeEnum.EDU_TEACHER);
         studentVisit.setVisiterType(StudentVisit.VisiterTypeEnum.EDU_TEACHER);
-        studentVisitService.insert(studentVisit);
-        return succeed(studentVisit);
+        return succeed(studentVisitService.addVisit(studentVisit));
     }
     }
 
 
 
 

+ 1 - 2
mec-web/src/main/java/com/ym/mec/web/controller/education/EduVisitController.java

@@ -48,8 +48,7 @@ public class EduVisitController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         studentVisit.setTeacherId(sysUser.getId());
         studentVisit.setTeacherId(sysUser.getId());
         studentVisit.setVisiterType(StudentVisit.VisiterTypeEnum.EDU_TEACHER);
         studentVisit.setVisiterType(StudentVisit.VisiterTypeEnum.EDU_TEACHER);
-        studentVisitService.insert(studentVisit);
-        return succeed(studentVisit);
+        return succeed(studentVisitService.addVisit(studentVisit));
     }
     }