Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
zynrgl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
zynrgl
Commits
4eebb667
提交
4eebb667
authored
3月 31, 2020
作者:
malei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(newbook): 选题管理
1. 审核记录列表 References: N/A
上级
64e7c951
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
161 行增加
和
21 行删除
+161
-21
NBErrorEnum.java
...rc/main/java/com/zrqx/core/enums/newbook/NBErrorEnum.java
+2
-1
BatchAuditForm.java
...va/com/zrqx/core/form/newbook/subject/BatchAuditForm.java
+13
-3
SubjectAudit.java
...ava/com/zrqx/core/model/newbook/subject/SubjectAudit.java
+1
-7
BatchAuditSubjectVo.java
...com/zrqx/core/vo/newbook/subject/BatchAuditSubjectVo.java
+15
-0
SelectedSubjectVo.java
...a/com/zrqx/core/vo/newbook/subject/SelectedSubjectVo.java
+0
-3
SubjectAuditVo.java
...java/com/zrqx/core/vo/newbook/subject/SubjectAuditVo.java
+5
-1
SubjectController.java
...zrqx/newbook/bg/controller/subject/SubjectController.java
+17
-3
SelectedSubjectService.java
...qx/newbook/bg/service/subject/SelectedSubjectService.java
+8
-0
SelectedSubjectServiceImpl.java
...ewbook/bg/service/subject/SelectedSubjectServiceImpl.java
+39
-0
SubjectAuditService.java
.../zrqx/newbook/bg/service/subject/SubjectAuditService.java
+11
-0
SubjectAuditServiceImpl.java
...x/newbook/bg/service/subject/SubjectAuditServiceImpl.java
+50
-0
UserController.java
...a/com/zrqx/sysuser/bg/controller/user/UserController.java
+0
-3
没有找到文件。
com.zrqx.core/src/main/java/com/zrqx/core/enums/newbook/NBErrorEnum.java
浏览文件 @
4eebb667
...
...
@@ -8,7 +8,8 @@ public enum NBErrorEnum {
SAVE_SERIES_FAILED
(
5000
,
"保存丛书失败"
),
SAVE_SUBJECT_FAILED
(
5001
,
"保存选题失败"
),
GENERATE_SUBJECT_NUM_FAILED
(
5002
,
"选题号生成失败"
),
ENTITY_NOT_EXIST
(
5003
,
"资源不存在"
);
ENTITY_NOT_EXIST
(
5003
,
"资源不存在"
),
GET_USER_INFO_FAILED
(
5004
,
"获取用户信息失败"
);
private
int
errNum
;
private
String
errMsg
;
...
...
com.zrqx.core/src/main/java/com/zrqx/core/form/newbook/subject/BatchAuditForm.java
浏览文件 @
4eebb667
package
com
.
zrqx
.
core
.
form
.
newbook
.
subject
;
import
com.zrqx.core.vo.newbook.subject.BatchAuditSubjectVo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
...
...
@@ -10,10 +11,19 @@ import java.util.List;
@ApiModel
(
description
=
"批量审批"
)
public
class
BatchAuditForm
{
@ApiModelProperty
(
"选题
ID
"
)
private
List
<
Integer
>
id
s
;
@ApiModelProperty
(
"选题
;勾选的数据
"
)
private
List
<
BatchAuditSubjectVo
>
subject
s
;
@ApiModelProperty
(
"选题状态,"
)
@ApiModelProperty
(
"当前审核阶段 1-2-1 1-2-2 1-2-3"
)
private
String
stage
;
@ApiModelProperty
(
"0:审核未通过, 1:审核通过"
)
private
String
status
;
@ApiModelProperty
(
"下一阶段,审核未通过:1-4,室主任审核通过:1-2-2;选题委员会通过:1-2-3;社领导通过:1-3"
)
private
String
nextStage
;
@ApiModelProperty
(
"审核意见"
)
private
String
auditOpinion
;
}
com.zrqx.core/src/main/java/com/zrqx/core/model/newbook/subject/SubjectAudit.java
浏览文件 @
4eebb667
...
...
@@ -25,7 +25,7 @@ public class SubjectAudit {
* 用户ID
*/
@ApiModelProperty
(
value
=
"用户ID"
)
private
Integer
userId
;
private
String
userId
;
/**
* 状态:0:审核未通过,1:审核通过
...
...
@@ -52,12 +52,6 @@ public class SubjectAudit {
private
String
stage
;
/**
* 选题ID,冗余字段,可以使用选题号作为关联,选题号唯一不可变
*/
@ApiModelProperty
(
value
=
"选题ID"
)
private
Integer
ssId
;
/**
* 选新书题ID
*/
@ApiModelProperty
(
value
=
"新书ID"
)
...
...
com.zrqx.core/src/main/java/com/zrqx/core/vo/newbook/subject/BatchAuditSubjectVo.java
0 → 100644
浏览文件 @
4eebb667
package
com
.
zrqx
.
core
.
vo
.
newbook
.
subject
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
public
class
BatchAuditSubjectVo
{
@ApiModelProperty
(
"选题ID"
)
private
Integer
id
;
@ApiModelProperty
(
"选题号"
)
private
String
subjectNum
;
}
com.zrqx.core/src/main/java/com/zrqx/core/vo/newbook/subject/SelectedSubjectVo.java
浏览文件 @
4eebb667
...
...
@@ -6,7 +6,6 @@ import lombok.Data;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.List
;
@Data
@ApiModel
(
value
=
"选题详情"
,
description
=
"选题详情"
)
...
...
@@ -114,6 +113,4 @@ public class SelectedSubjectVo {
@ApiModelProperty
(
"状态:录入中:1-1 待室主任审核:1-2-1 待选题委员会审核:1-2-2 待社长审核:1-2-3 审核通过:1-3 审核未通过:1-4 三审驳回:1-5"
)
private
String
status
;
@ApiModelProperty
(
"审核意见"
)
private
List
<
SubjectAuditVo
>
audits
;
}
com.zrqx.core/src/main/java/com/zrqx/core/vo/newbook/subject/SubjectAuditVo.java
浏览文件 @
4eebb667
package
com
.
zrqx
.
core
.
vo
.
newbook
.
subject
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.Date
;
@Data
public
class
SubjectAuditVo
{
@ApiModelProperty
(
value
=
"ID"
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"用户ID"
)
private
Integer
userId
;
private
String
userId
;
private
String
userName
;
@ApiModelProperty
(
value
=
"状态:0:审核未通过,1:审核通过"
)
private
String
status
;
...
...
com.zrqx.newbook/src/main/java/com/zrqx/newbook/bg/controller/subject/SubjectController.java
浏览文件 @
4eebb667
package
com
.
zrqx
.
newbook
.
bg
.
controller
.
subject
;
import
com.zrqx.core.enums.newbook.EducationEnum
;
import
com.zrqx.core.form.newbook.subject.BatchAuditForm
;
import
com.zrqx.core.form.newbook.subject.QuerySubjectForm
;
import
com.zrqx.core.form.newbook.subject.SaveSubjectForm
;
import
com.zrqx.core.util.CallBack
;
...
...
@@ -9,8 +10,10 @@ import com.zrqx.core.util.PageParam;
import
com.zrqx.core.util.excelutil.ExcelUtil
;
import
com.zrqx.core.vo.newbook.subject.ExportSubjectVo
;
import
com.zrqx.core.vo.newbook.subject.SelectedSubjectVo
;
import
com.zrqx.core.vo.newbook.subject.SubjectAuditVo
;
import
com.zrqx.core.vo.newbook.subject.SubjectListVo
;
import
com.zrqx.newbook.bg.service.subject.SelectedSubjectService
;
import
com.zrqx.newbook.bg.service.subject.SubjectAuditService
;
import
com.zrqx.newbook.bg.service.subject.SubjectService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -35,6 +38,9 @@ public class SubjectController {
@Autowired
private
SubjectService
subjectService
;
@Autowired
private
SubjectAuditService
auditService
;
@ApiOperation
(
value
=
"获取学历列表"
,
notes
=
"获取学历列表"
)
@GetMapping
(
"/get/education"
)
public
CallBack
<
Map
<
String
,
String
>>
getEducationMap
()
{
...
...
@@ -81,7 +87,7 @@ public class SubjectController {
}
@PostMapping
(
"/batch/audit"
)
@ApiOperation
(
value
=
"批量
审批"
,
notes
=
"批量
审批"
)
@ApiOperation
(
value
=
"批量
提交审批"
,
notes
=
"批量提交
审批"
)
public
CallBack
<
Boolean
>
batchAudit
()
{
return
CallBack
.
success
();
...
...
@@ -102,9 +108,17 @@ public class SubjectController {
return
CallBack
.
success
();
}
//审批
@PostMapping
(
"/batch/verify"
)
@ApiOperation
(
value
=
"批量审核"
,
notes
=
"审核未通过:1-4,室主任审核通过:1-2-2;选题委员会通过:1-2-3;社领导通过:1-3"
)
public
CallBack
<
Boolean
>
batchAudit
(
@RequestBody
BatchAuditForm
form
)
{
return
CallBack
.
success
(
service
.
batchAudit
(
form
));
}
//批量审核
@GetMapping
(
"/list/audits/{id}"
)
@ApiOperation
(
value
=
"获取审核记录"
,
notes
=
"传入选题详情ID"
)
public
CallBack
<
List
<
SubjectAuditVo
>>
listAudits
(
@PathVariable
Integer
id
)
{
return
CallBack
.
success
(
auditService
.
queryAuditsByBssId
(
id
));
}
//指定三审负责人
...
...
com.zrqx.newbook/src/main/java/com/zrqx/newbook/bg/service/subject/SelectedSubjectService.java
浏览文件 @
4eebb667
package
com
.
zrqx
.
newbook
.
bg
.
service
.
subject
;
import
com.zrqx.core.form.newbook.subject.BatchAuditForm
;
import
com.zrqx.core.form.newbook.subject.QuerySubjectForm
;
import
com.zrqx.core.form.newbook.subject.SaveSubjectForm
;
import
com.zrqx.core.model.newbook.subject.SelectedSubject
;
...
...
@@ -63,4 +64,11 @@ public interface SelectedSubjectService extends BaseService<SelectedSubject, Int
* @return
*/
List
<
ExportSubjectVo
>
export
(
QuerySubjectForm
form
,
PageParam
pageParam
);
/**
* 批量审批
* @param form
* @return
*/
boolean
batchAudit
(
BatchAuditForm
form
);
}
com.zrqx.newbook/src/main/java/com/zrqx/newbook/bg/service/subject/SelectedSubjectServiceImpl.java
浏览文件 @
4eebb667
...
...
@@ -5,16 +5,19 @@ import com.zrqx.core.enums.newbook.NBErrorEnum;
import
com.zrqx.core.enums.newbook.SelectedSubjectEnum
;
import
com.zrqx.core.enums.newbook.SubjectStatusEnum
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.form.newbook.subject.BatchAuditForm
;
import
com.zrqx.core.form.newbook.subject.QuerySubjectForm
;
import
com.zrqx.core.form.newbook.subject.SaveSubjectForm
;
import
com.zrqx.core.form.resource.bg.series.SeriesForm
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.newbook.subject.SelectedSubject
;
import
com.zrqx.core.model.newbook.subject.SubjectAudit
;
import
com.zrqx.core.model.newbook.subject.SubjectAuthor
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.util.CallBack
;
import
com.zrqx.core.util.PageInfo
;
import
com.zrqx.core.util.PageParam
;
import
com.zrqx.core.vo.newbook.subject.BatchAuditSubjectVo
;
import
com.zrqx.core.vo.newbook.subject.ExportSubjectVo
;
import
com.zrqx.core.vo.newbook.subject.SelectedSubjectVo
;
import
com.zrqx.core.vo.newbook.subject.SubjectListVo
;
...
...
@@ -24,6 +27,7 @@ import com.zrqx.newbook.bg.client.SysuserClient;
import
com.zrqx.newbook.bg.manage.SubjectAuthorManage
;
import
com.zrqx.newbook.bg.manage.SubjectManage
;
import
com.zrqx.newbook.bg.mapper.subject.SelectedSubjectMapper
;
import
com.zrqx.newbook.bg.mapper.subject.SubjectAuditMapper
;
import
com.zrqx.newbook.bg.mapper.subject.SubjectAuthorMapper
;
import
com.zrqx.newbook.bg.mapper.subject.SubjectMapper
;
import
com.zrqx.newbook.commons.Redis
;
...
...
@@ -66,6 +70,9 @@ public class SelectedSubjectServiceImpl extends BaseServiceImpl<SelectedSubject,
private
SubjectAuthorManage
authorManage
;
@Autowired
private
SubjectAuditMapper
auditMapper
;
@Autowired
private
Redis
redis
;
@Override
...
...
@@ -236,6 +243,38 @@ public class SelectedSubjectServiceImpl extends BaseServiceImpl<SelectedSubject,
return
all
;
}
@Override
public
boolean
batchAudit
(
BatchAuditForm
form
)
{
List
<
BatchAuditSubjectVo
>
subjects
=
form
.
getSubjects
();
if
(
subjects
==
null
||
subjects
.
size
()
==
0
)
{
return
false
;
}
for
(
BatchAuditSubjectVo
subject
:
subjects
)
{
SubjectAudit
audit
=
new
SubjectAudit
();
audit
.
setUserId
(
redis
.
getUser
().
getUserId
());
audit
.
setStatus
(
form
.
getStatus
());
audit
.
setAuditTime
(
new
Date
());
audit
.
setAuditOpinion
(
form
.
getAuditOpinion
());
audit
.
setStage
(
form
.
getStage
());
audit
.
setBssId
(
subject
.
getId
());
audit
.
setSubjectNum
(
subject
.
getSubjectNum
());
//如果插入成功则修改选题详情状态到下一阶段
if
(
auditMapper
.
insertSelective
(
audit
)
>
0
)
{
SelectedSubject
selectedSubject
=
Optional
.
ofNullable
(
super
.
selectByPrimaryKey
(
subject
.
getId
()))
.
orElseThrow
(()
->
new
BaseException
(
NBErrorEnum
.
ENTITY_NOT_EXIST
.
getErrNum
(),
NBErrorEnum
.
ENTITY_NOT_EXIST
.
getErrMsg
()
));
selectedSubject
.
setStatus
(
form
.
getNextStage
());
super
.
updateByPrimaryKeySelective
(
selectedSubject
);
}
}
return
true
;
}
private
String
saveSeries
(
String
seriesName
)
{
SeriesForm
series
=
new
SeriesForm
();
series
.
setSeriesName
(
seriesName
);
...
...
com.zrqx.newbook/src/main/java/com/zrqx/newbook/bg/service/subject/SubjectAuditService.java
浏览文件 @
4eebb667
...
...
@@ -2,6 +2,17 @@ package com.zrqx.newbook.bg.service.subject;
import
com.zrqx.core.model.newbook.subject.SubjectAudit
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.core.vo.newbook.subject.SubjectAuditVo
;
import
java.util.List
;
public
interface
SubjectAuditService
extends
BaseService
<
SubjectAudit
,
Integer
>
{
/**
* 查询选题的审核记录
* @param bssId
* @return
*/
List
<
SubjectAuditVo
>
queryAuditsByBssId
(
Integer
bssId
);
}
com.zrqx.newbook/src/main/java/com/zrqx/newbook/bg/service/subject/SubjectAuditServiceImpl.java
浏览文件 @
4eebb667
package
com
.
zrqx
.
newbook
.
bg
.
service
.
subject
;
import
com.zrqx.core.enums.newbook.NBErrorEnum
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.newbook.subject.SubjectAudit
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.util.ArrayUtils
;
import
com.zrqx.core.util.CallBack
;
import
com.zrqx.core.vo.newbook.subject.SubjectAuditVo
;
import
com.zrqx.core.vo.sysuser.bg.user.UserVO
;
import
com.zrqx.newbook.bg.client.SysuserClient
;
import
com.zrqx.newbook.bg.mapper.subject.SubjectAuditMapper
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
tk.mybatis.mapper.entity.Example
;
import
java.util.ArrayList
;
import
java.util.Comparator
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@Service
public
class
SubjectAuditServiceImpl
extends
BaseServiceImpl
<
SubjectAudit
,
Integer
>
implements
SubjectAuditService
{
...
...
@@ -13,8 +27,44 @@ public class SubjectAuditServiceImpl extends BaseServiceImpl<SubjectAudit, Integ
@Autowired
private
SubjectAuditMapper
mapper
;
@Autowired
private
SysuserClient
sysuserClient
;
@Override
public
BaseMapper
<
SubjectAudit
>
getMapper
()
{
return
mapper
;
}
@Override
public
List
<
SubjectAuditVo
>
queryAuditsByBssId
(
Integer
bssId
)
{
List
<
SubjectAuditVo
>
audits
=
new
ArrayList
<>();
Example
example
=
super
.
createExample
();
example
.
createCriteria
()
.
andEqualTo
(
"bssId"
,
bssId
);
List
<
SubjectAudit
>
subjectAudits
=
mapper
.
selectByExample
(
example
);
if
(
ArrayUtils
.
empty
(
subjectAudits
))
{
return
audits
;
}
for
(
SubjectAudit
audit
:
subjectAudits
)
{
SubjectAuditVo
auditVo
=
new
SubjectAuditVo
();
BeanUtils
.
copyProperties
(
audit
,
auditVo
);
CallBack
<
UserVO
>
callBack
=
sysuserClient
.
getUserById
(
audit
.
getUserId
());
if
(!
callBack
.
isStatus
()
||
callBack
==
null
)
{
throw
new
BaseException
(
NBErrorEnum
.
GET_USER_INFO_FAILED
.
getErrNum
(),
NBErrorEnum
.
GET_USER_INFO_FAILED
.
getErrMsg
()
);
}
auditVo
.
setUserName
(
callBack
.
getData
().
getUserName
());
audits
.
add
(
auditVo
);
}
return
audits
.
stream
()
.
sorted
(
Comparator
.
comparing
(
SubjectAuditVo:
:
getStage
))
.
collect
(
Collectors
.
toList
());
}
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/user/UserController.java
浏览文件 @
4eebb667
...
...
@@ -184,9 +184,6 @@ public class UserController {
return
CallBack
.
success
(
userSerivce
.
queryEditors
());
}
//1-2-1: 室主任审批权限0/1
//1-2-2: 选题委员会审批权限0/1
//1-2-3: 设领导审批权限0/1
@GetMapping
(
"/get/audit/auth"
)
@ApiOperation
(
value
=
"获取当前用户的选题申报审核权限"
,
notes
=
"1-2-1: 室主任审批权限0/1;1-2-2: 选题委员会审批权限0/1;1-2-3: 设领导审批权限0/1"
)
public
CallBack
<
JSONObject
>
getAuditAuth
()
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论