yonge 3 년 전
부모
커밋
484cb9a2a8

+ 0 - 9
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupTrainPlanSaveDto.java

@@ -38,8 +38,6 @@ public class MusicGroupTrainPlanSaveDto extends BaseEntity {
 
 	private Boolean studentFlag = false;
 	
-	private Integer tenantId;
-
 	public Boolean getStudentFlag() {
 		return studentFlag;
 	}
@@ -120,11 +118,4 @@ public class MusicGroupTrainPlanSaveDto extends BaseEntity {
 		this.musicGroupId = musicGroupId;
 	}
 
-	public Integer getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(Integer tenantId) {
-		this.tenantId = tenantId;
-	}
 }

+ 1 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupTrainPlanServiceImpl.java

@@ -71,6 +71,7 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
 		paramMap.put("courseScheduleType",musicGroupTrainPlanSaveDto.getCourseScheduleType());
 		paramMap.put("startSchoolTerm",musicGroupTrainPlanSaveDto.getStartSchoolTerm());
 		paramMap.put("endSchoolTerm",musicGroupTrainPlanSaveDto.getEndSchoolTerm());
+		paramMap.put("tenantId",musicGroupTrainPlanSaveDto.getTenantId());
 		//课程规划
 		List<MusicGroupTrainPlan> musicGroupTrainPlans = musicGroupTrainPlanDao.findAll(paramMap);
 		Map<String,Object> resultMap = new HashMap<>(2);

+ 45 - 0
mec-student/src/main/java/com/ym/mec/student/controller/TenantApplyController.java

@@ -0,0 +1,45 @@
+package com.ym.mec.student.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.entity.TenantApply;
+import com.ym.mec.biz.service.TenantApplyService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.service.IdGeneratorService;
+
+@RequestMapping("tenantApply")
+@Api(tags = "机构申请服务")
+@RestController
+public class TenantApplyController extends BaseController {
+
+	@Autowired
+	private TenantApplyService tenantApplyService;
+
+	@Autowired
+	private IdGeneratorService smsCodeService;
+
+
+	@ApiOperation("新增")
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object add(TenantApply tenantApply) {
+		
+		boolean b = smsCodeService.verifyValidCode(tenantApply.getMobileNo(), tenantApply.getSmsCode());
+		if (!b) {
+			return failed("验证码不正确");
+		}
+		
+		tenantApply.setCreateTime(new Date());
+		tenantApplyService.insert(tenantApply);
+		return succeed();
+	}
+
+}