Merge branch 'grade_feature' into test

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java
#	mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java
#	mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java
#	mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

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

@@ -141,13 +141,13 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private CourseScheduleDao courseScheduleDao;
     @Autowired
+    private StudentInstrumentService studentInstrumentService;
+    @Autowired
     private OrganizationDao organizationDao;
 
     @Autowired
     private GroupEventSource groupEventSource;
     @Autowired
-    private StudentInstrumentService studentInstrumentService;
-    @Autowired
     private WebFeignService webFeignService;
 
     @Override
@@ -328,6 +328,24 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistration.setUpdateTime(date);
         studentRegistration.setUserId(sysUser.getId());
         studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.APPLY);
+
+        Organization organization = organizationDao.get(studentRegistration.getOrganId());
+        if(organization.getGradeType().equals(GradeTypeEnum.SIX_PLUS)){
+            for (SixPlusGradeEnum value : SixPlusGradeEnum.values()) {
+                if(value.getCode().equals(studentRegistration.getCurrentGradeNum())){
+                    studentRegistration.setCurrentGrade(value.getDesc());
+                    break;
+                }
+            }
+        }else {
+            for (FivePlusGradeEnum value : FivePlusGradeEnum.values()) {
+                if(value.getCode().equals(studentRegistration.getCurrentGradeNum())){
+                    studentRegistration.setCurrentGrade(value.getDesc());
+                    break;
+                }
+            }
+        }
+
         if (hasReg != null) {
             studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.APPLY);
             studentRegistration.setId(hasReg.getId());

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -160,13 +160,13 @@ public interface TaskRemoteService {
 	@GetMapping("task/closeStudentServiceTag")
     void closeStudentServiceTag();
 
+	//乐保到期提醒
+	@GetMapping("task/maintenanceNotice")
+	void maintenanceNotice();
+
 	/**
 	 * 更新学生年级
 	 */
 	@GetMapping("task/updateGrade")
 	void updateGrade();
-
-	//乐保到期提醒
-	@GetMapping("task/maintenanceNotice")
-	void maintenanceNotice();
 }

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -71,8 +71,6 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 			String substring = servletPath.substring(servletPath.lastIndexOf("/") + 1).toLowerCase();
 			if(ignoreLogUrl == null){
 				ignoreLogUrl = new ArrayList<>();
-				ignoreLogUrl.add("add");
-				ignoreLogUrl.add("insert");
 				ignoreLogUrl.add("query");
 				ignoreLogUrl.add("get");
 				ignoreLogUrl.add("find");

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

@@ -343,15 +343,15 @@ public class TaskController extends BaseController {
 		inspectionItemPlanService.pushNotice();
 	}
 
-	//每年9.1升级学员的班级
-	@GetMapping("/updateGrade")
-	public void updateGrade(){
-		studentService.updateGrade();
-	}
-
 	//乐保到期提醒
 	@GetMapping("/maintenanceNotice")
 	public void maintenanceNotice(){
 		studentInstrumentService.pushNotice();
 	}
+
+	//每年9.1升级学员的班级
+	@GetMapping("/updateGrade")
+	public void updateGrade(){
+		studentService.updateGrade();
+	}
 }