xiatian 6 年 前
コミット
0d4f24c7be

+ 14 - 14
examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/impl/ReportsComputeServiceImpl.java

@@ -13,19 +13,6 @@ import java.util.stream.Collectors;
 import javax.transaction.Transactional;
 
 import org.apache.commons.lang3.StringUtils;
-import org.examcloud.core.reports.api.ExamCourseDataReportCloudService;
-import org.examcloud.core.reports.api.ExamOrgReportCloudService;
-import org.examcloud.core.reports.api.ProjectCloudService;
-import org.examcloud.core.reports.api.bean.ExamCourseDataReportBean;
-import org.examcloud.core.reports.api.bean.ExamOrgReportBean;
-import org.examcloud.core.reports.api.bean.ProjectInfoBean;
-import org.examcloud.core.reports.api.request.DeleteExamCourseDataReportByProjectReq;
-import org.examcloud.core.reports.api.request.DeleteExamOrgReportByProjectReq;
-import org.examcloud.core.reports.api.request.GetProjectInfoBeanReq;
-import org.examcloud.core.reports.api.request.SaveExamCourseDataReportListReq;
-import org.examcloud.core.reports.api.request.SaveExamOrgReportListReq;
-import org.examcloud.core.reports.api.request.UpdateProjectStatusReq;
-import org.examcloud.core.reports.api.response.GetProjectInfoBeanResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +21,19 @@ import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamStudentDataBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamStudentScoreDataBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.GetExamStudentDataReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetExamStudentDataResp;
+import cn.com.qmth.examcloud.core.reports.api.ExamCourseDataReportCloudService;
+import cn.com.qmth.examcloud.core.reports.api.ExamOrgReportCloudService;
+import cn.com.qmth.examcloud.core.reports.api.ProjectCloudService;
+import cn.com.qmth.examcloud.core.reports.api.bean.ExamCourseDataReportBean;
+import cn.com.qmth.examcloud.core.reports.api.bean.ExamOrgReportBean;
+import cn.com.qmth.examcloud.core.reports.api.bean.ProjectInfoBean;
+import cn.com.qmth.examcloud.core.reports.api.request.DeleteExamCourseDataReportByProjectReq;
+import cn.com.qmth.examcloud.core.reports.api.request.DeleteExamOrgReportByProjectReq;
+import cn.com.qmth.examcloud.core.reports.api.request.GetProjectInfoBeanReq;
+import cn.com.qmth.examcloud.core.reports.api.request.SaveExamCourseDataReportListReq;
+import cn.com.qmth.examcloud.core.reports.api.request.SaveExamOrgReportListReq;
+import cn.com.qmth.examcloud.core.reports.api.request.UpdateProjectStatusReq;
+import cn.com.qmth.examcloud.core.reports.api.response.GetProjectInfoBeanResp;
 import cn.com.qmth.examcloud.task.dao.ReportsComputeRepo;
 import cn.com.qmth.examcloud.task.dao.entity.ReportsComputeEntity;
 import cn.com.qmth.examcloud.task.dao.enums.ReportsComputeStatus;
@@ -53,7 +53,7 @@ public class ReportsComputeServiceImpl implements ReportsComputeService {
 	@Autowired
 	private ProjectCloudService projectCloudService;
 
-//	@Autowired
+	@Autowired
 	private ExamStudentDataCloudService examStudentDataCloudService;
 	
 	@Autowired

+ 1 - 1
examcloud-task-starter/src/main/java/cn/com/qmth/examcloud/task/starter/TaskApp.java

@@ -23,7 +23,7 @@ import cn.com.qmth.examcloud.web.bootstrap.AppBootstrap;
 @EnableTransactionManagement
 @EnableEurekaClient
 @EnableDiscoveryClient
-@ComponentScan(basePackages = {"cn.com.qmth","org.examcloud"})
+@ComponentScan(basePackages = {"cn.com.qmth"})
 @EntityScan(basePackages = {"cn.com.qmth.examcloud.task.dao.entity"})
 @EnableJpaRepositories(basePackages = {"cn.com.qmth.examcloud.task.dao"})
 @EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})