Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-finance
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-finance
Commits
4422fb0c
Commit
4422fb0c
authored
Sep 27, 2019
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
财务管理统一添加操作人相关信息
parent
cd985994
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
6 deletions
+63
-6
OperationUserInfoDTO.java
...c/main/java/com/gic/finance/dto/OperationUserInfoDTO.java
+54
-0
CashWithdrawalApiService.java
...ava/com/gic/finance/service/CashWithdrawalApiService.java
+3
-2
InvoiceManageApiService.java
...java/com/gic/finance/service/InvoiceManageApiService.java
+3
-2
TransferAccountsApprovalApiService.java
...c/finance/service/TransferAccountsApprovalApiService.java
+3
-2
No files found.
gic-platform-finance-api/src/main/java/com/gic/finance/dto/OperationUserInfoDTO.java
0 → 100644
View file @
4422fb0c
package
com
.
gic
.
finance
.
dto
;
import
java.io.Serializable
;
/**
* 操作人信息
* @ClassName: OperationUserInfoDTO
* @Description:
* @author guojuxing
* @date 2019/9/27 2:16 PM
*/
public
class
OperationUserInfoDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
570322634465207981L
;
private
Integer
id
;
// 用户登录名(账号)
private
String
loginName
;
// 用户真实姓名
private
String
realName
;
// 用户手机号',
private
String
userMobile
;
public
Integer
getId
()
{
return
id
;
}
public
void
setId
(
Integer
id
)
{
this
.
id
=
id
;
}
public
String
getLoginName
()
{
return
loginName
;
}
public
void
setLoginName
(
String
loginName
)
{
this
.
loginName
=
loginName
;
}
public
String
getRealName
()
{
return
realName
;
}
public
void
setRealName
(
String
realName
)
{
this
.
realName
=
realName
;
}
public
String
getUserMobile
()
{
return
userMobile
;
}
public
void
setUserMobile
(
String
userMobile
)
{
this
.
userMobile
=
userMobile
;
}
}
gic-platform-finance-api/src/main/java/com/gic/finance/service/CashWithdrawalApiService.java
View file @
4422fb0c
...
@@ -3,6 +3,7 @@ package com.gic.finance.service;
...
@@ -3,6 +3,7 @@ package com.gic.finance.service;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.finance.dto.CashWithdrawalDTO
;
import
com.gic.finance.dto.CashWithdrawalDTO
;
import
com.gic.finance.dto.OperationUserInfoDTO
;
import
com.gic.finance.qo.CashWithdrawalQueryListQO
;
import
com.gic.finance.qo.CashWithdrawalQueryListQO
;
/**
/**
...
@@ -41,7 +42,7 @@ public interface CashWithdrawalApiService {
...
@@ -41,7 +42,7 @@ public interface CashWithdrawalApiService {
* @param id
* @param id
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
*/
*/
ServiceResponse
<
Void
>
approval
(
Integer
id
);
ServiceResponse
<
Void
>
approval
(
Integer
id
,
OperationUserInfoDTO
dto
);
/**
/**
* 详情
* 详情
...
@@ -62,7 +63,7 @@ public interface CashWithdrawalApiService {
...
@@ -62,7 +63,7 @@ public interface CashWithdrawalApiService {
* @param rejectReason 驳回理由
* @param rejectReason 驳回理由
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
*/
*/
ServiceResponse
<
Void
>
reject
(
Integer
id
,
String
rejectReason
);
ServiceResponse
<
Void
>
reject
(
Integer
id
,
String
rejectReason
,
OperationUserInfoDTO
dto
);
/**
/**
* 打款
* 打款
...
...
gic-platform-finance-api/src/main/java/com/gic/finance/service/InvoiceManageApiService.java
View file @
4422fb0c
...
@@ -3,6 +3,7 @@ package com.gic.finance.service;
...
@@ -3,6 +3,7 @@ package com.gic.finance.service;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.finance.dto.InvoiceManageDTO
;
import
com.gic.finance.dto.InvoiceManageDTO
;
import
com.gic.finance.dto.OperationUserInfoDTO
;
import
com.gic.finance.qo.InvoiceManageListQueryQO
;
import
com.gic.finance.qo.InvoiceManageListQueryQO
;
/**
/**
...
@@ -46,7 +47,7 @@ public interface InvoiceManageApiService {
...
@@ -46,7 +47,7 @@ public interface InvoiceManageApiService {
* @param expressMailNumber
* @param expressMailNumber
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
*/
*/
ServiceResponse
<
Void
>
invoice
(
Integer
invoiceManageId
,
String
expressMailName
,
String
expressMailNumber
);
ServiceResponse
<
Void
>
invoice
(
Integer
invoiceManageId
,
String
expressMailName
,
String
expressMailNumber
,
OperationUserInfoDTO
dto
);
/**
/**
* 驳回
* 驳回
...
@@ -57,7 +58,7 @@ public interface InvoiceManageApiService {
...
@@ -57,7 +58,7 @@ public interface InvoiceManageApiService {
* @param rejectReason 驳回理由
* @param rejectReason 驳回理由
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
*/
*/
ServiceResponse
<
Void
>
rejectInvoice
(
Integer
invoiceManageId
,
String
rejectReason
);
ServiceResponse
<
Void
>
rejectInvoice
(
Integer
invoiceManageId
,
String
rejectReason
,
OperationUserInfoDTO
dto
);
/**
/**
* 取消
* 取消
...
...
gic-platform-finance-api/src/main/java/com/gic/finance/service/TransferAccountsApprovalApiService.java
View file @
4422fb0c
...
@@ -2,6 +2,7 @@ package com.gic.finance.service;
...
@@ -2,6 +2,7 @@ package com.gic.finance.service;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.finance.dto.OperationUserInfoDTO
;
import
com.gic.finance.dto.TransferAccountsApprovalDTO
;
import
com.gic.finance.dto.TransferAccountsApprovalDTO
;
import
com.gic.finance.qo.TransferListQueryQO
;
import
com.gic.finance.qo.TransferListQueryQO
;
...
@@ -103,7 +104,7 @@ public interface TransferAccountsApprovalApiService {
...
@@ -103,7 +104,7 @@ public interface TransferAccountsApprovalApiService {
* @param accountAmount
* @param accountAmount
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
*/
*/
ServiceResponse
<
Void
>
agreeApproval
(
Integer
transferApprovalId
,
Double
accountAmount
);
ServiceResponse
<
Void
>
agreeApproval
(
Integer
transferApprovalId
,
Double
accountAmount
,
OperationUserInfoDTO
userInfoDTO
);
/**
/**
* 回驳
* 回驳
...
@@ -113,7 +114,7 @@ public interface TransferAccountsApprovalApiService {
...
@@ -113,7 +114,7 @@ public interface TransferAccountsApprovalApiService {
* @param transferApprovalId 转账审批主键
* @param transferApprovalId 转账审批主键
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
*/
*/
ServiceResponse
<
Void
>
rejectApproval
(
Integer
transferApprovalId
);
ServiceResponse
<
Void
>
rejectApproval
(
Integer
transferApprovalId
,
OperationUserInfoDTO
userInfoDTO
);
/**
/**
* 取消
* 取消
...
...
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