Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-auth
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-platform-auth
Commits
54d89912
Commit
54d89912
authored
Oct 29, 2019
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改审批员取值
parent
e421ee8e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
10 deletions
+10
-10
TabAuditorProjectItemRelMapper.java
...m/gic/auth/dao/mapper/TabAuditorProjectItemRelMapper.java
+2
-1
AuditorProjectItemRelService.java
...va/com/gic/auth/service/AuditorProjectItemRelService.java
+1
-1
AuditorProjectItemRelServiceImpl.java
...c/auth/service/impl/AuditorProjectItemRelServiceImpl.java
+2
-2
AuditorApiServiceImpl.java
...om/gic/auth/service/outer/impl/AuditorApiServiceImpl.java
+1
-3
TabAuditorProjectItemRelMapper.xml
.../main/resources/mapper/TabAuditorProjectItemRelMapper.xml
+4
-3
No files found.
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditorProjectItemRelMapper.java
View file @
54d89912
...
...
@@ -67,5 +67,5 @@ public interface TabAuditorProjectItemRelMapper {
@MapKey
(
"auditorId"
)
Map
<
Integer
,
Map
<
Integer
,
Long
>>
getCountByAuditorIds
(
@Param
(
"ids"
)
List
<
Integer
>
auditorIdList
);
List
<
Integer
>
listAuditorIdByProjectI
d
(
@Param
(
"enterpriseId"
)
Integer
enterpriseId
,
@Param
(
"projectId"
)
Integer
project
Id
);
List
<
Integer
>
listAuditorIdByProjectI
temId
(
@Param
(
"enterpriseId"
)
Integer
enterpriseId
,
@Param
(
"projectItemId"
)
Integer
projectItem
Id
);
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/service/AuditorProjectItemRelService.java
View file @
54d89912
...
...
@@ -20,5 +20,5 @@ public interface AuditorProjectItemRelService {
Map
<
Integer
,
Integer
>
getCountByAuditorIds
(
List
<
Integer
>
auditorIdList
);
List
<
Integer
>
listAuditorIdByProjectI
d
(
Integer
enterpriseId
,
Integer
project
Id
);
List
<
Integer
>
listAuditorIdByProjectI
temId
(
Integer
enterpriseId
,
Integer
projectItem
Id
);
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/AuditorProjectItemRelServiceImpl.java
View file @
54d89912
...
...
@@ -66,7 +66,7 @@ public class AuditorProjectItemRelServiceImpl implements AuditorProjectItemRelSe
}
@Override
public
List
<
Integer
>
listAuditorIdByProjectI
d
(
Integer
enterpriseId
,
Integer
project
Id
)
{
return
tabAuditorProjectItemRelMapper
.
listAuditorIdByProjectI
d
(
enterpriseId
,
project
Id
);
public
List
<
Integer
>
listAuditorIdByProjectI
temId
(
Integer
enterpriseId
,
Integer
projectItem
Id
)
{
return
tabAuditorProjectItemRelMapper
.
listAuditorIdByProjectI
temId
(
enterpriseId
,
projectItem
Id
);
}
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AuditorApiServiceImpl.java
View file @
54d89912
...
...
@@ -222,10 +222,8 @@ public class AuditorApiServiceImpl implements AuditorApiService {
public
ServiceResponse
<
List
<
AuditorDTO
>>
listAuditorByProject
(
Integer
projectItemId
,
Integer
userId
,
Integer
enterpriseId
)
{
ServiceResponse
<
ProjectItemDTO
>
projectItemResponse
=
projectItemApiService
.
getById
(
projectItemId
);
if
(
projectItemResponse
.
isSuccess
())
{
ProjectItemDTO
projectItemDTO
=
projectItemResponse
.
getResult
();
Integer
projectId
=
projectItemDTO
.
getProjectId
();
// 找到审批项对应的审核员
List
<
Integer
>
projectAuditorIds
=
auditorProjectItemRelService
.
listAuditorIdByProjectI
d
(
enterpriseId
,
project
Id
);
List
<
Integer
>
projectAuditorIds
=
auditorProjectItemRelService
.
listAuditorIdByProjectI
temId
(
enterpriseId
,
projectItem
Id
);
if
(
CollectionUtils
.
isNotEmpty
(
projectAuditorIds
))
{
// 找到管理员所在的受审组
List
<
Integer
>
auditedGroupIds
=
auditedGroupUserRelService
.
listAuditedGroupByUserId
(
enterpriseId
,
userId
);
...
...
gic-platform-auth-service/src/main/resources/mapper/TabAuditorProjectItemRelMapper.xml
View file @
54d89912
...
...
@@ -183,7 +183,7 @@
</if>
group by auditor_id
</select>
<select
id=
"listAuditorIdByProjectId"
resultType=
"java.lang.Integer"
>
<select
id=
"listAuditorIdByProjectI
temI
d"
resultType=
"java.lang.Integer"
>
select
auditor_id
from tab_auditor_project_item_rel
...
...
@@ -191,8 +191,8 @@
<if
test=
"enterpriseId != null "
>
and enterprise_id = #{enterpriseId}
</if>
<if
test=
"projectId != null "
>
and project_i
d = #{project
Id}
<if
test=
"projectI
temI
d != null "
>
and project_i
tem_id = #{projectItem
Id}
</if>
</select>
</mapper>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment