Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/PracticeGroupSellPriceService.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupSellPriceServiceImpl.java
#	mec-web/src/main/java/com/ym/mec/web/controller/PracticeGroupSellPriceController.java

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/TenantInfo.java

@@ -30,13 +30,23 @@ public class TenantInfo {
 	
 	/** 数据源 */
 	private String dataSource;
+
+	private Integer userId;
 	
 	/**  */
 	private java.util.Date createTime;
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysRoleServiceImpl.java

@@ -1,12 +1,17 @@
 package com.ym.mec.auth.service.impl;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysRole;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.auth.api.entity.TenantInfo;
 import com.ym.mec.auth.dal.dao.SysRoleDao;
 import com.ym.mec.auth.dal.dao.SysRoleMenuDao;
 import com.ym.mec.auth.service.SysRoleService;
+import com.ym.mec.auth.service.TenantInfoService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -78,12 +83,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 	private void batchSave(SysRole sysRole){
 		List<Integer> menuIds = sysRole.getMenuIds();
 		if(menuIds != null && menuIds.size() > 0){
-//			SysRoleMenu sysRoleMenu = new SysRoleMenu(sysRole.getId(),null);
 			sysRoleMenuDao.batchAdd(sysRole.getId(),menuIds, sysRole.getTenantId());
-//			menuIds.forEach(e->{
-//				sysRoleMenu.setMenuId(e);
-//				sysRoleMenuDao.insert(sysRoleMenu);
-//			});
 		}
 	}
 

mec-auth/mec-auth-server/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -12,6 +12,7 @@
 		<result column="contact_name_" property="contactName" />
 		<result column="contact_phone_" property="contactPhone" />
 		<result column="data_source_" property="dataSource" />
+		<result column="user_id_" property="userId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -32,8 +33,8 @@
 	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.TenantInfo"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO tenant_info
-		(id_,name_,address_,domain_name_,logo_url_,contact_name_,contact_phone_,data_source_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{address},#{domainName},#{logoUrl},#{contactName},#{contactPhone},#{dataSource},#{createTime},#{updateTime})
+		(name_,address_,domain_name_,logo_url_,contact_name_,contact_phone_,data_source_,create_time_,update_time_)
+		VALUES(#{name},#{address},#{domainName},#{logoUrl},#{contactName},#{contactPhone},#{dataSource},#{createTime},#{updateTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->

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

@@ -13,6 +13,8 @@ public class PracticeGroupSellPrice extends BaseEntity {
 
     private Integer organId;
 
+    private String organName;
+
     private BigDecimal onceOriginalPrice;
 
     private BigDecimal onceActivityPrice;
@@ -51,6 +53,14 @@ public class PracticeGroupSellPrice extends BaseEntity {
 
     private Date updateTime;
 
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
     public BigDecimal getSingleClassMinutesPrice() {
         return singleClassMinutesPrice;
     }

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

@@ -219,13 +219,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 
     @Override
     public <T extends EducationBaseQueryInfo> T onlyEducation(T queryInfo) {
-		if(StringUtils.isEmpty(queryInfo.getOrganIds())){
-			throw new BizException("请选择分部");
-		}
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			throw new BizException("用户信息获取失败");
 		}
+		queryInfo.setOrganIds(this.getEmployeeOrgan(sysUser.getId(),queryInfo.getOrganIds(),sysUser.getIsSuperAdmin()));
 		Boolean onlyForRole = employeePositionService.onlyForRole(EDUCATION, sysUser.getId(), sysUser.getIsSuperAdmin());
 		//如果当前用户只有教务老师角色，那么只能看到他所管理的课程组的信息
 		if (onlyForRole) {

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

@@ -338,14 +338,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 vscps.add(new VipGroupStudentCoursePrice(canBuyStudentId, vipGroupApplyBaseInfoDto.getOnlineClassesUnitPrice(), vipGroupApplyBaseInfoDto.getOfflineClassesUnitPrice(), vipGroupApplyBaseInfoDto.getTotalPrice()));
             }
         }
-//        Teacher teacher = teacherService.get(vipGroupApplyBaseInfoDto.getUserId());
-//		if(Objects.isNull(teacher)){
-//		    throw new BizException("教师不存在");
-//        }
-//		if(Objects.isNull(teacher.getTeacherOrganId())){
-//		    throw new BizException("教师部门异常");
-//        }
-//        vipGroupApplyBaseInfoDto.setOrganId(Integer.parseInt(teacher.getOrganId()));
         //开课时间为排课的第一节课的开始时间
         vipGroupApplyBaseInfoDto.setCourseStartDate(firstCourseSchedule.getStartClassTime());
         //课程结束时间为排课的最后一节课的结束时间

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

@@ -447,8 +447,8 @@
 			</if>
 			AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
 			AND (mgpcd.expect_amount_ + mgpcd.expect_member_amount_) > 0
-			<if test="organIds != null and organIds.size() != ''">
-				AND mg.organ_id_ IN FIND_IN_SET(mg.organ_id_,#{organIds})
+			<if test="organIds != null and organIds != ''">
+				AND FIND_IN_SET(mg.organ_id_,#{organIds})
 			</if>
 			<if test="musicGroupId!=null and musicGroupId!=''">
 				AND mgpc.music_group_id_ = #{musicGroupId}

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

@@ -150,7 +150,7 @@
     <delete id="deleteByMusicGroupPaymentCalenderDetailId">
         DELETE FROM music_group_payment_student_course_detail
         <where>
-        	music_group_payment_calender_detail_id_ in    
+        	music_group_payment_calender_detail_id_ IN
 		    <foreach item="item" collection="list" separator="," open="(" close=")" index="">    
 		      #{item}    
 		    </foreach>

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

@@ -22,6 +22,7 @@
 		<result column="care_package_price" property="carePackagePrice" />
 		<result column="come_on_package_price" property="comeOnPackagePrice" />
 		<result column="single_class_minutes_price_" property="singleClassMinutesPrice" />
+		<result column="organ_name_" property="organName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
         <result column="tenant_id_" property="tenantId"/>
@@ -80,7 +81,9 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="PracticeGroupSellPrice" parameterType="map">
-		SELECT * FROM practice_group_sell_price where tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT pgsp.*,o.name_ organ_name_ FROM practice_group_sell_price pgsp
+		LEFT JOIN organization o ON o.id_ = pgsp.organ_id_
+		WHERE pgsp.tenant_id_ = #{tenantId} ORDER BY pgsp.organ_id_
 		<include refid="global.limit" />
 	</select>
 

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

@@ -1,7 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ActivityPlanAddDto;
 import com.ym.mec.biz.dal.entity.ActivityPlan;
 import com.ym.mec.biz.dal.page.ActivityPlanQueryInfo;
@@ -24,8 +22,6 @@ public class ActivityPlanController extends BaseController {
 
     @Autowired
     private ActivityPlanService activityPlanService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private OrganizationService organizationService;
 

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

@@ -11,10 +11,13 @@ import com.ym.mec.biz.service.IndexBaseMonthDataService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
@@ -25,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @Api(tags = "首页")
@@ -51,6 +55,8 @@ public class IndexController extends BaseController {
 	private StudentPaymentOrderDao studentPaymentOrderDao;
 	@Autowired
 	private IndexBaseMonthDataService indexService;
+	@Autowired
+	private RedissonClient redissonClient;
 
 	@ApiOperation(value = "获取首页数据")
 	@GetMapping("/index")
@@ -106,7 +112,18 @@ public class IndexController extends BaseController {
 
 	@GetMapping("/hasIndexErrData")
 	public HttpResponseResult hasIndexErrData(String organId){
-		return succeed(indexService.hasIndexErrData(organizationService.getEmployeeOrgan(organId)));
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			throw new BizException("用户信息获取失败");
+		}
+		RBucket<Map<String, Boolean>> bucket = redissonClient.getBucket(sysUser.getId() + ":hasIndexErrData");
+		Map<String, Boolean> map = bucket.get();
+		if(map == null || map.size() == 0){
+			organId = organizationService.getEmployeeOrgan(sysUser.getId(),organId,sysUser.getIsSuperAdmin());
+			map = indexService.hasIndexErrData(organId);
+			bucket.set(map,10, TimeUnit.MINUTES);
+		}
+		return succeed(map);
 	}
 
 	@GetMapping("/getIndexErrData")