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
6eb9d611
Commit
6eb9d611
authored
11 months ago
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'MVP1.6.2' into MVP1.6.3
parents
e8b1f36e
283f9107
master
MVP-1.7.3-shuiyou
MVP-1.7.7-Friend
MVP1.6.10
MVP1.6.11
MVP1.6.3-HCM
MVP1.6.4
MVP1.6.5
MVP1.6.6
MVP1.6.7
MVP1.6.8
MVP1.6.9
MVP1.7.0
MVP1.7.1
MVP1.7.2
MVP1.7.3
MVP1.7.3-wxgz
MVP1.7.4
MVP1.7.5
MVP1.7.6
MVP1.7.7
MVP1.7.8
MVP1.7.9
MVP1.7.9-fxj
develop
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
2 deletions
+28
-2
QiWeiServiceImpl.java
...oud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
+4
-1
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+23
-0
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+1
-1
No files found.
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
View file @
6eb9d611
...
...
@@ -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
(
"获取企业微信审批数据失败"
);
}
...
...
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
6eb9d611
...
...
@@ -689,6 +689,17 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
List
<
TSalaryStandardOriginalDetail
>
detailList
=
tSalaryStandardOriginalDetailService
.
getTSalaryStandardOriginalDetailByOrgId
(
originalId
);
Map
<
String
,
TSalaryStandardOriginalDetail
>
detailMap
=
new
HashMap
<>();
for
(
TSalaryStandardOriginalDetail
detail
:
detailList
)
{
if
(
Common
.
isEmpty
(
detail
.
getModelName
())
&&
(
"是否新员工(默认否)"
.
equals
(
detail
.
getExcelName
())
||
"开户行总行"
.
equals
(
detail
.
getExcelName
())
||
"开户行省"
.
equals
(
detail
.
getExcelName
())
||
"开户行市"
.
equals
(
detail
.
getExcelName
())
||
"开户行支行"
.
equals
(
detail
.
getExcelName
())
||
"银行卡号"
.
equals
(
detail
.
getExcelName
())
||
"手机号码"
.
equals
(
detail
.
getExcelName
())
||
"计税月份"
.
equals
(
detail
.
getExcelName
())))
{
detail
.
setModelName
(
detail
.
getExcelName
());
}
detailMap
.
put
(
String
.
valueOf
(
detail
.
getColumnNo
()),
detail
);
}
//对前端传递的文件进行校验
...
...
@@ -724,6 +735,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
}
if
(
vo
.
getTitleList
()
!=
null
&&
!
vo
.
getTitleList
().
isEmpty
())
{
ExcelColumnVo
title
;
TSalaryStandardOriginalDetail
detail
;
for
(
int
i
=
0
;
i
<
vo
.
getTitleList
().
size
();
i
++)
{
title
=
vo
.
getTitleList
().
get
(
i
);
if
(
Common
.
isNotNull
(
title
.
getContent
()))
{
...
...
@@ -739,6 +751,17 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
return
R
.
failed
(
"未找到对应配置的表头,请核实导入的原表信息后,重新尝试!"
);
//return R.failed("表头与导入的不一致,第" + title.getLineNum() + "列表头【" + title.getContent() + "】未找到配置,请先配置表头!");
}
else
if
(
"是否新员工(默认否)"
.
equals
(
title
.
getContent
())
||
"开户行总行"
.
equals
(
title
.
getContent
())
||
"开户行省"
.
equals
(
title
.
getContent
())
||
"开户行市"
.
equals
(
title
.
getContent
())
||
"开户行支行"
.
equals
(
title
.
getContent
())
||
"银行卡号"
.
equals
(
title
.
getContent
())
||
"手机号码"
.
equals
(
title
.
getContent
())
||
"计税月份"
.
equals
(
title
.
getContent
()))
{
detail
=
new
TSalaryStandardOriginalDetail
();
detail
.
setModelName
(
title
.
getContent
());
detailMap
.
put
(
String
.
valueOf
(
title
.
getLineNum
()),
detail
);
}
}
else
if
(!
title
.
getContent
().
equals
(
detailMap
.
get
(
String
.
valueOf
(
title
.
getLineNum
())).
getExcelName
())
&&
(!
"是否新员工(默认否)"
.
equals
(
title
.
getContent
())
...
...
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
6eb9d611
...
...
@@ -146,7 +146,7 @@ public class SalaryAccountUtil implements Serializable {
// 基础的数据行,用于返回信息
int
dataRow
=
2
;
if
(
Common
.
isNotNull
(
vo
.
getDataNum
()))
{
dataRow
+=
vo
.
getDataNum
();
dataRow
=
1
+
vo
.
getDataNum
();
}
for
(
int
i
=
0
;
i
<
rows
;
i
++)
{
annualBonusFlag
=
false
;
...
...
This diff is collapsed.
Click to expand it.
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