|
|
@@ -11,9 +11,7 @@ import com.ym.mec.biz.dal.enums.*;
|
|
|
import com.ym.mec.biz.dal.page.IndexDataQueryInfo;
|
|
|
import com.ym.mec.biz.dal.page.OrganCloudStudyStudentDataQueryInfo;
|
|
|
import com.ym.mec.biz.dal.page.OrganizationQueryInfo;
|
|
|
-import com.ym.mec.biz.service.EmployeeService;
|
|
|
-import com.ym.mec.biz.service.StudentExtracurricularExercisesSituationService;
|
|
|
-import com.ym.mec.biz.service.SysConfigService;
|
|
|
+import com.ym.mec.biz.service.*;
|
|
|
import com.ym.mec.common.constant.CommonConstants;
|
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
@@ -23,7 +21,6 @@ import com.ym.mec.util.collection.MapUtil;
|
|
|
import com.ym.mec.util.date.DateUtil;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import com.ym.mec.biz.service.IndexBaseMonthDataService;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@@ -102,7 +99,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
|
|
|
Set<Integer> organIds = null;
|
|
|
if(StringUtils.isNotBlank(queryInfo.getOrganId())){
|
|
|
- organIds = Arrays.stream(queryInfo.getOrganId().split(",")).map(Integer::new).collect(Collectors.toSet());
|
|
|
+ organIds = Arrays.stream(queryInfo.getOrganId().split(",")).filter(id -> !OrganizationService.EXCLUDE_ORGAN_IDS.contains(id)).map(Integer::new).collect(Collectors.toSet());
|
|
|
}
|
|
|
Set<String> dataTypes = new HashSet<>();
|
|
|
if(StringUtils.isNotBlank(queryInfo.getDataTypes())){
|
Joburgess