update

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -1,15 +1,16 @@
 package com.ym.mec.cms.controller;
 
-import com.ym.mec.cms.dal.dao.StudentRegistrationDao;
-import com.ym.mec.cms.dal.entity.SysConfig;
-import com.ym.mec.cms.service.SysConfigService;
-import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 
-import java.time.LocalDate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
@@ -25,8 +26,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.cms.controller.queryinfo.NewsInformationQueryInfo;
+import com.ym.mec.cms.dal.dao.StudentRegistrationDao;
 import com.ym.mec.cms.dal.dao.SysNewsInformationDao;
+import com.ym.mec.cms.dal.entity.SysConfig;
 import com.ym.mec.cms.dal.entity.SysNewsInformation;
+import com.ym.mec.cms.service.SysConfigService;
 import com.ym.mec.cms.service.SysNewsInformationService;
 import com.ym.mec.cms.service.SysNewsTypeService;
 import com.ym.mec.common.controller.BaseController;
@@ -34,8 +38,6 @@ import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.web.WebFeignService;
 import com.yonge.log.model.AuditLogAnnotation;
 
-import javax.servlet.http.HttpServletRequest;
-
 @RestController
 @RequestMapping("news")
 @Api(tags = "资讯服务")
@@ -62,12 +64,14 @@ public class NewsController extends BaseController {
 	@Autowired
 	private SysConfigService sysConfigService;
 
-	private final LocalDate xiaMenBannerStartShowTime = LocalDate.parse("2021-10-10", DateUtil.dateFormatter);
-
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/list")
 	public Object getList(NewsInformationQueryInfo queryInfo) {
 		SysUser user = sysUserFeignService.queryUserInfo();
+		
+		if(queryInfo.getType() == 6 || queryInfo.getType() == 7){
+			queryInfo.setTenantId(-1);
+		}
 
 		String clientId = queryInfo.getClientId();
 		
@@ -92,13 +96,6 @@ public class NewsController extends BaseController {
 			queryInfo.setExcludeIds(excludeIds);
 		} else {
 			queryInfo.setOrganId(user.getOrganId());
-			int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
-
-			//厦门学员
-			boolean xiaMenNotShow = (user.getOrganId()==40 || user.getOrganId() == 23 || user.getOrganId() == 25)&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
-			if(memberGroupNum>0||xiaMenNotShow){
-				queryInfo.setExcludeIds(excludeIds);
-			}
 		}
 		
 		Map<String, Object> params = new HashMap<String, Object>();
@@ -114,6 +111,10 @@ public class NewsController extends BaseController {
 	@GetMapping(value = "/queryPage")
 	public Object queryPage(NewsInformationQueryInfo queryInfo) {
 		
+		if(queryInfo.getType() == 6 || queryInfo.getType() == 7){
+			queryInfo.setTenantId(-1);
+		}
+		
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 		int count = sysNewsInformationDao.queryCount(params);
@@ -144,12 +145,6 @@ public class NewsController extends BaseController {
 			queryInfo.setExcludeIds(excludeIds);
 		} else {
 			queryInfo.setOrganId(user.getOrganId());
-			int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
-			//厦门学员
-			boolean xiaMenNotShow = (user.getOrganId()==40 || user.getOrganId() == 23 || user.getOrganId() == 25)&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
-			if(memberGroupNum>0||xiaMenNotShow){
-				queryInfo.setExcludeIds(excludeIds);
-			}
 		}
 		return succeed(sysNewsInformationService.getHomeList(user, queryInfo));
 	}
@@ -167,6 +162,10 @@ public class NewsController extends BaseController {
 	@AuditLogAnnotation(operateName = "资讯新增",interfaceURL = "news/add")
 	@PreAuthorize("@pcs.hasPermissions('news/add')")
 	public Object add(SysNewsInformation newsInfo) {
+		
+		if(newsInfo.getType() == 6 || newsInfo.getType() == 7){
+			newsInfo.setTenantId(-1);
+		}
 		return succeed(sysNewsInformationService.insert(newsInfo));
 	}
 
@@ -177,7 +176,9 @@ public class NewsController extends BaseController {
 	public Object update(SysNewsInformation newsInfo) {
 		Date date = new Date();
 		newsInfo.setUpdateTime(date);
-
+		if(newsInfo.getType() == 6 || newsInfo.getType() == 7){
+			newsInfo.setTenantId(-1);
+		}
 		return succeed(sysNewsInformationService.update(newsInfo));
 	}
 

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -1,6 +1,5 @@
 package com.ym.mec.cms.service.impl;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -116,15 +115,6 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		}*/
 		homeList.put("banner",pageInfos);
 		
-		queryInfo.setMemo(memo);
-		queryInfo.setType(6);
-		MapUtil.populateMap(params, queryInfo);
-		count = sysNewsInformationDao.queryHomeCount(params);
-		if(count == 0){
-			queryInfo.setMemo(null);
-		}
-		homeList.put("app",queryHomePage(queryInfo));
-		
 		queryInfo.setMemo(null);
 		queryInfo.setType(1);
 		homeList.put("active",queryHomePage(queryInfo));
@@ -133,6 +123,16 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		
 		queryInfo.setType(5);
 		homeList.put("flash",queryHomePage(queryInfo));
+		
+		queryInfo.setMemo(memo);
+		queryInfo.setType(6);
+		queryInfo.setTenantId(-1);
+		MapUtil.populateMap(params, queryInfo);
+		count = sysNewsInformationDao.queryHomeCount(params);
+		if(count == 0){
+			queryInfo.setMemo(null);
+		}
+		homeList.put("app",queryHomePage(queryInfo));
 		return homeList;
 	}
 	

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -40,16 +40,13 @@
 	
 	<sql id="queryCondition">
 		<where>
-			sni.del_flag_=0 
+			sni.del_flag_=0 and sni.tenant_id_ = #{tenantId}
 			<if test="type != null">
 				and sni.type_ = #{type}
 			</if>
 			<if test="subType != null">
 				and sni.sub_type_ = #{subType}
 			</if>
-			<if test="tenantId != null">
-				and sni.tenant_id_ = #{tenantId}
-			</if>
 			<if test="status != null">
 				and sni.status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
@@ -205,7 +202,7 @@
 	<!-- 分页查询 -->
 	<select id="queryHomePage" resultMap="SysNewsInformation"
 		parameterType="map">
-		SELECT sni.*,GROUP_CONCAT(s.name_) subject_name_ FROM sys_news_information sni left join subject s on find_in_set(s.id_,sni.subject_id_list_) where sni.del_flag_=0
+		SELECT sni.*,GROUP_CONCAT(s.name_) subject_name_ FROM sys_news_information sni left join subject s on find_in_set(s.id_,sni.subject_id_list_) where sni.del_flag_=0 and sni.tenant_id_ = #{tenantId}
 		<if test="type != null">
 			and sni.type_ = #{type}
 		</if>
@@ -222,9 +219,6 @@
 		<if test="search != null">
 			and sni.title_ like '%' #{search} '%'
 		</if>
-		<if test="tenantId != null">
-			and sni.tenant_id_ = #{tenantId}
-		</if>
 		<if test="excludeIds!=null and excludeIds.size()>0">
 			AND sni.id_ NOT IN
 			<foreach collection="excludeIds" item="excludeId" open="(" close=")" separator=",">
@@ -254,7 +248,7 @@
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryHomeCount" resultType="int">
-		SELECT COUNT(sni.id_) FROM sys_news_information sni where sni.del_flag_=0
+		SELECT COUNT(sni.id_) FROM sys_news_information sni where sni.del_flag_=0 and sni.tenant_id_ = #{tenantId}
 		<if test="type != null">
 			and sni.type_ = #{type}
 		</if>
@@ -271,9 +265,6 @@
 		<if test="search != null">
 			and sni.title_ like '%' #{search} '%'
 		</if>
-		<if test="tenantId != null">
-			and sni.tenant_id_ = #{tenantId}
-		</if>
 			<if test="subjectId != null">
 				and find_in_set(#{subjectId},sni.subject_id_list_)
 			</if>

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

@@ -1722,7 +1722,7 @@
 		UNION ALL
 		(
 			SELECT
-				su.organ_id_,sr.tenant_id_,
+				su.organ_id_,cssp.tenant_id_,
 				cssp.user_id_
 			FROM
 				course_schedule_student_payment cssp

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

@@ -1728,8 +1728,9 @@
           AND sr.user_id_ NOT IN (SELECT DISTINCT(cssp.`user_id_`)  FROM `course_schedule_student_payment` cssp
                                                  LEFT JOIN course_schedule cs on cssp.`course_schedule_id_` = cs.`id_`
                                                  LEFT JOIN `music_group` mg on mg.`id_` = cssp.`music_group_id_`
-      WHERE cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND mg.`status_` = 'PROGRESS' and sr.tenant_id_ = #{tenantId}
-      GROUP BY cssp.`user_id_` HAVING COUNT(cs.`id_`) > 4) AND sr.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
+      WHERE cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND mg.`status_` = 'PROGRESS' and mg.tenant_id_ = #{tenantId}
+      GROUP BY cssp.`user_id_` HAVING COUNT(cs.`id_`) > 4) 
+      <!-- AND sr.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29') -->
     </select>
     <resultMap id="CloudTeacherActiveTargetJsonDto" type="com.ym.mec.biz.dal.dto.CloudTeacherActiveTargetJsonDto">
         <result property="targetNum" column="target_num_"/>