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
2574e48f
Commit
2574e48f
authored
Oct 06, 2021
by
liyanlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、修改4k费用系统地址;
2、审核流程变更bug fix。
parent
9cccfde8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
CostApi4kController.java
...blt/other/module/cost/controller/CostApi4kController.java
+1
-1
GeneralManagerCheckState.java
...cost/service/impl/costcheck/GeneralManagerCheckState.java
+3
-1
HrCheckState.java
...ther/module/cost/service/impl/costcheck/HrCheckState.java
+2
-2
No files found.
cost-service/src/main/java/com/blt/other/module/cost/controller/CostApi4kController.java
View file @
2574e48f
...
@@ -30,7 +30,7 @@ public class CostApi4kController {
...
@@ -30,7 +30,7 @@ public class CostApi4kController {
@Resource
@Resource
private
RestTemplate
restTemplate
;
private
RestTemplate
restTemplate
;
private
final
static
String
BASE_URL
=
"https://
oa.4kmiles
.com/costApi/purchase/other"
;
private
final
static
String
BASE_URL
=
"https://
fee.infisell
.com/costApi/purchase/other"
;
@ApiOperation
(
"审核回调地址"
)
@ApiOperation
(
"审核回调地址"
)
@PostMapping
(
value
=
"/purchasing/ApplyCallbackUrl"
,
consumes
=
"application/json"
)
@PostMapping
(
value
=
"/purchasing/ApplyCallbackUrl"
,
consumes
=
"application/json"
)
...
...
cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/GeneralManagerCheckState.java
View file @
2574e48f
...
@@ -161,7 +161,9 @@ public class GeneralManagerCheckState extends CostState {
...
@@ -161,7 +161,9 @@ public class GeneralManagerCheckState extends CostState {
return
true
;
return
true
;
}
}
CostTypeDomain
costTypeDomain
=
costTypeDao
.
selectByNo
(
costDomain
.
getTypeNo
());
CostTypeDomain
costTypeDomain
=
costTypeDao
.
selectByNo
(
costDomain
.
getTypeNo
());
if
(
costTypeDomain
.
getTypeName
().
contains
(
"工资"
)
||
costTypeDomain
.
getTypeName
().
contains
(
"物流"
)||
costTypeDomain
.
getTypeName
().
contains
(
"社保费"
))
{
if
(
costTypeDomain
.
getTypeName
().
contains
(
"工资"
)
||
costTypeDomain
.
getTypeName
().
contains
(
"物流"
)
||
costTypeDomain
.
getTypeName
().
contains
(
"社保费"
)
||
costTypeDomain
.
getTypeName
().
contains
(
"公积金"
))
{
return
true
;
return
true
;
}
}
return
false
;
return
false
;
...
...
cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/HrCheckState.java
View file @
2574e48f
...
@@ -60,7 +60,7 @@ public class HrCheckState extends CostState {
...
@@ -60,7 +60,7 @@ public class HrCheckState extends CostState {
//如果不需要审核 直接通过
//如果不需要审核 直接通过
if
(!
costTemplate
.
shouldHrCheck
(
costDomain
))
{
if
(!
costTemplate
.
shouldHrCheck
(
costDomain
))
{
costDomain
.
setCostStatus
(
CostDomain
.
STATUS_
FINANCIAL
_CHECK
);
costDomain
.
setCostStatus
(
CostDomain
.
STATUS_
MANAGER
_CHECK
);
costDomain
.
setLastModifyDate
(
LocalDateTime
.
now
());
costDomain
.
setLastModifyDate
(
LocalDateTime
.
now
());
costDao
.
updateById
(
costDomain
);
costDao
.
updateById
(
costDomain
);
...
@@ -82,7 +82,7 @@ public class HrCheckState extends CostState {
...
@@ -82,7 +82,7 @@ public class HrCheckState extends CostState {
.
costNo
(
costDomain
.
getCostNo
())
.
costNo
(
costDomain
.
getCostNo
())
.
isPassed
(
true
)
.
isPassed
(
true
)
.
build
();
.
build
();
costDomain
.
setCostStatus
(
CostDomain
.
STATUS_
FINANCIAL
_CHECK
);
costDomain
.
setCostStatus
(
CostDomain
.
STATUS_
MANAGER
_CHECK
);
costDomain
.
setLastModifyDate
(
LocalDateTime
.
now
());
costDomain
.
setLastModifyDate
(
LocalDateTime
.
now
());
costDao
.
updateById
(
costDomain
);
costDao
.
updateById
(
costDomain
);
costLogService
.
save
(
costDomain
.
getCostNo
(),
currentUserId
,
"行政审核通过"
,
CostLogDomain
.
HR_PASS
);
costLogService
.
save
(
costDomain
.
getCostNo
(),
currentUserId
,
"行政审核通过"
,
CostLogDomain
.
HR_PASS
);
...
...
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