Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
6b05cf3c
Commit
6b05cf3c
authored
Oct 18, 2024
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 拉E人事出差数据接口调整
parent
82db8910
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
2 deletions
+47
-2
EkpQiwiChuchai.java
.../cloud/plus/v1/yifu/permission/entity/EkpQiwiChuchai.java
+15
-1
QiWeiController.java
.../cloud/plus/v1/permission/controller/QiWeiController.java
+19
-0
QiWeiServiceImpl.java
...oud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
+13
-1
No files found.
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/EkpQiwiChuchai.java
View file @
6b05cf3c
...
...
@@ -82,4 +82,18 @@ public class EkpQiwiChuchai {
@Schema
(
description
=
"数据源"
)
private
String
fdDataSource
;
}
\ No newline at end of file
// cyx-mvp1.7.0 新增字段:关联差旅费报销编号、岗位级别、业务条线归属、代为发起随行人员出差流程
@Schema
(
description
=
"关联差旅费报销编号"
)
private
String
fdSettleFormCode
;
@Schema
(
description
=
"代为发起随行人员出差流程(是,否)"
)
private
String
fdPersonTravelProcess
;
@Schema
(
description
=
"岗位级别"
)
private
String
fdPositionLevel
;
@Schema
(
description
=
"业务条线归属"
)
private
String
fdBusinessLine
;
}
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/controller/QiWeiController.java
View file @
6b05cf3c
...
...
@@ -133,4 +133,23 @@ public class QiWeiController {
return
wxSalaryService
.
getQiWeiZhaoPinAndSave
(
startTime
,
endTime
);
}
/**
* 手动同步当日HCM的E人事审批里的出差
* @author chenyuxi
* @date 2024-10-17
* @since 1.9.0
**/
@Operation
(
summary
=
"手动同步当日HCM的E人事审批里的出差--EKP调用接口"
)
@SysLog
(
"手动同步当日HCM的E人事审批里的出差--EKP调用接口"
)
@GetMapping
(
"/getEChuchaiInfo"
)
public
R
<
String
>
getEChuchaiInfo
()
{
String
startDay
=
DateUtil
.
addDay
(
0
);
String
endDay
=
DateUtil
.
addDay
(
0
);
R
<
List
<
EkpQiwiChuchai
>>
returnR
=
wxSalaryService
.
getQiWeiChuChaiAndSave
(
startDay
,
endDay
,
2
);
if
(
returnR
!=
null
&&
returnR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
return
R
.
ok
();
}
return
R
.
failed
();
}
}
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
View file @
6b05cf3c
...
...
@@ -379,7 +379,8 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
}
reimburse
.
setFdApplyUserName
(
datas
.
getString
(
"applyName"
));
reimburse
.
setFdSpNo
(
datas
.
getString
(
"flowId"
));
reimburse
.
setFdStatus
(
CommonConstants
.
ZERO_STRING
);
// cyx-mvp1.7.0: 关联状态默认为"未关联"
reimburse
.
setFdStatus
(
"未关联"
);
reimburse
.
setCreateTime
(
LocalDateTime
.
now
());
reimburse
.
setFdApplyUserDept
(
datas
.
getString
(
"applyDeptName"
));
if
(
Common
.
isNotNull
(
datas
.
getString
(
"startTimeFormat"
)))
{
...
...
@@ -459,6 +460,17 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
reimburse
.
setFdAddressLevel
(
formData
.
getString
(
"出差地点级别"
));
reimburse
.
setFdJiaoTong
(
formData
.
getString
(
"交通补助"
));
reimburse
.
setFdCanYin
(
formData
.
getString
(
"餐饮补助"
));
// cyx-mvp1.7.0 新增字段:岗位级别、业务条线归属、代为发起随行人员出差流程
reimburse
.
setFdPositionLevel
(
formData
.
getString
(
"岗位级别"
));
reimburse
.
setFdBusinessLine
(
formData
.
getString
(
"业务条线归属"
));
// 代为发起随行人员出差流程,标识含义:1:是;2:否
if
(
CommonConstants
.
ONE_STRING
.
equals
(
formData
.
getString
(
"代为发起随行人员出差流程"
))){
reimburse
.
setFdPersonTravelProcess
(
formData
.
getString
(
"是"
));
}
if
(
CommonConstants
.
TWO_STRING
.
equals
(
formData
.
getString
(
"代为发起随行人员出差流程"
))){
reimburse
.
setFdPersonTravelProcess
(
formData
.
getString
(
"否"
));
}
}
cpList
.
add
(
reimburse
);
}
...
...
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