--no commit message

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/publiclesson/FgPublicBasicRelationController.java

@@ -4,6 +4,7 @@ import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.constant.school.sysuser.SchoolRequestPath;
 import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.member.fg.basicteachingplan.QuerySemesterForm;
+import com.zrqx.core.model.school.biddingcycle.BiddingCycle;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendDepartVo;
 import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendMajorVo;
@@ -29,8 +30,8 @@ public class FgPublicBasicRelationController {
 
 	@ApiOperation(value = "课程列表",notes = "分页查询")
 	@GetMapping(value = MemberRequestPath.PAGE)
-	public CallBack<List<FgPublicBasicRelationVo>> page() throws Exception {
-		return CallBack.success(fgPublicBasicRelationService.list());
+	public CallBack<List<FgPublicBasicRelationVo>> page(BiddingCycle biddingCycle) throws Exception {
+		return CallBack.success(fgPublicBasicRelationService.list(biddingCycle));
 	}
 	
 	@ApiOperation(value = "学级列表", notes = "去重之后的学级列表")

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/studentorder/StudentOrderInfoController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.zrqx.core.constant.school.sysuser.SchoolRequestPath;
 import com.zrqx.core.form.school.sysuser.fg.order.QueryOrderInfoForm;
 import com.zrqx.core.form.school.sysuser.fg.studentorder.PayForm;
+import com.zrqx.core.model.school.studentorder.StudentOrderInfo;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
@@ -35,7 +36,7 @@ public class StudentOrderInfoController {
 	
 	@ApiOperation( value = "订单详情", notes = "根据id查询")
 	@GetMapping(value = SchoolRequestPath.PAGE)
-	public CallBack<PageInfo<StudentOrderInfoVo>> getByOid(PageParam pageParam,Integer orderId){
+	public CallBack<PageInfo<StudentOrderInfo>> getByOid(PageParam pageParam,Integer orderId){
 		return CallBack.success(studentOrderInfoService.getByOid(pageParam,orderId));
 	}
 	

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/studentorder/StudentOrderInfoMapper.java

 package com.zrqx.school.sysuser.mapper.studentorder;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.school.studentorder.StudentOrderInfo;
 @Mapper
 public interface StudentOrderInfoMapper extends BaseMapper<StudentOrderInfo>{
+	
+	@Select("<script>"
+			+ " SELECT * from school_student_order_info s LEFT JOIN school_student_order o on s.orderId = o.id "
+			+ " where 1=1 "
+			+ " eq(s.orderId,orderId) "
+			+ "</script>")
+	List<StudentOrderInfo> list(@Param("orderId")Integer orderId);
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/publiclesson/FgPublicBasicRelationService.java

@@ -3,6 +3,7 @@ package com.zrqx.school.sysuser.service.publiclesson;
 import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.member.fg.basicteachingplan.QuerySemesterForm;
 import com.zrqx.core.model.member.publiclesson.PublicBasicRelation;
+import com.zrqx.core.model.school.biddingcycle.BiddingCycle;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendDepartVo;
 import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendMajorVo;
@@ -54,7 +55,7 @@ public interface FgPublicBasicRelationService extends BaseService<PublicBasicRel
 	 * @author zzg
 	 * @date: 2019年7月12日 下午2:52:57
 	 */
-	List<FgPublicBasicRelationVo> list() throws Exception;
+	List<FgPublicBasicRelationVo> list(BiddingCycle biddingCycle) throws Exception;
 	
 	 /**
 	  * 导入课程的时候绑定课程与教材的关系

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/publiclesson/FgPublicBasicRelationServiceImpl.java

@@ -106,14 +106,11 @@ public class FgPublicBasicRelationServiceImpl extends BaseServiceImpl<PublicBasi
 	}
 
 	@Override
-	public List<FgPublicBasicRelationVo> list() throws Exception {
+	public List<FgPublicBasicRelationVo> list(BiddingCycle biddingCycle) throws Exception {
 		QueryTypeAndRelationIdForm form = new QueryTypeAndRelationIdForm();
 		form.setRelationId(redis.getMember().getRelationId());
 		form.setType(redis.getMember().getType());
-		//获取当前有效的征订周期
-		BiddingCycle biddingCycle = this.getBiddingCycle();
-		//从征订周期获取当前征订季的截止时间
-		Date time = fgBiddingCycleService.getMaxEndDate(MethodTypeEnum.CREATE);
+		Date time = biddingCycle.getEndTime();
 		//获取有效的培养层次下的所有教材
 		List<FgPublicBasicRelationVo> voList = fgBasicTeachingPlanMapper.queryList(time,form);
 		voList.forEach(vo ->{

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/studentorder/StudentOrderInfoService.java

@@ -26,7 +26,7 @@ public interface StudentOrderInfoService extends BaseService<StudentOrderInfo,In
 	 * @auther zzg
 	 * @data 2019年9月5日 上午9:14:50
 	 */
-	PageInfo<StudentOrderInfoVo> getByOid(PageParam pageParam,Integer orderId);
+	PageInfo<StudentOrderInfo> getByOid(PageParam pageParam,Integer orderId);
 	
 	
 

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/studentorder/StudentOrderInfoServiceImpl.java

@@ -87,13 +87,13 @@ public class StudentOrderInfoServiceImpl extends BaseModelServiceImpl<StudentOrd
 	}
 
 	@Override
-	public PageInfo<StudentOrderInfoVo> getByOid(PageParam pageParam, Integer orderId) {
+	public PageInfo<StudentOrderInfo> getByOid(PageParam pageParam, Integer orderId) {
 		if(StringUtils.isEmpty(pageParam.getOrderBy())){
 			pageParam.setOrderBy(" createTime desc ");
 		}
 		startPage(pageParam);
-		
-		return null;
+		List<StudentOrderInfo> list = studentOrderInfoMapper.list(orderId);
+		return new PageInfo<StudentOrderInfo>(list);
 	}