Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -170,7 +170,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param subjectId: 声部编号
      * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
-    List<Teacher> findOrganTeacherBySubject(@Param("organId") Integer organId,
+    List<Teacher> findOrganTeacherBySubject(@Param("organId") String organId,
                                             @Param("subjectId") Integer subjectId);
 
     /**

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

@@ -67,7 +67,7 @@ public class VipGroup {
 	private BigDecimal offlineClassesUnitPrice;
 
 	@ApiModelProperty(value = "课程总价",required = false)
-	private BigDecimal totalPrice;
+	private BigDecimal totalPrice = new BigDecimal(0);
 
 	@ApiModelProperty(value = "审批状态",required = false)
 	private AuditStatusEnum auditStatus;

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

@@ -63,6 +63,8 @@ public class VipGroupActivity {
 	private String salarySettlementJson;
 
 	private String vipGroupCategoryNames;
+	
+	private Boolean delFlag = false;
 
 	private Integer enable;
 
@@ -226,6 +228,14 @@ public class VipGroupActivity {
 		return this.salarySettlementJson;
 	}
 			
+	public Boolean getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Boolean delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -4,6 +4,7 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     SMS_APPLY_MESSAGE("SMS_APPLY_MESSAGE", "报名通知"),
+    SMS_MUSIC_GROUP_ADD_STUDENT("SMS_MUSIC_GROUP_ADD_STUDENT", "入团通知"),
     SMS_VERIFY_CODE_LOGIN("SMS_VERIFY_CODE_LOGIN", "验证码登录"),
     SMS_PAYMENT_MESSAGE("SMS_PAYMENT_MESSAGE", "缴费通知"),
     SMS_PAYMENT_SUCCESS("SMS_PAYMENT_SUCCESS", "缴费成功"),

mec-biz/src/main/java/com/ym/mec/biz/service/TeacherService.java

@@ -85,7 +85,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param subjectId: 科目编号
      * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
-    List<Teacher> findOrganTeacherBySubject(@Param("organId") Integer organId,
+    List<Teacher> findOrganTeacherBySubject(@Param("organId") String organId,
                                             @Param("subjectId") Integer subjectId);
 
     /**

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

@@ -79,6 +79,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employee.setPassword(new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
 		employee.setUserType(SysUserType.SYSTEM);
 		employee.setUsername(employee.getRealName());
+		employee.setOrganId(employee.getOrganIdList());
 		teacherDao.addSysUser(employee);
 		employee.setUserId(employee.getId());
         employeeDao.insert(employee);

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

@@ -524,6 +524,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 }
             }
             studentRegistrationDao.updateCurrentClass(studentRegistration);
+            Map<Integer,String> receivers = new HashMap<>(1);
+            receivers.put(studentRegistration.getUserId(),studentRegistration.getParentsPhone());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,MessageTypeEnum.SMS_MUSIC_GROUP_ADD_STUDENT,
+                    receivers,null,0,null,studentRegistration.getParentsName(),musicGroup.getName());
             return userId;
         }
     }

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

@@ -205,7 +205,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
     }
 
 	@Override
-	public List<Teacher> findOrganTeacherBySubject(Integer organId, Integer subjectId) {
+	public List<Teacher> findOrganTeacherBySubject(String organId, Integer subjectId) {
 		return teacherDao.findOrganTeacherBySubject(organId,subjectId);
 	}
 
@@ -361,7 +361,9 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			if(StringUtils.isNotEmpty(teacher.getFlowOrganRange())){
 				teacher.setFlowOrganRangeId(teacher.getFlowOrganRange());
 				List<String> organNames = organizationDao.findByOrganIds(teacher.getFlowOrganRange());
-				teacher.setOrganName(organizationDao.get(Integer.parseInt(teacher.getOrganId())).getName());
+				if(StringUtils.isNotEmpty(teacher.getOrganId())){
+					teacher.setOrganName(organizationDao.get(Integer.parseInt(teacher.getOrganId())).getName());
+				}
 				teacher.setFlowOrganRange(StringUtils.join(organNames,","));
 			}
 			//专业技能

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -481,7 +481,7 @@
         SELECT su.* FROM teacher t
         LEFT JOIN sys_user su on t.id_ = su.id_ WHERE 1=1
         <if test="organId != null">
-            AND t.organ_id_ = #{organId}
+            AND FIND_IN_SET(t.organ_id_,#{organId})
         </if>
         <if test="subjectId != null">
             AND FIND_IN_SET(#{subjectId},t.subject_id_)

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -27,6 +27,7 @@
 		<result column="salary_settlement_json_" property="salarySettlementJson" />
 		<result column="vip_group_category_names_" property="vipGroupCategoryNames"/>
 		<result property="enable" column="enable"/>
+		<result property="del_flag_" column="delFlag"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -46,7 +47,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_activity (id_,name_,description_,vip_group_category_id_list_,start_time_,end_time_,organ_id_,courses_start_time_,courses_end_time_,type_,attribute1_,attribute2_,attribute3_,salary_readonly_flag_,give_class_pay_salary_flag_,create_time_,update_time_,salary_settlement_json_) VALUES(#{id},#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},#{type},#{attribute1},#{attribute2},#{attribute3},#{salaryReadonlyFlag},#{giveClassPaySalaryFlag},now(),now(),#{salarySettlementJson})
+		INSERT INTO vip_group_activity (id_,name_,description_,vip_group_category_id_list_,start_time_,end_time_,organ_id_,courses_start_time_,courses_end_time_,type_,attribute1_,attribute2_,attribute3_,salary_readonly_flag_,give_class_pay_salary_flag_,create_time_,update_time_,salary_settlement_json_,del_flag_) VALUES(#{id},#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},#{type},#{attribute1},#{attribute2},#{attribute3},#{salaryReadonlyFlag},#{giveClassPaySalaryFlag},now(),now(),#{salarySettlementJson},#{delFlag})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -106,6 +107,9 @@
 			<if test="type != null">
 			type_ = #{type},
 			</if>
+			<if test="delFlag != null">
+			del_flag_ = #{delFlag},
+			</if>
 			</set> WHERE id_ = #{id}
 	</update>
 	
@@ -117,7 +121,9 @@
 	<sql id="queryCondition">
 		<where>
 			vga.del_flag_=0
+			<if test="organId != null">
 			AND INTE_ARRAY(organ_id_,#{organId})
+			</if>
 		</where>
 	</sql>
 

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

@@ -48,8 +48,8 @@ public class EmployeeController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
 		}

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

@@ -72,14 +72,17 @@ public class IndexController extends BaseController {
 		Map<String, Integer> studentDatas = studentRegistrationDao.queryStudentNum(organId);
 		
 		Map<String, Integer> vipDatas = vipGroupDao.queryVipGroupNum(organId);
-		
-		Map<String, Integer> demoDatas = demoGroupDao.queryDemoGroupNum(organId.split(","));
+		String[] organIds = null;
+		if(StringUtils.isNotEmpty(organId)){
+			organIds = organId.split(",");
+		}
+		Map<String, Integer> demoDatas = demoGroupDao.queryDemoGroupNum(organIds);
 		
 		Integer musicGroupNum = musicGroupDao.queryCurrentMonthCoursesNum(organId);
 		
 		Integer vipGroupNum = vipGroupDao.queryCurrentMonthCoursesNum(organId);
 		
-		Integer demoGroupNum = demoGroupDao.queryCurrentMonthCoursesNum(organId.split(","));
+		Integer demoGroupNum = demoGroupDao.queryCurrentMonthCoursesNum(organIds);
 		
 		Map<String, Object> incomeExpendMap = sysUserCashAccountDetailDao.queryStatistics(organId);
 		

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

@@ -105,8 +105,8 @@ public class MusicGroupController extends BaseController {
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.contains(queryInfo.getOrganId())){
-					return failed("用户所在分部异常");
+				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+					return failed("非法请求");
 				}
 			}
 		}

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

@@ -51,8 +51,8 @@ public class StudentApplyRefundsController extends BaseController {
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.contains(queryInfo.getOrganId())){
-					return failed("用户所在分部异常");
+				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+					return failed("非法请求");
 				}
 			}
 		}

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

@@ -60,8 +60,8 @@ public class StudentManageController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
         }

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

@@ -59,8 +59,8 @@ public class StudentPaymentOrderController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
         }

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

@@ -52,8 +52,8 @@ public class StudentRechargeController extends BaseController {
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.contains(queryInfo.getOrganId())){
-					return failed("用户所在分部异常");
+				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+					return failed("非法请求");
 				}
 			}
 		}

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

@@ -62,8 +62,8 @@ public class StudentWithdrawController extends BaseController {
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.contains(queryInfo.getOrganId())){
-					return failed("用户所在分部异常");
+				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+					return failed("非法请求");
 				}
 			}
 		}

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

@@ -60,8 +60,8 @@ public class TeacherController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
         }
@@ -101,8 +101,8 @@ public class TeacherController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(organId)){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(organId.split(",")))){
+                    return failed("非法请求");
                 }
             }
         }
@@ -114,10 +114,7 @@ public class TeacherController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('teacher/findOrganTeacherBySubject')")
     public HttpResponseResult findOrganTeacherBySubject(Integer subjecId) {
         String organId = sysUserFeignService.queryUserInfo().getOrganId();
-        if(StringUtils.isNotEmpty(organId)){
-            return succeed(teacherService.findOrganTeacherBySubject(Integer.parseInt(organId),subjecId));
-        }
-        return succeed(teacherService.findOrganTeacherBySubject(null,subjecId));
+        return succeed(teacherService.findOrganTeacherBySubject(organId,subjecId));
     }
 
     @ApiOperation(value = "获取乐团所有老师")

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

@@ -63,8 +63,8 @@ public class VipGroupActivityController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
 		}

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

@@ -56,8 +56,8 @@ public class VipGroupCategoryController extends BaseController {
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.contains(organId)){
-					return failed("用户所在分部异常");
+				if(!list.containsAll(Arrays.asList(organId.split(",")))){
+					return failed("非法请求");
 				}
 			}
 		}

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

@@ -88,8 +88,8 @@ public class VipGroupManageController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
         }