Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/saas' into saas

zouxuan 3 rokov pred
rodič
commit
95d35bbdd0

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysEmailDao.java

@@ -16,6 +16,6 @@ public interface SysEmailDao extends BaseMapper<SysEmail> {
 
    int insertBatch(@Param("entities") List<SysEmail> entities);
 
-    SysEmail query();
+    SysEmail query(@Param("tenantId") Integer tenantId);
 }
 

+ 34 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -80,6 +80,16 @@ public class Student extends SysUser {
 
 	private Integer countFlag;
 
+	@ApiModelProperty(value = "家长姓名")
+	private String parentName;
+
+	@ApiModelProperty(value = "备注")
+	private String remake;
+
+	@ApiModelProperty(value = "单位名称")
+	private String unitName;
+
+
 	public Student(Integer userId, String subjectIdList) {
 		this.userId = userId;
 		this.subjectIdList = subjectIdList;
@@ -307,4 +317,28 @@ public class Student extends SysUser {
 	public void setMemberRankImg(String memberRankImg) {
 		this.memberRankImg = memberRankImg;
 	}
+
+	public String getParentName() {
+		return parentName;
+	}
+
+	public void setParentName(String parentName) {
+		this.parentName = parentName;
+	}
+
+	public String getRemake() {
+		return remake;
+	}
+
+	public void setRemake(String remake) {
+		this.remake = remake;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
 }

+ 43 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPreRegistration.java

@@ -37,7 +37,17 @@ public class StudentPreRegistration extends BaseStudentDto {
 	
 	/** 创建时间 */
 	private java.util.Date createTime;
-	
+
+	// 2022 add new field
+	/** 家长姓名 **/
+	private String parentName;
+
+	/** 备注 */
+	private String remake;
+
+	/** 单位名称 */
+	private String unitName;
+
 	public void setId(Long id){
 		this.id = id;
 	}
@@ -130,4 +140,36 @@ public class StudentPreRegistration extends BaseStudentDto {
 	public void setCloudTeacherMethod(String cloudTeacherMethod) {
 		this.cloudTeacherMethod = cloudTeacherMethod;
 	}
+
+	public boolean isAllowAdjust() {
+		return isAllowAdjust;
+	}
+
+	public void setAllowAdjust(boolean allowAdjust) {
+		isAllowAdjust = allowAdjust;
+	}
+
+	public String getParentName() {
+		return parentName;
+	}
+
+	public void setParentName(String parentName) {
+		this.parentName = parentName;
+	}
+
+	public String getRemake() {
+		return remake;
+	}
+
+	public void setRemake(String remake) {
+		this.remake = remake;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
 }

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/SysEmailService.java

@@ -11,6 +11,6 @@ import com.ym.mec.biz.dal.entity.SysEmail;
  */
 public interface SysEmailService extends IService<SysEmail> {
 
-    SysEmail query();
+    SysEmail query(Integer tenantId);
 }
 

+ 4 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -178,6 +178,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         student.setCurrentGradeNum(studentPreRegistration.getCurrentGradeNum());
         student.setCurrentClass(studentPreRegistration.getCurrentClass());
         student.setTenantId(studentPreRegistration.getTeacherRecommandSubjectId());
+        student.setOrganId(studentPreRegistration.getOrganId());
+        student.setParentName(studentPreRegistration.getParentName());
+        student.setRemake(studentPreRegistration.getRemake());
+        student.setUnitName(studentPreRegistration.getUnitName());
         studentDao.insert(student);
         
         return true;

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysEmailServiceImpl.java

@@ -21,8 +21,8 @@ public class SysEmailServiceImpl extends ServiceImpl<SysEmailDao, SysEmail> impl
     private final static Logger logger = LoggerFactory.getLogger(SysEmailServiceImpl.class);
 
     @Override
-    public SysEmail query() {
-        return baseMapper.query();
+    public SysEmail query(Integer tenantId) {
+        return baseMapper.query(tenantId);
     }
 }
 

+ 1 - 2
mec-biz/src/main/resources/config/mybatis/SysEmailMapper.xml

@@ -26,8 +26,7 @@
         </foreach>
     </insert>
     <select id="query" resultType="com.ym.mec.biz.dal.entity.SysEmail">
-        select *
-        from sys_email
+        select * from sys_email where tenant_id_ = #{tenantId}
     </select>
 
 </mapper>

+ 1 - 1
mec-student/src/main/java/com/ym/mec/student/controller/StudentController.java

@@ -39,7 +39,7 @@ public class StudentController extends BaseController {
         		return succeed("您已注册,请直接下载APP!");
         	}
         }
-        
+
         return studentService.register(studentPreRegistration) ? succeed() : failed();
     }
 

+ 4 - 1
mec-web/src/main/java/com/ym/mec/web/controller/SysEmailController.java

@@ -1,8 +1,10 @@
 package com.ym.mec.web.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
 import com.ym.mec.biz.dal.entity.SysEmail;
 import com.ym.mec.biz.service.SysEmailService;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -40,7 +42,8 @@ public class SysEmailController extends BaseController {
     @GetMapping("/query")
     @PreAuthorize("@pcs.hasPermissions('sysEmail/query')")
     public HttpResponseResult<SysEmail> query() {
-        return succeed(sysEmailService.query());
+        Integer tenantId = TenantContextHolder.getTenantId();
+        return succeed(sysEmailService.query(tenantId));
     }
 
 }