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
46cfa126
Commit
46cfa126
authored
Jan 16, 2021
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# 费用系统
parent
c107a93d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
8 deletions
+15
-8
CostDto.java
...ces/src/main/java/com/bailuntec/cost/api/dto/CostDto.java
+2
-5
CostDomain.java
...main/java/com/blt/other/module/cost/model/CostDomain.java
+13
-1
CostTypeServiceImpl.java
...t/other/module/cost/service/impl/CostTypeServiceImpl.java
+0
-2
No files found.
cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostDto.java
View file @
46cfa126
...
...
@@ -50,9 +50,6 @@ public class CostDto {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
createTime
;
// @ApiModelProperty("关联子单")puh
// @Deprecated
// private String sonCostNo;
@ApiModelProperty
(
"关联父单"
)
private
String
supCostNo
;
...
...
@@ -212,14 +209,14 @@ public class CostDto {
private
String
payDicDto
;
// 支付币种
private
String
isTaxStr
;
// 0 不抵扣个税 1 抵扣个税
private
String
lendType
;
private
Boolean
isPic
;
@TableField
(
exist
=
false
)
private
String
costCurrentReviewer
;
@ApiModelProperty
(
"费用单对应的模版"
)
@TableField
(
exist
=
false
)
private
CostTemplateDto
costTemplate
;
...
...
cost-service/src/main/java/com/blt/other/module/cost/model/CostDomain.java
View file @
46cfa126
...
...
@@ -3,6 +3,7 @@ package com.blt.other.module.cost.model;
import
com.bailuntec.api.bailuntec.cw.request.PostApplyReq
;
import
com.bailuntec.common.BeanUtils
;
import
com.bailuntec.common.SpringContextUtil
;
import
com.bailuntec.common.StringUtils
;
import
com.bailuntec.cost.api.dto.CostAttach
;
import
com.bailuntec.cost.api.dto.CostDto
;
import
com.bailuntec.cost.api.dto.CostListPrintDto
;
...
...
@@ -19,6 +20,7 @@ import com.blt.other.database.model.UserDomain;
import
com.blt.other.module.cost.dao.CostCompanyDao
;
import
com.blt.other.module.sys.service.UserService
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.google.common.collect.Lists
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
...
...
@@ -380,6 +382,7 @@ public class CostDomain implements Serializable {
return
print
;
}
private
final
List
<
String
>
picFilter
=
Lists
.
newArrayList
(
"png"
,
"jpg,"
,
"bmp,"
,
"gif"
);
public
CostDto
castToDto
()
{
...
...
@@ -408,8 +411,8 @@ public class CostDomain implements Serializable {
Pattern
pat
=
Pattern
.
compile
(
REGEX_CHINESE
);
Matcher
mat
=
pat
.
matcher
(
fileName
);
costDto
.
setFileName
(
mat
.
replaceAll
(
""
));
}
// 抵个税
if
(
1
==
costDto
.
getCostForm
())
{
costDto
.
setIsTaxStr
(
statusMapper
.
getStatusValue
(
"is_tax"
,
costDto
.
getIsTax
()));
...
...
@@ -427,6 +430,15 @@ public class CostDomain implements Serializable {
String
format
=
df
.
format
(
costDto
.
getPayPlanAmount
());
costDto
.
setPayPlanAmountDto
(
format
);
}
if
(
StringUtils
.
isNotEmpty
(
filePath
))
{
int
i
=
filePath
.
lastIndexOf
(
'.'
);
String
extension
=
""
;
if
(
i
>
0
)
{
extension
=
filePath
.
substring
(
i
+
1
);
}
costDto
.
setIsPic
(
picFilter
.
contains
(
extension
));
}
return
costDto
;
}
...
...
cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostTypeServiceImpl.java
View file @
46cfa126
...
...
@@ -94,8 +94,6 @@ public class CostTypeServiceImpl extends ServiceImpl<CostTypeDao, CostTypeDomain
this
.
updateById
(
costTypeDomain
);
}
}
@Override
...
...
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