Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jgjy
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
jgjy
Commits
faa45618
提交
faa45618
authored
9月 03, 2019
作者:
malei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(school-sysUser): BookRecommend
1.两步骤提交 2.两步骤确认教材 References:N/A
上级
e5dff0e6
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
69 行增加
和
29 行删除
+69
-29
ConfirmForm.java
...om/zrqx/core/form/school/sysuser/fg/book/ConfirmForm.java
+1
-1
LastSubmitForm.java
...zrqx/core/form/school/sysuser/fg/book/LastSubmitForm.java
+7
-0
ApprovalStatus.java
.../java/com/zrqx/core/model/school/book/ApprovalStatus.java
+0
-8
BookRecommendUserRelation.java
...rqx/core/model/school/book/BookRecommendUserRelation.java
+8
-1
MidListVO.java
...ava/com/zrqx/core/vo/schoolsysuser/fg/book/MidListVO.java
+7
-0
BookRecommendController.java
...hool/sysuser/controller/book/BookRecommendController.java
+8
-8
BookRecommendMapper.java
.../zrqx/school/sysuser/mapper/book/BookRecommendMapper.java
+5
-3
BiddingFlowServiceImpl.java
...l/sysuser/service/biddingflow/BiddingFlowServiceImpl.java
+9
-1
BookRecommendService.java
...rqx/school/sysuser/service/book/BookRecommendService.java
+4
-4
BookRecommendServiceImpl.java
...school/sysuser/service/book/BookRecommendServiceImpl.java
+20
-3
没有找到文件。
com.zrqx.core/src/main/java/com/zrqx/core/form/school/sysuser/fg/book/Confirm
AndOverrule
Form.java
→
com.zrqx.core/src/main/java/com/zrqx/core/form/school/sysuser/fg/book/ConfirmForm.java
浏览文件 @
faa45618
...
...
@@ -6,7 +6,7 @@ import lombok.Data;
@Data
@ApiModel
(
value
=
"ConfirmAndOverruleForm"
,
description
=
"两个环节(推荐-终审),终审确认一本教材并退回多余教材"
)
public
class
Confirm
AndOverrule
Form
{
public
class
ConfirmForm
{
@ApiModelProperty
(
"推荐ID"
)
private
Integer
id
;
...
...
com.zrqx.core/src/main/java/com/zrqx/core/form/school/sysuser/fg/book/LastSubmitForm.java
浏览文件 @
faa45618
...
...
@@ -29,4 +29,11 @@ public class LastSubmitForm {
@ApiModelProperty
(
"终审状态;已提交,未提交"
)
private
String
status
;
/**
* 两个步骤时,终审能看到多本教材,确认一本提交分单
* {@link com.zrqx.core.enums.school.sysuser.ApprovalStatusEnum}
*/
@ApiModelProperty
(
"状态;0:未确认 ,1:已确认;两个步骤时需要确认一本教材,非两个步骤时此状态未空"
)
private
String
confirmStatus
;
}
com.zrqx.core/src/main/java/com/zrqx/core/model/school/book/ApprovalStatus.java
浏览文件 @
faa45618
...
...
@@ -46,18 +46,10 @@ public class ApprovalStatus extends BaseModel {
private
Integer
bookUserRelationId
;
/**
* 两个步骤时,终审能看到多本教材,确认一本提交分单
* {@link com.zrqx.core.enums.school.sysuser.ApprovalStatusEnum}
*/
@ApiModelProperty
(
"状态;0:待确认 ,1:已确认"
)
private
String
confirmStatus
;
/**
* 课程状态,列表以课程为单位展示
* {@link BookRecommendStatusEnum}
*/
// @ApiModelProperty("状态;0:已提交, 1:未提交, 2:已退回")
// private String lessonStatus;
}
com.zrqx.core/src/main/java/com/zrqx/core/model/school/book/BookRecommendUserRelation.java
浏览文件 @
faa45618
...
...
@@ -40,7 +40,14 @@ public class BookRecommendUserRelation extends BaseModel {
@ApiModelProperty
(
"教参ID"
)
private
String
guideId
;
@ApiModelProperty
(
"
教材
状态;0:待确认, 1:已确认"
)
@ApiModelProperty
(
"
审批
状态;0:待确认, 1:已确认"
)
private
String
status
;
/**
* 两个步骤时,终审能看到多本教材,确认一本提交分单
* {@link com.zrqx.core.enums.school.sysuser.ApprovalStatusEnum}
*/
@ApiModelProperty
(
"状态;0:未确认 ,1:已确认;两个步骤时需要确认一本教材,非两个步骤时此状态未空"
)
private
String
confirmStatus
;
}
com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/book/MidListVO.java
浏览文件 @
faa45618
...
...
@@ -97,6 +97,13 @@ public class MidListVO {
@ApiModelProperty
(
"教参"
)
private
FgAidPhyResourceInfoVo
guide
;
/**
* 两个步骤时,终审能看到多本教材,确认一本提交分单
* {@link com.zrqx.core.enums.school.sysuser.ApprovalStatusEnum}
*/
@ApiModelProperty
(
"状态;0:未确认, 1:已确认;两个步骤时需要确认一本教材,非两个步骤时此状态未空"
)
private
String
confirmStatus
;
}
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/book/BookRecommendController.java
浏览文件 @
faa45618
...
...
@@ -83,10 +83,10 @@ public class BookRecommendController {
return
CallBack
.
success
(
bookService
.
findReferrerList
(
form
));
}
@ApiOperation
(
value
=
"终极审核批量提交
"
,
notes
=
"终极审核批量提交
"
)
@ApiOperation
(
value
=
"终极审核批量提交
;征订步骤两个步骤时type传入1"
,
notes
=
"终极审核批量提交;征订步骤两个步骤时type传入1
"
)
@GetMapping
(
value
=
SchoolRequestPath
.
LAST
+
SchoolRequestPath
.
SUBMIT
)
public
CallBack
<
Boolean
>
lastSubmitToSplitOrder
()
{
return
bookService
.
submitToSplitOrder
()
?
CallBack
.
success
()
:
CallBack
.
fail
();
public
CallBack
<
Boolean
>
lastSubmitToSplitOrder
(
String
type
)
{
return
bookService
.
submitToSplitOrder
(
type
)
?
CallBack
.
success
()
:
CallBack
.
fail
();
}
@ApiOperation
(
value
=
"选择-覆盖"
,
notes
=
"选择-覆盖"
)
...
...
@@ -102,12 +102,12 @@ public class BookRecommendController {
}
@ApiOperation
(
value
=
"两个步骤(初审-终审)终审环节
:确认并退回多余
教材"
,
notes
=
"两个步骤(初审-终审)终审环节
:确认并退回多余
教材"
value
=
"两个步骤(初审-终审)终审环节
确认
教材"
,
notes
=
"两个步骤(初审-终审)终审环节
确认
教材"
)
@PostMapping
(
value
=
SchoolRequestPath
.
CONFIRM
)
public
CallBack
<
Boolean
>
confirmAndOverrule
(
ConfirmAndOverruleForm
form
){
//TODO
return
CallBack
.
success
();
public
CallBack
<
Boolean
>
confirm
(
@RequestBody
ConfirmForm
form
){
return
bookService
.
confirm
(
form
)
?
CallBack
.
success
()
:
CallBack
.
fail
();
}
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/book/BookRecommendMapper.java
浏览文件 @
faa45618
...
...
@@ -197,6 +197,7 @@ public interface BookRecommendMapper extends BaseMapper<BookRecommend> {
+
" r.isGuide as isGuide, "
+
" r.guideId as guideId, "
+
" r.exerciseId as exerciseId, "
+
" r.confirmStatus as confirmStatus, "
+
" a.reason as reason "
+
" FROM me_book_recommend b "
//关联用户推荐关系表,过滤非当前用户推荐的记录
...
...
@@ -248,9 +249,10 @@ public interface BookRecommendMapper extends BaseMapper<BookRecommend> {
// + " eq(mbr.type, query.type) "
// + " eq(mbur.bookId, query.bookId) "
+
" eq(mbr.relationId, query.relationId) "
+
" eq(mbr.type, query.type) "
//确认为终审环节
+
" eq(mas.code, query.code) "
//确认为未提交记录
+
" eq(mas.status, query.status) "
+
" eq(mbr.type, query.type) "
+
" eq(mas.code, query.code) "
//确认为终审环节
+
" eq(mas.status, query.status) "
//确认为未提交记录
+
" eq(mbur.confirmStatus, query.confirmStatus) "
//两个步骤时查询已确认的教材
+
" ORDER BY "
+
" mbur.createTime desc "
+
" </script> "
)
...
...
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/biddingflow/BiddingFlowServiceImpl.java
浏览文件 @
faa45618
...
...
@@ -25,6 +25,7 @@ import com.zrqx.school.sysuser.client.FgMemberClient;
import
com.zrqx.school.sysuser.manage.biddingcycle.BiddingCycleManage
;
import
com.zrqx.school.sysuser.mapper.biddingflow.BiddingFlowMapper
;
import
com.zrqx.school.sysuser.mapper.biddingflow.FlowMemberRelationMapper
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -36,6 +37,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.stream.Collectors
;
@Slf4j
@Service
public
class
BiddingFlowServiceImpl
extends
BaseModelServiceImpl
<
BiddingFlow
,
Integer
>
implements
BiddingFlowService
{
...
...
@@ -677,6 +679,12 @@ public class BiddingFlowServiceImpl extends BaseModelServiceImpl<BiddingFlow, In
query
.
setRelationId
(
redis
.
getMember
().
getRelationId
());
query
.
setType
(
redis
.
getMember
().
getType
());
return
biddingFlowMapper
.
getTreeDepth
(
query
);
Integer
depth
=
biddingFlowMapper
.
getTreeDepth
(
query
);
if
(
depth
==
null
)
{
log
.
info
(
"征订流程深度查询为空"
);
throw
new
BaseException
(
"征订流程不存在"
);
}
return
depth
;
}
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/book/BookRecommendService.java
浏览文件 @
faa45618
...
...
@@ -116,7 +116,7 @@ public interface BookRecommendService extends BaseService<BookRecommend, Integer
*@author: ml
*@date: 2019/8/12 11:49
*/
Boolean
submitToSplitOrder
();
Boolean
submitToSplitOrder
(
String
type
);
/**
* 选择一本教材并覆盖当前推荐教材
...
...
@@ -128,12 +128,12 @@ public interface BookRecommendService extends BaseService<BookRecommend, Integer
Boolean
choseCover
(
RecommendForm
form
);
/**
*
初审推荐
*
两个步骤时确认一本教材
*@param form
*@return
*@author: ml
*@date: 2019/9/2 1
4:19
*@date: 2019/9/2 1
7:00
*/
Boolean
PrimaryRecommend
(
Recommend
Form
form
);
Boolean
confirm
(
Confirm
Form
form
);
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/book/BookRecommendServiceImpl.java
浏览文件 @
faa45618
...
...
@@ -555,7 +555,7 @@ public class BookRecommendServiceImpl extends BaseModelServiceImpl<BookRecommend
@Override
@Transactional
public
Boolean
submitToSplitOrder
()
{
public
Boolean
submitToSplitOrder
(
String
type
)
{
//构造查询条件
LastSubmitForm
form
=
new
LastSubmitForm
();
...
...
@@ -565,6 +565,12 @@ public class BookRecommendServiceImpl extends BaseModelServiceImpl<BookRecommend
form
.
setCode
(
this
.
getFlowCodeByMemberId
(
member
.
getId
()));
form
.
setStatus
(
BookRecommendStatusEnum
.
UNSUBMITTED
.
getCode
());
//验证征订流程是否为两个步骤,后台验证+前台传值验证
Integer
depth
=
flowService
.
getTreeDepth
();
if
(
BooleanStatusEnum
.
YES
.
getCode
().
equals
(
type
)
&&
new
Integer
(
2
).
equals
(
depth
))
{
form
.
setConfirmStatus
(
ApprovalStatusEnum
.
IDENTIFIED
.
getCode
());
}
//该学校当前征订这门课程审核通过的推荐记录的ID
List
<
RecommendDetailsVo
>
detailsVoList
=
bookMapper
.
findResIds
(
form
);
if
(
detailsVoList
==
null
||
detailsVoList
.
size
()
==
0
){
...
...
@@ -794,7 +800,18 @@ public class BookRecommendServiceImpl extends BaseModelServiceImpl<BookRecommend
}
@Override
public
Boolean
PrimaryRecommend
(
RecommendForm
form
)
{
return
null
;
public
Boolean
confirm
(
ConfirmForm
form
)
{
//根据lessonId和bookId获取终审确认使用的教材
List
<
BookRecommendUserRelation
>
relations
=
relationManage
.
queryByLessonIdOrBookId
(
form
.
getLessonId
(),
form
.
getBookId
());
//将确认状态修改为确定状态
relations
.
forEach
(
relation
->
{
relation
.
setConfirmStatus
(
ApprovalStatusEnum
.
IDENTIFIED
.
getCode
());
relationManage
.
update
(
relation
);
});
return
true
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论