修复计划任务的所有问题

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPreVisitDao.java

@@ -15,7 +15,7 @@ public interface StudentPreVisitDao extends BaseDAO<Integer, StudentPreVisit> {
 	 * @param studentPreVisits
 	 * @return
 	 */
-	Integer batchInsert(List<StudentPreVisit> studentPreVisits);
+	Integer batchInsert(@Param("studentPreVisits")List<StudentPreVisit> studentPreVisits);
 
 	/**
 	 *

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

@@ -20,7 +20,7 @@ public class StudentPreVisit {
 	private String studentName;
 	
 	/** 老师id */
-	private Integer teacherId;
+	private String teacherId;
 	
 	/** 老师姓名 */
 	private String teacherName;
@@ -72,11 +72,11 @@ public class StudentPreVisit {
 		return this.studentName;
 	}
 			
-	public void setTeacherId(Integer teacherId){
+	public void setTeacherId(String teacherId){
 		this.teacherId = teacherId;
 	}
 	
-	public Integer getTeacherId(){
+	public String getTeacherId(){
 		return this.teacherId;
 	}
 			

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

@@ -31,20 +31,21 @@ public class StudentPreVisitServiceImpl extends BaseServiceImpl<Integer, Student
 
 	@Override
 	public Integer batchInsert(List<Student4operating> student4operatings) {
-		StudentPreVisit studentPreVisit = new StudentPreVisit();
 		List<StudentPreVisit> studentPreVisits = new ArrayList<>();
 		for (Student4operating student4operating : student4operatings) {
+			StudentPreVisit studentPreVisit = new StudentPreVisit();
 			studentPreVisit.setStudentId(student4operating.getStudentId());
 			studentPreVisit.setOrganId(Integer.parseInt(student4operating.getOrganId()));
 			studentPreVisit.setStudentName(student4operating.getStudentName());
 			studentPreVisit.setPhone(student4operating.getPhone());
-			studentPreVisit.setTeacherId(Integer.parseInt(student4operating.getTeacherId()));
+			studentPreVisit.setTeacherId(student4operating.getTeacherId());
 			studentPreVisit.setTeacherName(student4operating.getTeacherName());
 			studentPreVisit.setOrgname(student4operating.getOrganName());
 			studentPreVisit.setVisitCycle(DateUtil.format(new Date(),"yyyy-MM"));
 			studentPreVisit.setIsVisit(0);
 			studentPreVisits.add(studentPreVisit);
 		}
+
 	return studentPreVisitDao.batchInsert(studentPreVisits);
 	}
 

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

@@ -39,9 +39,9 @@
 		-->
 		INSERT INTO student_pre_visit (id_,organ_id_,student_id_,student_name,teacher_id_,teacher_name,phone,orgName,tenant_id_,is_visit,visit_cycle) VALUES(#{id},#{organId},#{studentId},#{studentName},#{teacherId},#{teacherName},#{phone},#{orgname},#{tenantId},#{isVisit},#{visitCycle})
 	</insert>
-	<insert id="batchInsert" parameterType="java.util.ArrayList">
+	<insert id="batchInsert" parameterType="java.util.List">
 		INSERT INTO student_pre_visit (id_,organ_id_,student_id_,student_name,teacher_id_,teacher_name,phone,orgName,tenant_id_,is_visit,visit_cycle) VALUES
-		<foreach collection="list" item="item" index="index" separator=",">
+		<foreach collection="studentPreVisits" item="item" index="index" separator=",">
 			(#{item.id},#{item.organId},#{item.studentId},#{item.studentName},#{item.teacherId},#{item.teacherName},#{item.phone},#{item.orgname},#{item.tenantId},#{item.isVisit},#{item.visitCycle})
 		</foreach>
 	</insert>
@@ -49,13 +49,9 @@
 			UPDATE student_pre_visit set is_visit = 1 where visit_cycle =#{visitCycle} and student_id_ = #{studentId}
 	</update>
 
-	<select id="getPageList">
+	<select id="getPageList" resultMap="StudentPreVisit">
 		SELECT sv.* FROM
         student_pre_visit sv
-        LEFT JOIN sys_user t ON sv.teacher_id_ = t.id_
-        LEFT JOIN organization o ON sv.organ_id_ = o.id_
-        LEFT JOIN sys_user s ON s.id_ = sv.student_id_
-        LEFT JOIN music_group mg ON sv.music_group_id_ = mg.id_
 		<include refid="queryPageSql"/>
 	</select>
 

mec-task/src/main/java/com/ym/mec/task/jobs/findAllWaitVisitTask.java → mec-task/src/main/java/com/ym/mec/task/jobs/FindAllWaitVisitTask.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class findAllWaitVisitTask extends BaseTask {
+public class FindAllWaitVisitTask extends BaseTask {
     @Autowired
     private TaskRemoteService taskRemoteService;
     @Override

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

@@ -10,9 +10,11 @@ import com.ym.mec.biz.dal.entity.OperatingReport;
 import com.ym.mec.biz.dal.entity.OperatingReportCloud;
 import com.ym.mec.biz.dal.entity.TenantInfo;
 import com.ym.mec.biz.dal.enums.IndexDataType;
+import com.ym.mec.biz.dal.page.StudentOperatingQueryInfo;
 import com.ym.mec.biz.event.source.CourseEventSource;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.redis.service.RedisCache;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.im.ImFeignService;
@@ -125,7 +127,7 @@ public class TaskController extends BaseController {
 	@Autowired
 	private StudentPreVisitService studentPreVisitService;
     @Autowired
-	private StudentDao studentDao;
+	private StudentManageService studentManageService;
     @Autowired
     private OperatingReportNewService operatingReportNewService;
 
@@ -620,10 +622,22 @@ public class TaskController extends BaseController {
 	@ApiOperation("每月1日0点-根据service_tag_查询所有数据，并添加待回访表中")
 	@GetMapping(value = "/findAllWaitVisit")
 	public void findAllWaitVisit(){
-		Integer tenantId = TenantContextHolder.getTenantId();
-		//查出所有在运营的学员
-		List<Student4operating> operatingStudents = studentDao.getOperatingStudents(new HashMap<>());
-		studentPreVisitService.batchInsert(operatingStudents);
+		List<TenantInfo> tenantInfos = tenantInfoService.list(new QueryWrapper<TenantInfo>().eq("state_",1));
+		List<Student4operating> student4operatingList = new ArrayList<>();
+		List<Integer> tenantIds = new ArrayList<>();
+		for (TenantInfo tenantInfo : tenantInfos) {
+			Integer id = tenantInfo.getId();
+			StudentOperatingQueryInfo queryInfo =new StudentOperatingQueryInfo();
+			queryInfo.setOperatingTag(1);
+			queryInfo.setTenantId(id);
+			PageInfo<Student4operating> operatingStudents = studentManageService.getOperatingStudents(queryInfo);
+			List<Student4operating> list = operatingStudents.getRows();
+			student4operatingList.addAll(list);
+		}
+
+		if(student4operatingList !=null && student4operatingList.size()>0) {
+			studentPreVisitService.batchInsert(student4operatingList);
+		}
 	}
 
 }