Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
S
syyl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
syyl
Commits
bedc4476
提交
bedc4476
authored
12月 25, 2020
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
ca89de92
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
7 行增加
和
8 行删除
+7
-8
VideoLibraryMapper.java
...m/zrqx/sysuser/bg/mapper/resource/VideoLibraryMapper.java
+1
-1
UserMapper.java
...main/java/com/zrqx/sysuser/bg/mapper/user/UserMapper.java
+2
-2
SignLanguageServiceImpl.java
...x/sysuser/bg/service/content/SignLanguageServiceImpl.java
+3
-4
UserServiceImpl.java
...ava/com/zrqx/sysuser/bg/service/user/UserServiceImpl.java
+1
-1
没有找到文件。
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/resource/VideoLibraryMapper.java
浏览文件 @
bedc4476
...
...
@@ -25,7 +25,7 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
+
"from res_Video_Library a "
+
"left join sys_user user on a.userId = user.userid "
+
"LEFT JOIN sys_user_department ud ON a.userid = ud.userid "
+
"LEFT JOIN sys_department d ON ud.departmentid = d.departmentid "
+
"where 1=1 AND d.departmentName LIKE '%
采集点
%' "
+
"<if test='"
+
NOTBLANK
+
"(id)'>"
+
"where 1=1 AND d.departmentName LIKE '%
手语采集
%' "
+
"<if test='"
+
NOTBLANK
+
"(id)'>"
+
" and a.id = #{id} "
+
"</if>"
+
"</script>"
)
VideoLibraryOneVO
queryById
(
@Param
(
"id"
)
String
id
);
...
...
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/user/UserMapper.java
浏览文件 @
bedc4476
...
...
@@ -60,10 +60,10 @@ public interface UserMapper extends BaseMapper<User> {
+
"and u.username like concat('%',#{form.userName },'%') "
+
"</if>"
+
"<if test= '"
+
NOTBLANK
+
"(form.phone)'>"
+
"and u.phone like concat(#{form.phone},'%')"
+
"and u.phone like concat(#{form.phone},'%')
"
+
"</if>"
+
"<if test= '"
+
NOTBLANK
+
"(form.userId)'>"
+
"and u.userId = #{form.userId}"
+
"and u.userId = #{form.userId}
"
+
"</if>"
+
"<if test='form.deptId != null'>"
+
"and ud.departmentId = #{form.deptId} "
...
...
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/content/SignLanguageServiceImpl.java
浏览文件 @
bedc4476
...
...
@@ -2,7 +2,6 @@ package com.zrqx.sysuser.bg.service.content;
import
java.util.Date
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -145,13 +144,13 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
li
.
setStatus
(
SignStatusEnum
.
NOT_REVIEW
.
getCode
());
li
.
setCompleteTime
(
null
);
}
else
{
example2
=
userRelationService
.
createExample
();
/*
example2 = userRelationService.createExample();
example2.createCriteria().andEqualTo("objectId", li.getId()).andEqualTo("area_adminId",redis.getUser().getArea_adminId()).andEqualTo("status", SignStatusEnum.YES_STAY.getCode());
num = userRelationService.selectCountByExample(example2);
if(num>0) {
li.setStatus(SignStatusEnum.YES_STAY.getCode());
//li.setCompleteTime(null);
}
else
{
}else {
*/
example2
=
userRelationService
.
createExample
();
example2
.
createCriteria
().
andEqualTo
(
"objectId"
,
li
.
getId
()).
andEqualTo
(
"area_adminId"
,
redis
.
getUser
().
getArea_adminId
()).
andEqualTo
(
"status"
,
SignStatusEnum
.
NOT_ADOPT
.
getCode
());
num
=
userRelationService
.
selectCountByExample
(
example2
);
...
...
@@ -160,7 +159,7 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
li
.
setCompleteTime
(
null
);
}
}
}
/*}*/
}
//获取任务状态
if
(
li
.
getStatus
().
equals
(
SignStatusEnum
.
YES_STAY
.
getCode
()))
{
...
...
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/user/UserServiceImpl.java
浏览文件 @
bedc4476
...
...
@@ -104,7 +104,7 @@ public class UserServiceImpl extends BaseServiceImpl<User, String> implements Us
if
(
user
.
getDeptId
()
!=
null
&&
user
.
getDeptId
().
size
()
>
0
)
{
for
(
Integer
deptId
:
user
.
getDeptId
())
{
Department
dept
=
deptMapper
.
selectByPrimaryKey
(
deptId
);
if
(
dept
==
null
||
!
dept
.
getDepartmentName
().
contains
(
"
采集点
"
))
{
if
(
dept
==
null
||
!
dept
.
getDepartmentName
().
contains
(
"
手语采集
"
))
{
continue
;
}
list
=
udMapper
.
getAreaAdminByDeptId
(
deptId
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论