Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bailuntec-cost
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
huluobin
bailuntec-cost
Commits
ed17a825
Commit
ed17a825
authored
Feb 22, 2021
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# 更新
parent
cf6a67e8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
10 deletions
+40
-10
CostDto.java
...ces/src/main/java/com/bailuntec/cost/api/dto/CostDto.java
+39
-9
CostDomain.java
...main/java/com/blt/other/module/cost/model/CostDomain.java
+1
-1
No files found.
cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostDto.java
View file @
ed17a825
...
@@ -203,17 +203,48 @@ public class CostDto {
...
@@ -203,17 +203,48 @@ public class CostDto {
@ApiModelProperty
(
"行政审核人"
)
@ApiModelProperty
(
"行政审核人"
)
private
String
hrReviewerUserName
;
private
String
hrReviewerUserName
;
private
String
costStatusDto
;
// 费用单状态 0 未提交 1待审核 2待出纳付款 3已支付
/**
private
String
fileName
;
// 文件名
* 费用单状态 0 未提交 1待审核 2待出纳付款 3已支付
private
String
morFileName
;
// 补充材料文件名
*/
private
String
costStatusDto
;
/**
* 文件名
*/
private
String
fileName
;
/**
* 补充材料文件名
*/
private
String
morFileName
;
private
String
amountDto
;
private
String
amountDto
;
private
String
isLendDto
;
// 0 普通费用 1 借支 2 借还
private
String
costFormDto
;
// 费用类型
/**
* 0 普通费用 1 借支 2 借还
*/
private
String
isLendDto
;
/**
* 费用类型
*/
private
String
costFormDto
;
private
String
lendStatusDto
;
private
String
lendStatusDto
;
private
String
dicDto
;
// 币种
/**
* 币种
*/
private
String
dicDto
;
private
String
payPlanAmountDto
;
private
String
payPlanAmountDto
;
private
String
payDicDto
;
// 支付币种
private
String
isTaxStr
;
// 0 不抵扣个税 1 抵扣个税
/**
* 支付币种
*/
private
String
payDicDto
;
/**
* 0 不抵扣个税 1 抵扣个税
*/
private
String
isTaxStr
;
private
String
lendType
;
private
String
lendType
;
...
@@ -226,7 +257,6 @@ public class CostDto {
...
@@ -226,7 +257,6 @@ public class CostDto {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
CostTemplateDto
costTemplate
;
private
CostTemplateDto
costTemplate
;
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
CostDetailDto
>
costDetailList
;
private
List
<
CostDetailDto
>
costDetailList
;
...
...
cost-service/src/main/java/com/blt/other/module/cost/model/CostDomain.java
View file @
ed17a825
...
@@ -276,7 +276,7 @@ public class CostDomain implements Serializable {
...
@@ -276,7 +276,7 @@ public class CostDomain implements Serializable {
this
.
setAccountingSubjectName
(
accountingSubject
.
getName
());
this
.
setAccountingSubjectName
(
accountingSubject
.
getName
());
this
.
setAccountingSubjectNo
(
accountingSubject
.
getSubjectNo
());
this
.
setAccountingSubjectNo
(
accountingSubject
.
getSubjectNo
());
this
.
setIsManageCost
(
costTypeDomain
.
getIsManageCost
())
this
.
setIsManageCost
(
costTypeDomain
.
getIsManageCost
())
;
}
}
private
static
final
String
REGEX_CHINESE
=
"[\u4e00-\u9fa5]"
;
// 中文正则
private
static
final
String
REGEX_CHINESE
=
"[\u4e00-\u9fa5]"
;
// 中文正则
...
...
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