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
0fc844cb
Commit
0fc844cb
authored
Apr 18, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop'
parents
0fe21cb8
283f9107
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
QiWeiServiceImpl.java
...oud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
+4
-1
No files found.
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
View file @
0fc844cb
...
...
@@ -83,6 +83,7 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
List
<
EkpQiwiChuchai
>
returnCpList
=
new
ArrayList
<>();
this
.
getCostPaymentListByMonth
(
startTime
,
endTime
,
cpAllList
);
log
.
error
(
"1拉取企业微信出差数据cpAllList.size()="
+
cpAllList
.
size
());
if
(!
cpAllList
.
isEmpty
())
{
for
(
EkpQiwiChuchai
cp
:
cpAllList
)
{
if
(
cpMap
.
get
(
cp
.
getFdSpNo
())
==
null
)
{
...
...
@@ -90,6 +91,7 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
}
}
}
log
.
error
(
"1拉取企业微信出差数据returnCpList.size()="
+
returnCpList
.
size
());
// 填充详情
if
(!
returnCpList
.
isEmpty
())
{
log
.
error
(
"拉取企业微信出差数据:"
+
returnCpList
.
size
()+
" 条,开始循环拉取明细!"
);
...
...
@@ -135,6 +137,7 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
**/
private
R
<
List
<
EkpQiwiChuchai
>>
getTStatisticsProjectReimburseListByWx
(
String
startTime
,
String
endTime
)
{
String
accessToken
=
wxConfig
.
getReimbursementToken
(
restTemplate
);
log
.
error
(
"1拉取企业微信出差数据accessToken="
+
accessToken
);
JSONObject
json
=
new
JSONObject
();
List
<
Map
<
String
,
String
>>
paramList
=
new
ArrayList
<>();
Map
<
String
,
String
>
paramMap
=
new
HashMap
<>();
...
...
@@ -156,7 +159,7 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
headers
.
add
(
"Accept"
,
MediaType
.
APPLICATION_JSON
.
toString
());
HttpEntity
<
String
>
formEntity
=
new
HttpEntity
<>(
json
.
toString
(),
headers
);
String
dataResultList
=
restTemplate
.
postForEntity
(
SecurityConstants
.
WX_GET_APPROVAL_LIST
,
formEntity
,
String
.
class
,
accessToken
).
getBody
();
log
.
error
(
"1拉取企业微信出差数据dataResultList="
+
dataResultList
);
if
(
Common
.
isEmpty
(
dataResultList
))
{
throw
new
AuthenticationServiceException
(
"获取企业微信审批数据失败"
);
}
...
...
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