Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/ExaminationBasicDao.java

@@ -46,7 +46,8 @@ public interface ExaminationBasicDao extends BaseDAO<Long, ExaminationBasic> {
      * @param organIds:
      * @return java.util.List<com.keao.edu.user.dto.ExaminationBasicDto>
      */
-    List<ExaminationBasicDto> getUnderwayExams(@Param("organs") List<Integer> organIds);
+    List<ExaminationBasicDto> getUnderwayExams(@Param("organId") Integer organId,
+                                                @Param("organIds") List<Integer> organIds);
 
     /**
      * @describe 获取机构考级项目统计信息

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -1,6 +1,5 @@
 package com.keao.edu.user.service.impl;
 
-import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.enums.MessageTypeEnum;
@@ -20,7 +19,6 @@ import com.keao.edu.user.enums.ExamStatusEnum;
 import com.keao.edu.user.page.ExaminationQueryInfo;
 import com.keao.edu.user.service.*;
 import com.keao.edu.util.collection.MapUtil;
-import com.keao.edu.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -452,7 +450,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     public Map<String, Object> getHomePageExams(Integer organId) {
         Map<String, Object> result=new HashMap<>();
         List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
-        List<ExaminationBasicDto> dataList = examinationBasicDao.getUnderwayExams(childOrganIds);
+        List<ExaminationBasicDto> dataList = examinationBasicDao.getUnderwayExams(organId,childOrganIds);
         if(CollectionUtils.isEmpty(dataList)){
             return result;
         }

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExaminationBasicMapper.xml

@@ -290,19 +290,20 @@
 	</select>
 
     <select id="getUnderwayExams" resultMap="ExaminationBasicDto">
-		SELECT
-			*
+		SELECT DISTINCT eb.*
 		FROM
-			examination_basic
-		WHERE
-			status_ IN ( 'APPLYING', 'APPLIED' )
-			AND organ_id_ IN
-			<foreach collection="organs" item="organ" separator="," open="(" close=")">
-				#{organ}
+		exam_organization_relation eor
+		LEFT JOIN examination_basic eb ON eor.examination_basic_id_ = eb.id_
+		WHERE status_ IN ( 'APPLYING', 'APPLIED' )
+		AND (eor.organ_id_ = #{organId}
+			OR eb.organ_id_ IN
+			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+				#{organId}
 			</foreach>
+			)
 		ORDER BY
-			create_time_ DESC
-			LIMIT 6;
+		create_time_ DESC
+		LIMIT 6;
 	</select>
 
 	<select id="getTenantExamStatistics" resultType="com.keao.edu.user.dto.ExamStatisticsDto">