Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
S
syyl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
syyl
Commits
fa8a27c6
提交
fa8a27c6
authored
6月 10, 2020
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
8a771a9b
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
14 行增加
和
8 行删除
+14
-8
ResourceLibraryController.java
...ser/bg/controller/resource/ResourceLibraryController.java
+3
-3
SignLanguageMapper.java
...om/zrqx/sysuser/bg/mapper/content/SignLanguageMapper.java
+2
-2
SignLanguageServiceImpl.java
...x/sysuser/bg/service/content/SignLanguageServiceImpl.java
+1
-1
FgResourceLibraryController.java
...r/fg/controller/resource/FgResourceLibraryController.java
+1
-1
FgSignLanguageServiceImpl.java
...sysuser/fg/service/content/FgSignLanguageServiceImpl.java
+7
-1
没有找到文件。
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/resource/ResourceLibraryController.java
浏览文件 @
fa8a27c6
...
...
@@ -403,7 +403,7 @@ public class ResourceLibraryController {
sign
.
setCompleteTime
(
null
);
sign
.
setStatus
(
SignStatusEnum
.
NOT_REVIEW
.
getCode
());
signLanguageService
.
updateByPrimaryKeySelective
(
sign
);
/*return;*/
break
;
}
}
// 所有用户都提交了视频,且通过
...
...
@@ -594,14 +594,14 @@ public class ResourceLibraryController {
userRelation
.
setStatus_1
(
SignStatusEnum
.
YES_ADOPT
.
getCode
());
signLanguageUserRelationService
.
updateByPrimaryKeySelective
(
userRelation
);
example
=
service
.
createExample
();
/*
example = service.createExample();
example.createCriteria().andEqualTo("signLanguageId", vi.getSignLanguageId())
.andEqualTo("userId", vi.getUserId()).andEqualTo("status",
LibraryStatusEnum.STATUS_0.getCode()); int num11 =
service.selectCountByExample(example); if (num11 > 0) {
}else { userRelation.setStatus_1(SignStatusEnum.NOT_REVIEW.getCode());
signLanguageUserRelationService
.
updateByPrimaryKeySelective
(
userRelation
);
}
signLanguageUserRelationService.updateByPrimaryKeySelective(userRelation); }
*/
}
else
{
userRelation
.
setStatus_1
(
SignStatusEnum
.
YES_STAY
.
getCode
());
...
...
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/content/SignLanguageMapper.java
浏览文件 @
fa8a27c6
...
...
@@ -132,11 +132,11 @@ public interface SignLanguageMapper extends BaseMapper<SignLanguage> {
+
"</script>"
)
List
<
SignLanguageStatusVo
>
pageSelect
(
@Param
(
"id"
)
String
id
);
@Select
(
"<script>"
+
"SELECT count(*) FROM sys_sign_language_
user_
relation where 1=1 "
+
"SELECT count(*) FROM sys_sign_language_relation where 1=1 "
+
"<if test='"
+
NOTBLANK
+
"(id)'>"
+
" and objectId = #{id} "
+
"</if>"
+
" and
role=2
"
+
" and
status=4
"
+
"</script>"
)
Integer
queryBycompleteNum
(
@Param
(
"id"
)
String
id
);
...
...
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/content/SignLanguageServiceImpl.java
浏览文件 @
fa8a27c6
...
...
@@ -420,7 +420,7 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
vo
.
setDistributeNum
(
distributeNum
);
//已完成区域
Integer
completeNum
=
mapper
.
queryBycompleteNum
(
form
.
getId
());
vo
.
set
Distribu
teNum
(
completeNum
);
vo
.
set
Comple
teNum
(
completeNum
);
//查询当前区域
List
<
SignLanguageStatusVo
>
list
=
mapper
.
pageSelect
(
form
.
getId
());
for
(
SignLanguageStatusVo
statusVo
:
list
)
{
...
...
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/resource/FgResourceLibraryController.java
浏览文件 @
fa8a27c6
...
...
@@ -485,7 +485,7 @@ public class FgResourceLibraryController {
sign
.
setCompleteTime
(
null
);
sign
.
setStatus
(
SignStatusEnum
.
NOT_REVIEW
.
getCode
());
signLanguageService
.
updateByPrimaryKeySelective
(
sign
);
return
;
break
;
}
}
// 所有用户都提交了视频,且通过
...
...
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/content/FgSignLanguageServiceImpl.java
浏览文件 @
fa8a27c6
...
...
@@ -857,12 +857,18 @@ public class FgSignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Str
video3
.
setArea_adminId
(
user
.
getUserId
());
int
status_2
=
videoLibraryMapper
.
selectCount
(
video3
);
fgVo
.
setStatus_2
(
status_2
+
status_3
);
//审核中
//
区域管理员
审核中
VideoLibrary
video23
=
new
VideoLibrary
();
video23
.
setSignLanguageId
(
form
.
getId
());
video23
.
setStatus
(
LibraryStatusEnum
.
STATUS_0
.
getCode
());
video23
.
setArea_adminId
(
user
.
getUserId
());
int
status_7
=
videoLibraryMapper
.
selectCount
(
video23
);
//中心管理审核中
video23
=
new
VideoLibrary
();
video23
.
setSignLanguageId
(
form
.
getId
());
video23
.
setStatus_1
(
LibraryStatusEnum
.
STATUS_0
.
getCode
());
video23
.
setArea_adminId
(
user
.
getUserId
());
status_7
=
videoLibraryMapper
.
selectCount
(
video23
);
if
(
status_7
>
0
)
{
fgVo
.
setStatus
(
LibraryStatusEnum
.
STATUS_0
.
getCode
());
fgVo
.
setStatus_zh
(
LibraryStatusEnum
.
getName
(
fgVo
.
getStatus
()));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论