update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherDefaultMusicGroupSalary.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.entity;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -50,29 +51,21 @@ public class TeacherDefaultMusicGroupSalary {
 	/**  */
 	private java.util.Date updateTime;
 
-	public YesOrNoEnum getDelFlag() {
-		return delFlag;
+	public Long getId() {
+		return id;
 	}
 
-	public void setDelFlag(YesOrNoEnum delFlag) {
-		this.delFlag = delFlag;
-	}
-
-	public void setId(Long id){
+	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public Long getId(){
-		return this.id;
+
+	public Integer getUserId() {
+		return userId;
 	}
-			
-	public void setUserId(Integer userId){
+
+	public void setUserId(Integer userId) {
 		this.userId = userId;
 	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
 
 	public CourseScheduleType getCourseScheduleType() {
 		return courseScheduleType;
@@ -82,12 +75,28 @@ public class TeacherDefaultMusicGroupSalary {
 		this.courseScheduleType = courseScheduleType;
 	}
 
+	public BigDecimal getMainTeacher90MinSalary() {
+		return mainTeacher90MinSalary;
+	}
+
+	public void setMainTeacher90MinSalary(BigDecimal mainTeacher90MinSalary) {
+		this.mainTeacher90MinSalary = mainTeacher90MinSalary;
+	}
+
+	public BigDecimal getAssistantTeacher90MinSalary() {
+		return assistantTeacher90MinSalary;
+	}
+
+	public void setAssistantTeacher90MinSalary(BigDecimal assistantTeacher90MinSalary) {
+		this.assistantTeacher90MinSalary = assistantTeacher90MinSalary;
+	}
+
 	public BigDecimal getMainTeacher30MinSalary() {
-		return assistantTeacher30MinSalary;
+		return mainTeacher30MinSalary;
 	}
 
-	public void setMainTeacher30MinSalary(BigDecimal assistantTeacher30MinSalary) {
-		this.assistantTeacher30MinSalary = assistantTeacher30MinSalary;
+	public void setMainTeacher30MinSalary(BigDecimal mainTeacher30MinSalary) {
+		this.mainTeacher30MinSalary = mainTeacher30MinSalary;
 	}
 
 	public BigDecimal getAssistantTeacher30MinSalary() {
@@ -98,41 +107,27 @@ public class TeacherDefaultMusicGroupSalary {
 		this.assistantTeacher30MinSalary = assistantTeacher30MinSalary;
 	}
 
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-	
-	public BigDecimal getMainTeacher90MinSalary() {
-		return mainTeacher90MinSalary;
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
 
-	public void setMainTeacher90MinSalary(BigDecimal mainTeacher90MinSalary) {
-		this.mainTeacher90MinSalary = mainTeacher90MinSalary;
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
 	}
 
-	public BigDecimal getAssistantTeacher90MinSalary() {
-		return assistantTeacher90MinSalary;
+	public Date getCreateTime() {
+		return createTime;
 	}
 
-	public void setAssistantTeacher90MinSalary(BigDecimal assistantTeacher90MinSalary) {
-		this.assistantTeacher90MinSalary = assistantTeacher90MinSalary;
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
 	}
 
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
+	public Date getUpdateTime() {
+		return updateTime;
 	}
 
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -443,7 +443,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             }
             studentRegistration.setActualSubjectId(studentRegistration.getSubjectId());
             studentRegistration.setUserId(userId);
-            studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
+            studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
             studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.NORMAL);
             //学生报名表
             studentRegistrationDao.insertBasic(studentRegistration);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherDefaultMusicGroupSalaryServiceImpl.java

@@ -35,19 +35,6 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 			teacherDefaultMusicGroupSalaryDao.delByTeacherId(salary.getUserId());
 			//批量新增
 			teacherDefaultMusicGroupSalaryDao.batchAdd(salaries);
-			/*Date date = new Date();
-			teacherDefaultMusicGroupSalaries.forEach(e->{
-				if(e.getId() == null){
-					teacherDefaultMusicGroupSalaryDao.insert(e);
-				}else{
-					if(e.getDelFlag() == YesOrNoEnum.YES){
-						teacherDefaultMusicGroupSalaryDao.delete(e.getId());
-					}else {
-						e.setUpdateTime(date);
-						teacherDefaultMusicGroupSalaryDao.update(e);
-					}
-				}
-			});*/
 		}
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/TeacherDefaultMusicGroupSalaryController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,6 +28,7 @@ public class TeacherDefaultMusicGroupSalaryController extends BaseController {
 
     @ApiOperation(value = "批量新增、修改教师乐团课薪酬")
     @PostMapping("/batchUpset")
+    @PreAuthorize("@pcs.hasPermissions('teacherDefaultMusicGroupSalary/batchUpset')")
     public Object batchUpset(@RequestBody List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaries) {
         teacherDefaultMusicGroupSalaryService.batchUpset(teacherDefaultMusicGroupSalaries);
         return succeed();
@@ -34,6 +36,7 @@ public class TeacherDefaultMusicGroupSalaryController extends BaseController {
 
     @ApiOperation(value = "分页查询教师薪酬")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('teacherDefaultMusicGroupSalary/queryPage')")
     public Object queryPage(TeacherMusicGroupSalaryQueryInfo queryInfo) {
         return succeed(teacherDefaultMusicGroupSalaryService.queryPage(queryInfo));
     }