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
27f4f995
Commit
27f4f995
authored
Oct 14, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
217940f3
9cb1d7ff
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
82 additions
and
85 deletions
+82
-85
TCertRecordServiceImpl.java
...v1/yifu/archives/service/impl/TCertRecordServiceImpl.java
+6
-3
TSalaryAccountServiceImpl.java
...1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
+1
-15
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+65
-61
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+10
-6
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCertRecordServiceImpl.java
View file @
27f4f995
...
...
@@ -73,7 +73,8 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
TEmployeeContractInfo
first
=
contractInfoMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
TWO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
)
.
ne
(
TEmployeeContractInfo:
:
getSituation
,
"终止"
)
.
ne
(
TEmployeeContractInfo:
:
getSituation
,
"作废"
)
.
eq
(
TEmployeeContractInfo:
:
getEmpIdcard
,
employeeInfo
.
getEmpIdcard
())
.
orderByAsc
(
TEmployeeContractInfo:
:
getContractStart
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
...
...
@@ -82,9 +83,11 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
TEmployeeContractInfo
last
=
contractInfoMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
TWO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
)
.
ne
(
TEmployeeContractInfo:
:
getSituation
,
"终止"
)
.
ne
(
TEmployeeContractInfo:
:
getSituation
,
"作废"
)
.
eq
(
TEmployeeContractInfo:
:
getEmpIdcard
,
employeeInfo
.
getEmpIdcard
())
.
orderByDesc
(
TEmployeeContractInfo:
:
getCreateTime
)
.
isNotNull
(
TEmployeeContractInfo:
:
getContractEnd
)
.
orderByDesc
(
TEmployeeContractInfo:
:
getContractEnd
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
TCertRecordVo
vo
=
new
TCertRecordVo
();
vo
.
setEmpIdcard
(
project
.
getEmpIdcard
());
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @
27f4f995
...
...
@@ -64,21 +64,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
*/
@Override
public
IPage
<
TSalaryAccount
>
getTSalaryAccountPage
(
Page
<
TSalaryAccount
>
page
,
TSalaryAccountSearchVo
tSalaryAccount
)
{
long
pageCount
=
baseMapper
.
getTSalaryAccountPageCountDiy
(
tSalaryAccount
);
page
.
setTotal
(
pageCount
);
if
(
pageCount
>
0L
)
{
page
.
setPages
((
long
)
Math
.
ceil
(
1.0
*
pageCount
/
page
.
getSize
()));
}
if
(
page
.
getCurrent
()
<
1
)
{
page
.
setCurrent
(
1L
);
}
if
(
page
.
getSize
()
<
1
)
{
page
.
setSize
(
10L
);
}
if
(
pageCount
>
((
page
.
getCurrent
()
-
1
)
*
page
.
getSize
()))
{
page
.
setRecords
(
baseMapper
.
getTSalaryAccountPageDiy
(
tSalaryAccount
,
(
page
.
getCurrent
()
-
1
)
*
page
.
getSize
(),
page
.
getSize
()));
}
return
page
;
return
baseMapper
.
getTSalaryAccountPage
(
page
,
tSalaryAccount
);
}
/**
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
27f4f995
...
...
@@ -526,71 +526,75 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
//报账表
List
<
EkpSalaryParamVo
>
ekpList
=
salaryAccountService
.
getEkpSalaryParamList
(
id
);
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
!=
null
&&
ekpList
!=
null
&&
!
ekpList
.
isEmpty
())
{
boolean
sendStatus
=
true
;
String
sendBack
;
List
<
TSalaryAccount
>
accountList
=
new
ArrayList
<>();
TSalaryAccount
account
;
Date
sendTime
=
new
Date
();
String
nowMonth
=
DateUtil
.
addMonth
(
0
);
EkpSalaryParam
salaryParam
;
for
(
EkpSalaryParamVo
sendParam
:
ekpList
)
{
salaryParam
=
new
EkpSalaryParam
();
BeanUtils
.
copyProperties
(
sendParam
,
salaryParam
);
// 转化报账表的参数
account
=
new
TSalaryAccount
();
account
.
setId
(
sendParam
.
getFd_3b10af838eab5c
());
// 社保
if
(
Common
.
isNotNull
(
sendParam
.
getFd_3b16ce48a9735c
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
getFd_3b16ce48a9735c
()))
{
doSendForecastSocialToEkp
(
sendParam
,
s
);
}
// 公积金
if
(
Common
.
isNotNull
(
sendParam
.
getFd_3b16ce4b7fc42a
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
getFd_3b16ce4b7fc42a
()))
{
doSendForecastFundToEkp
(
sendParam
,
s
);
}
sendBack
=
ekpSalaryUtil
.
sendToEKP
(
salaryParam
);
if
(
Common
.
isEmpty
(
sendBack
)
||
sendBack
.
length
()
!=
32
)
{
if
(
user
!=
null
)
{
if
(
ekpList
!=
null
&&
!
ekpList
.
isEmpty
()){
boolean
sendStatus
=
true
;
String
sendBack
;
List
<
TSalaryAccount
>
accountList
=
new
ArrayList
<>();
TSalaryAccount
account
;
Date
sendTime
=
new
Date
();
String
nowMonth
=
DateUtil
.
addMonth
(
0
);
EkpSalaryParam
salaryParam
;
for
(
EkpSalaryParamVo
sendParam
:
ekpList
)
{
salaryParam
=
new
EkpSalaryParam
();
BeanUtils
.
copyProperties
(
sendParam
,
salaryParam
);
// 转化报账表的参数
account
=
new
TSalaryAccount
();
account
.
setId
(
sendParam
.
getFd_3b10af838eab5c
());
// 社保
if
(
Common
.
isNotNull
(
sendParam
.
getFd_3b16ce48a9735c
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
getFd_3b16ce48a9735c
()))
{
doSendForecastSocialToEkp
(
sendParam
,
s
);
}
// 公积金
if
(
Common
.
isNotNull
(
sendParam
.
getFd_3b16ce4b7fc42a
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
getFd_3b16ce4b7fc42a
()))
{
doSendForecastFundToEkp
(
sendParam
,
s
);
}
sendBack
=
ekpSalaryUtil
.
sendToEKP
(
salaryParam
);
if
(
Common
.
isEmpty
(
sendBack
)
||
sendBack
.
length
()
!=
32
)
{
sendBack
=
ekpSalaryUtil
.
sendToEKP
(
salaryParam
);
}
account
.
setSendTime
(
sendTime
);
account
.
setSendUser
(
user
.
getId
());
account
.
setSendUserName
(
user
.
getNickname
());
if
(
Common
.
isNotNull
(
sendBack
)
&&
sendBack
.
length
()
==
32
)
{
account
.
setSendStatus
(
CommonConstants
.
ONE_STRING
);
account
.
setSendMonth
(
nowMonth
);
account
.
setEkpId
(
sendBack
);
}
else
{
sendStatus
=
false
;
TSendEkpError
error
=
new
TSendEkpError
();
error
.
setCreateTime
(
new
Date
());
error
.
setCreateDay
(
DateUtil
.
getThisDay
());
error
.
setType
(
CommonConstants
.
ONE_STRING
);
error
.
setCreateUserName
(
s
.
getCreateName
());
error
.
setLinkId
(
account
.
getId
());
error
.
setTitle
(
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
HttpDaprUtil
.
invokeMethodPost
(
socialProperties
.
getAppUrl
(),
socialProperties
.
getAppId
()
,
"/tsendekperror/inner/saveError"
,
error
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
accountList
.
add
(
account
);
}
account
.
setSendTime
(
sendTime
);
account
.
setSendUser
(
user
.
getId
());
account
.
setSendUserName
(
user
.
getNickname
());
if
(
Common
.
isNotNull
(
sendBack
)
&&
sendBack
.
length
()
==
32
)
{
account
.
setSendStatus
(
CommonConstants
.
ONE_STRING
);
account
.
setSendMonth
(
nowMonth
);
account
.
setEkpId
(
sendBack
);
salaryAccountService
.
updateBatchById
(
accountList
);
if
(
sendStatus
)
{
s
.
setSendTime
(
new
Date
());
s
.
setSendMonth
(
DateUtil
.
addMonth
(
0
));
s
.
setStatus
(
SalaryConstants
.
STATUS
[
3
]);
this
.
updateById
(
s
);
// 添加流程进展明细
this
.
saveRecordLog
(
s
,
user
,
CommonConstants
.
ZERO_STRING
,
"发送数字化平台-成功"
);
return
R
.
ok
(
"发送成功!"
);
}
else
{
sendStatus
=
false
;
TSendEkpError
error
=
new
TSendEkpError
();
error
.
setCreateTime
(
new
Date
());
error
.
setCreateDay
(
DateUtil
.
getThisDay
());
error
.
setType
(
CommonConstants
.
ONE_STRING
);
error
.
setCreateUserName
(
s
.
getCreateName
());
error
.
setLinkId
(
account
.
getId
());
error
.
setTitle
(
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
HttpDaprUtil
.
invokeMethodPost
(
socialProperties
.
getAppUrl
(),
socialProperties
.
getAppId
()
,
"/tsendekperror/inner/saveError"
,
error
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
s
.
setStatus
(
SalaryConstants
.
STATUS
[
10
]);
this
.
updateById
(
s
);
// 添加流程进展明细
this
.
saveRecordLog
(
s
,
user
,
CommonConstants
.
ONE_STRING
,
"发送数字化平台-失败"
);
return
R
.
ok
(
"发送失败!"
);
}
accountList
.
add
(
account
);
}
salaryAccountService
.
updateBatchById
(
accountList
);
if
(
sendStatus
)
{
s
.
setSendTime
(
new
Date
());
s
.
setSendMonth
(
DateUtil
.
addMonth
(
0
));
s
.
setStatus
(
SalaryConstants
.
STATUS
[
3
]);
this
.
updateById
(
s
);
// 添加流程进展明细
this
.
saveRecordLog
(
s
,
user
,
CommonConstants
.
ZERO_STRING
,
"发送数字化平台-成功"
);
return
R
.
ok
(
"发送成功!"
);
}
else
{
s
.
setStatus
(
SalaryConstants
.
STATUS
[
10
]);
this
.
updateById
(
s
);
// 添加流程进展明细
this
.
saveRecordLog
(
s
,
user
,
CommonConstants
.
ONE_STRING
,
"发送数字化平台-失败"
);
return
R
.
ok
(
"发送失败!"
);
}
else
{
return
R
.
ok
(
"无数据可发送!"
);
}
}
else
{
return
R
.
failed
(
"请登录!"
);
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
27f4f995
...
...
@@ -348,9 +348,11 @@
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_salary_account a
LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
<where>
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
a.DELETE_FLAG = 0
and not EXISTS (
select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
)
<include
refid=
"tSalaryAccount_where"
/>
<if
test=
"tSalaryAccount.authSql != null and tSalaryAccount.authSql.trim() != ''"
>
${tSalaryAccount.authSql}
...
...
@@ -578,9 +580,10 @@
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_salary_account a
LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
<where>
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
a.DELETE_FLAG = 0 and not EXISTS (
select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
)
<include
refid=
"where_export"
/>
<if
test=
"searchVo.authSql != null and searchVo.authSql.trim() != ''"
>
${searchVo.authSql}
...
...
@@ -617,9 +620,10 @@
SELECT
count(1)
FROM t_salary_account a
LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
<where>
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
a.DELETE_FLAG = 0 and not EXISTS (
select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
)
<include
refid=
"where_export"
/>
<if
test=
"searchVo.authSql != null and searchVo.authSql.trim() != ''"
>
${searchVo.authSql}
...
...
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