zouxuan před 2 roky
rodič
revize
277f34b42e

+ 2 - 0
mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -3,6 +3,7 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
@@ -178,4 +179,5 @@ public class TeacherController extends BaseController {
         queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(teacherService.queryTeacherMusicStudentOverView(queryInfo));
     }
+
 }

+ 12 - 7
mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -1,7 +1,9 @@
 package com.ym.mec.teacher.controller;
 
 import com.ksyun.ks3.dto.PostObjectFormFields;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.enums.SuggestionType;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.thirdparty.entity.UploadSign;
 import io.swagger.annotations.*;
@@ -18,17 +20,11 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
 import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.SysSuggestionService;
-import com.ym.mec.biz.service.SysUserBankCardService;
-import com.ym.mec.biz.service.SysUserCashAccountDetailService;
-import com.ym.mec.biz.service.SysUserCashAccountService;
-import com.ym.mec.biz.service.UploadFileService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.util.upload.UploadUtil;
 
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "教师管理")
@@ -49,6 +45,8 @@ public class TeacherManageController extends BaseController {
     private SysUserBankCardService sysUserBankCardService;
     @Autowired
     private StudentRegistrationService studentRegistrationService;
+    @Autowired
+    private CooperationOrganService cooperationOrganService;
 
     private final static Logger LOGGER = LoggerFactory.getLogger(TeacherManageController.class);
 
@@ -208,4 +206,11 @@ public class TeacherManageController extends BaseController {
     public Object getStudentDetail(Integer studentId){
         return succeed(studentRegistrationService.getStudentDetail(studentId));
     }
+
+
+    @ApiOperation(value = "根据分部id获取合作单位(学校)列表")
+    @GetMapping("cooperation/getOrganCooperation")
+    public HttpResponseResult<List<CooperationOrgan>> getOrganCooperation(String organId) {
+        return succeed(cooperationOrganService.queryByOrganId(organId));
+    }
 }

+ 8 - 10
mec-web/src/main/java/com/ym/mec/web/controller/education/EduOrganizationController.java

@@ -1,15 +1,5 @@
 package com.ym.mec.web.controller.education;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.CooperationOrgan;
@@ -18,6 +8,14 @@ import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 @RequestMapping("eduOrganization")
 @Api(tags = "分部服务")