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
cf6a67e8
Commit
cf6a67e8
authored
Feb 22, 2021
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# 更新
parent
e37fc97d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
+14
-3
CostApi.java
...erfaces/src/main/java/com/bailuntec/cost/api/CostApi.java
+10
-1
CostDto.java
...ces/src/main/java/com/bailuntec/cost/api/dto/CostDto.java
+0
-1
CostDomain.java
...main/java/com/blt/other/module/cost/model/CostDomain.java
+4
-1
No files found.
cost-interfaces/src/main/java/com/bailuntec/cost/api/CostApi.java
View file @
cf6a67e8
...
@@ -43,9 +43,18 @@ public interface CostApi {
...
@@ -43,9 +43,18 @@ public interface CostApi {
@GetMapping
(
"/cost/api/type/{costNo}"
)
@GetMapping
(
"/cost/api/type/{costNo}"
)
CostResult
<
String
>
getTypeName
(
@PathVariable
(
"costNo"
)
String
costNo
);
CostResult
<
String
>
getTypeName
(
@PathVariable
(
"costNo"
)
String
costNo
);
/**
* 获取费用系统列表
*
* @param startDate 开始时间
* @param endDate 结束时间
* @param pageNum 分页
* @param pageSize 分页
* @return res
*/
@ApiOperation
(
"获取费用系统列表"
)
@ApiOperation
(
"获取费用系统列表"
)
@GetMapping
({
"/cost/api/getCostList"
})
@GetMapping
({
"/cost/api/getCostList"
})
CostResult
<
List
<
CostDto
>>
getCostList
(
@RequestParam
(
name
=
"startDate"
)
String
st
K
artDate
,
CostResult
<
List
<
CostDto
>>
getCostList
(
@RequestParam
(
name
=
"startDate"
)
String
startDate
,
@RequestParam
(
name
=
"endDate"
)
String
endDate
,
@RequestParam
(
name
=
"endDate"
)
String
endDate
,
@RequestParam
(
name
=
"pageNum"
)
Integer
pageNum
,
@RequestParam
(
name
=
"pageNum"
)
Integer
pageNum
,
@RequestParam
(
name
=
"pageSize"
)
Integer
pageSize
);
@RequestParam
(
name
=
"pageSize"
)
Integer
pageSize
);
...
...
cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostDto.java
View file @
cf6a67e8
...
@@ -230,7 +230,6 @@ public class CostDto {
...
@@ -230,7 +230,6 @@ public class CostDto {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
CostDetailDto
>
costDetailList
;
private
List
<
CostDetailDto
>
costDetailList
;
@TableField
(
exist
=
false
)
private
Boolean
isManageCost
;
private
Boolean
isManageCost
;
}
}
cost-service/src/main/java/com/blt/other/module/cost/model/CostDomain.java
View file @
cf6a67e8
...
@@ -86,8 +86,9 @@ public class CostDomain implements Serializable {
...
@@ -86,8 +86,9 @@ public class CostDomain implements Serializable {
private
String
typeNo
;
private
String
typeNo
;
@ApiModelProperty
(
"类型标题"
)
@ApiModelProperty
(
"类型标题"
)
private
String
typeName
;
private
String
typeName
;
@ApiModelProperty
(
"是否管理成本"
)
@ApiModelProperty
(
"是否管理成本"
)
private
Integer
isManageCost
;
private
Boolean
isManageCost
;
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
@ApiModelProperty
(
"描述"
)
@ApiModelProperty
(
"描述"
)
...
@@ -274,6 +275,8 @@ public class CostDomain implements Serializable {
...
@@ -274,6 +275,8 @@ public class CostDomain implements Serializable {
AccountingSubject
accountingSubject
=
accountingSubjectMapper
.
selectById
(
costTypeDomain
.
getAccountingSubjectId
());
AccountingSubject
accountingSubject
=
accountingSubjectMapper
.
selectById
(
costTypeDomain
.
getAccountingSubjectId
());
this
.
setAccountingSubjectName
(
accountingSubject
.
getName
());
this
.
setAccountingSubjectName
(
accountingSubject
.
getName
());
this
.
setAccountingSubjectNo
(
accountingSubject
.
getSubjectNo
());
this
.
setAccountingSubjectNo
(
accountingSubject
.
getSubjectNo
());
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