提交 25964fd2 authored 作者: zhouzhigang's avatar zhouzhigang

--no commit message

上级 f2d308e2
...@@ -4,6 +4,7 @@ import com.zrqx.core.constant.member.MemberRequestPath; ...@@ -4,6 +4,7 @@ import com.zrqx.core.constant.member.MemberRequestPath;
import com.zrqx.core.constant.school.sysuser.SchoolRequestPath; 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.QueryAcademicLevelForm;
import com.zrqx.core.form.member.fg.basicteachingplan.QuerySemesterForm; 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.util.response.CallBack;
import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendDepartVo; import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendDepartVo;
import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendMajorVo; import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendMajorVo;
...@@ -29,8 +30,8 @@ public class FgPublicBasicRelationController { ...@@ -29,8 +30,8 @@ public class FgPublicBasicRelationController {
@ApiOperation(value = "课程列表",notes = "分页查询") @ApiOperation(value = "课程列表",notes = "分页查询")
@GetMapping(value = MemberRequestPath.PAGE) @GetMapping(value = MemberRequestPath.PAGE)
public CallBack<List<FgPublicBasicRelationVo>> page() throws Exception { public CallBack<List<FgPublicBasicRelationVo>> page(BiddingCycle biddingCycle) throws Exception {
return CallBack.success(fgPublicBasicRelationService.list()); return CallBack.success(fgPublicBasicRelationService.list(biddingCycle));
} }
@ApiOperation(value = "学级列表", notes = "去重之后的学级列表") @ApiOperation(value = "学级列表", notes = "去重之后的学级列表")
......
...@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.zrqx.core.constant.school.sysuser.SchoolRequestPath; 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.order.QueryOrderInfoForm;
import com.zrqx.core.form.school.sysuser.fg.studentorder.PayForm; 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.PageInfo;
import com.zrqx.core.util.page.PageParam; import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack; import com.zrqx.core.util.response.CallBack;
...@@ -35,7 +36,7 @@ public class StudentOrderInfoController { ...@@ -35,7 +36,7 @@ public class StudentOrderInfoController {
@ApiOperation( value = "订单详情", notes = "根据id查询") @ApiOperation( value = "订单详情", notes = "根据id查询")
@GetMapping(value = SchoolRequestPath.PAGE) @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)); return CallBack.success(studentOrderInfoService.getByOid(pageParam,orderId));
} }
......
package com.zrqx.school.sysuser.mapper.studentorder; package com.zrqx.school.sysuser.mapper.studentorder;
import java.util.List;
import org.apache.ibatis.annotations.Mapper; 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.mapper.BaseMapper;
import com.zrqx.core.model.school.studentorder.StudentOrderInfo; import com.zrqx.core.model.school.studentorder.StudentOrderInfo;
@Mapper @Mapper
public interface StudentOrderInfoMapper extends BaseMapper<StudentOrderInfo>{ 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);
} }
...@@ -3,6 +3,7 @@ package com.zrqx.school.sysuser.service.publiclesson; ...@@ -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.QueryAcademicLevelForm;
import com.zrqx.core.form.member.fg.basicteachingplan.QuerySemesterForm; import com.zrqx.core.form.member.fg.basicteachingplan.QuerySemesterForm;
import com.zrqx.core.model.member.publiclesson.PublicBasicRelation; 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.service.BaseService;
import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendDepartVo; import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendDepartVo;
import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendMajorVo; import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendMajorVo;
...@@ -54,7 +55,7 @@ public interface FgPublicBasicRelationService extends BaseService<PublicBasicRel ...@@ -54,7 +55,7 @@ public interface FgPublicBasicRelationService extends BaseService<PublicBasicRel
* @author zzg * @author zzg
* @date: 2019年7月12日 下午2:52:57 * @date: 2019年7月12日 下午2:52:57
*/ */
List<FgPublicBasicRelationVo> list() throws Exception; List<FgPublicBasicRelationVo> list(BiddingCycle biddingCycle) throws Exception;
/** /**
* 导入课程的时候绑定课程与教材的关系 * 导入课程的时候绑定课程与教材的关系
......
...@@ -106,14 +106,11 @@ public class FgPublicBasicRelationServiceImpl extends BaseServiceImpl<PublicBasi ...@@ -106,14 +106,11 @@ public class FgPublicBasicRelationServiceImpl extends BaseServiceImpl<PublicBasi
} }
@Override @Override
public List<FgPublicBasicRelationVo> list() throws Exception { public List<FgPublicBasicRelationVo> list(BiddingCycle biddingCycle) throws Exception {
QueryTypeAndRelationIdForm form = new QueryTypeAndRelationIdForm(); QueryTypeAndRelationIdForm form = new QueryTypeAndRelationIdForm();
form.setRelationId(redis.getMember().getRelationId()); form.setRelationId(redis.getMember().getRelationId());
form.setType(redis.getMember().getType()); form.setType(redis.getMember().getType());
//获取当前有效的征订周期 Date time = biddingCycle.getEndTime();
BiddingCycle biddingCycle = this.getBiddingCycle();
//从征订周期获取当前征订季的截止时间
Date time = fgBiddingCycleService.getMaxEndDate(MethodTypeEnum.CREATE);
//获取有效的培养层次下的所有教材 //获取有效的培养层次下的所有教材
List<FgPublicBasicRelationVo> voList = fgBasicTeachingPlanMapper.queryList(time,form); List<FgPublicBasicRelationVo> voList = fgBasicTeachingPlanMapper.queryList(time,form);
voList.forEach(vo ->{ voList.forEach(vo ->{
......
...@@ -26,7 +26,7 @@ public interface StudentOrderInfoService extends BaseService<StudentOrderInfo,In ...@@ -26,7 +26,7 @@ public interface StudentOrderInfoService extends BaseService<StudentOrderInfo,In
* @auther zzg * @auther zzg
* @data 2019年9月5日 上午9:14:50 * @data 2019年9月5日 上午9:14:50
*/ */
PageInfo<StudentOrderInfoVo> getByOid(PageParam pageParam,Integer orderId); PageInfo<StudentOrderInfo> getByOid(PageParam pageParam,Integer orderId);
......
...@@ -87,13 +87,13 @@ public class StudentOrderInfoServiceImpl extends BaseModelServiceImpl<StudentOrd ...@@ -87,13 +87,13 @@ public class StudentOrderInfoServiceImpl extends BaseModelServiceImpl<StudentOrd
} }
@Override @Override
public PageInfo<StudentOrderInfoVo> getByOid(PageParam pageParam, Integer orderId) { public PageInfo<StudentOrderInfo> getByOid(PageParam pageParam, Integer orderId) {
if(StringUtils.isEmpty(pageParam.getOrderBy())){ if(StringUtils.isEmpty(pageParam.getOrderBy())){
pageParam.setOrderBy(" createTime desc "); pageParam.setOrderBy(" createTime desc ");
} }
startPage(pageParam); startPage(pageParam);
List<StudentOrderInfo> list = studentOrderInfoMapper.list(orderId);
return null; return new PageInfo<StudentOrderInfo>(list);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论