Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
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-enterprise
Commits
c62b561a
Commit
c62b561a
authored
May 25, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配置审批
parent
71f4a87b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
AuditLogServiceImpl.java
.../com/gic/enterprise/service/impl/AuditLogServiceImpl.java
+1
-1
AuditLogApiServiceImpl.java
...enterprise/service/outer/impl/AuditLogApiServiceImpl.java
+6
-0
TabAuditLogMapper.xml
...e-service/src/main/resources/mapper/TabAuditLogMapper.xml
+2
-1
No files found.
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/AuditLogServiceImpl.java
View file @
c62b561a
...
...
@@ -32,7 +32,7 @@ public class AuditLogServiceImpl implements AuditLogService {
auditLogDTO
.
setEnterpriseId
(
enterpriseId
);
auditLogDTO
.
setApplyUserId
(
applyUserId
);
auditLogDTO
.
setProjectItemId
(
projectItemId
);
auditLogDTO
.
setAuditExpireTime
(
new
Date
());
//
auditLogDTO.setAuditExpireTime(new Date());
return
tabAuditLogMapper
.
getLastWaitAuditByApplyUser
(
auditLogDTO
);
}
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AuditLogApiServiceImpl.java
View file @
c62b561a
...
...
@@ -114,6 +114,12 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
return
EnterpriseServiceResponse
.
success
();
}
if
(
Constants
.
NORMAL_STATUS
.
equals
(
projectItem
.
getIsPlatform
()))
{
// todo 如果是平台审批项, 同一个平台审批项 如果24小时内有审核成功的,就拒绝提交
// sendWxMessage();
}
// 判断有没有审核员, 没有审核员就返回错误
ServiceResponse
<
List
<
AuditorDTO
>>
auditorResponse
=
auditorApiService
.
listAuditorByProject
(
auditLogDTO
.
getProjectItemId
(),
auditLogDTO
.
getApplyUserId
(),
auditLogDTO
.
getEnterpriseId
());
...
...
gic-platform-enterprise-service/src/main/resources/mapper/TabAuditLogMapper.xml
View file @
c62b561a
...
...
@@ -264,7 +264,8 @@
<include
refid=
"Base_Column_List"
/>
from tab_audit_log
where status = 1
and audit_expire_time
<
#{auditExpireTime}
and audit_result = 0
-- and audit_expire_time
<
#{auditExpireTime}
<if
test=
"enterpriseId != null "
>
and enterprise_id = #{enterpriseId}
</if>
...
...
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