Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jgjy
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
jgjy
Commits
25964fd2
提交
25964fd2
authored
9月 09, 2019
作者:
zhouzhigang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
f2d308e2
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
24 行增加
和
13 行删除
+24
-13
FgPublicBasicRelationController.java
...troller/publiclesson/FgPublicBasicRelationController.java
+3
-2
StudentOrderInfoController.java
...r/controller/studentorder/StudentOrderInfoController.java
+2
-1
StudentOrderInfoMapper.java
...l/sysuser/mapper/studentorder/StudentOrderInfoMapper.java
+11
-0
FgPublicBasicRelationService.java
...er/service/publiclesson/FgPublicBasicRelationService.java
+2
-1
FgPublicBasicRelationServiceImpl.java
...ervice/publiclesson/FgPublicBasicRelationServiceImpl.java
+2
-5
StudentOrderInfoService.java
...sysuser/service/studentorder/StudentOrderInfoService.java
+1
-1
StudentOrderInfoServiceImpl.java
...ser/service/studentorder/StudentOrderInfoServiceImpl.java
+3
-3
没有找到文件。
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/publiclesson/FgPublicBasicRelationController.java
浏览文件 @
25964fd2
...
...
@@ -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
浏览文件 @
25964fd2
...
...
@@ -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
<
StudentOrderInfo
Vo
>>
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
浏览文件 @
25964fd2
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
浏览文件 @
25964fd2
...
...
@@ -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
浏览文件 @
25964fd2
...
...
@@ -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
浏览文件 @
25964fd2
...
...
@@ -26,7 +26,7 @@ public interface StudentOrderInfoService extends BaseService<StudentOrderInfo,In
* @auther zzg
* @data 2019年9月5日 上午9:14:50
*/
PageInfo
<
StudentOrderInfo
Vo
>
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
浏览文件 @
25964fd2
...
...
@@ -87,13 +87,13 @@ public class StudentOrderInfoServiceImpl extends BaseModelServiceImpl<StudentOrd
}
@Override
public
PageInfo
<
StudentOrderInfo
Vo
>
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
n
ull
;
List
<
StudentOrderInfo
>
list
=
studentOrderInfoMapper
.
list
(
orderId
);
return
n
ew
PageInfo
<
StudentOrderInfo
>(
list
)
;
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论