Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-cost-system
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
bltdc
dc-cost-system
Commits
4f128a7c
Commit
4f128a7c
authored
Sep 28, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工资系统推送费用单
parent
f6e4fc02
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
12 deletions
+15
-12
CostApiController.java
...om/blt/other/other_cost/controller/CostApiController.java
+2
-2
WageCostDto.java
...c/main/java/com/blt/other/other_cost/dto/WageCostDto.java
+7
-0
CostApiServiceImpl.java
...blt/other/other_cost/service/impl/CostApiServiceImpl.java
+1
-4
CostFileUtil.java
...ain/java/com/blt/other/other_cost/utils/CostFileUtil.java
+4
-5
CostUtils.java
...c/main/java/com/blt/other/other_cost/utils/CostUtils.java
+0
-1
CostDomain.java
...n/java/com/blt/other/other_database/model/CostDomain.java
+1
-0
No files found.
cost-core/src/main/java/com/blt/other/other_cost/controller/CostApiController.java
View file @
4f128a7c
...
@@ -47,8 +47,8 @@ public class CostApiController {
...
@@ -47,8 +47,8 @@ public class CostApiController {
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
result
.
put
(
"success"
,
false
);
result
.
put
(
"success"
,
false
);
result
.
put
(
"message"
,
"生成
物流
付款费用单发生错误:"
+
e
.
getMessage
());
result
.
put
(
"message"
,
"生成
工资系统
付款费用单发生错误:"
+
e
.
getMessage
());
logger
.
error
(
"生成
物流
付款费用单发生错误:"
+
e
.
getMessage
());
logger
.
error
(
"生成
工资系统
付款费用单发生错误:"
+
e
.
getMessage
());
}
}
return
result
;
return
result
;
}
}
...
...
cost-core/src/main/java/com/blt/other/other_cost/dto/WageCostDto.java
View file @
4f128a7c
package
com
.
blt
.
other
.
other_cost
.
dto
;
package
com
.
blt
.
other
.
other_cost
.
dto
;
import
com.alibaba.fastjson.JSON
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
...
@@ -39,4 +42,8 @@ public class WageCostDto {
...
@@ -39,4 +42,8 @@ public class WageCostDto {
//附件外链地址
//附件外链地址
private
String
fileUrl
;
private
String
fileUrl
;
public
static
void
main
(
String
[]
args
)
throws
JsonProcessingException
{
System
.
out
.
println
(
new
ObjectMapper
().
writeValueAsString
(
new
WageCostDto
()));
}
}
}
cost-core/src/main/java/com/blt/other/other_cost/service/impl/CostApiServiceImpl.java
View file @
4f128a7c
...
@@ -178,10 +178,7 @@ public class CostApiServiceImpl implements CostApiService {
...
@@ -178,10 +178,7 @@ public class CostApiServiceImpl implements CostApiService {
companyValueList
.
add
(
66
);
companyValueList
.
add
(
66
);
}
}
}
}
// companyValueList.add(72);
// companyValueList.add(67);
// companyValueList.add(58);
// companyValueList.add(54);
List
<
ManageCostDto
>
manageCostDtoList
=
costDao
.
selectManageCost
(
startDate
,
DateTimeUtil
.
addDays
(
endDate
,
1
),
feeSuperType
,
feeSubType
,
companyValueList
,
companyName
,
departmentName
,
createUserId
,
payUserId
);
List
<
ManageCostDto
>
manageCostDtoList
=
costDao
.
selectManageCost
(
startDate
,
DateTimeUtil
.
addDays
(
endDate
,
1
),
feeSuperType
,
feeSubType
,
companyValueList
,
companyName
,
departmentName
,
createUserId
,
payUserId
);
if
(
manageCostDtoList
!=
null
&&
!
manageCostDtoList
.
isEmpty
())
{
if
(
manageCostDtoList
!=
null
&&
!
manageCostDtoList
.
isEmpty
())
{
...
...
cost-core/src/main/java/com/blt/other/other_cost/utils/CostFileUtil.java
View file @
4f128a7c
...
@@ -51,11 +51,10 @@ public class CostFileUtil {
...
@@ -51,11 +51,10 @@ public class CostFileUtil {
File
dest
=
new
File
(
fileName
);
File
dest
=
new
File
(
fileName
);
// 创建路径
// 创建路径
if
(!
dest
.
getParentFile
().
exists
())
{
if
(!
dest
.
exists
())
{
//文件不存在则创建文件,先创建目录
boolean
b
=
dest
.
getParentFile
().
mkdirs
();
File
dir
=
new
File
(
dest
.
getParent
());
if
(!
b
)
{
dir
.
mkdirs
();
throw
new
RuntimeException
(
"上传附件失败"
);
dest
.
createNewFile
();
}
}
}
InputStream
inputStream
=
new
FileInputStream
(
fileName
);
InputStream
inputStream
=
new
FileInputStream
(
fileName
);
...
...
cost-core/src/main/java/com/blt/other/other_cost/utils/CostUtils.java
View file @
4f128a7c
...
@@ -105,7 +105,6 @@ public class CostUtils {
...
@@ -105,7 +105,6 @@ public class CostUtils {
}
}
String
projectType
=
request
.
getParameter
(
"projectType"
);
String
projectType
=
request
.
getParameter
(
"projectType"
);
String
customerNum
=
request
.
getParameter
(
"customerNum"
);
String
customerNum
=
request
.
getParameter
(
"customerNum"
);
// 封装 CostDomain
// 封装 CostDomain
CostDomain
costDomain
=
new
CostDomain
();
CostDomain
costDomain
=
new
CostDomain
();
costDomain
.
setCostNo
(
costNo
);
costDomain
.
setCostNo
(
costNo
);
...
...
cost-core/src/main/java/com/blt/other/other_database/model/CostDomain.java
View file @
4f128a7c
...
@@ -72,6 +72,7 @@ public class CostDomain {
...
@@ -72,6 +72,7 @@ public class CostDomain {
//客户编号
//客户编号
private
String
customerNum
;
private
String
customerNum
;
public
String
getDic
()
{
public
String
getDic
()
{
return
dic
;
return
dic
;
}
}
...
...
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