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
bed14d4d
Commit
bed14d4d
authored
Mar 13, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
明细接口改造
parent
dc22804e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
26 deletions
+49
-26
EkpSalaryInfoServiceImpl.java
...ud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java
+1
-1
TForecastLibraryMapper.java
...ud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
+4
-0
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+33
-25
TForecastLibraryMapper.xml
...-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
+11
-0
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java
View file @
bed14d4d
...
@@ -140,7 +140,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
...
@@ -140,7 +140,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
//结算月份
//结算月份
salaryInfo
.
setFd_3adfee0690737c
(
salaryParam
.
getFd_3adfee0690737c
());
salaryInfo
.
setFd_3adfee0690737c
(
salaryParam
.
getFd_3adfee0690737c
());
//薪酬申请编号
//薪酬申请编号
salaryInfo
.
setFd_3b
13b1d1ff9678
(
salaryParam
.
getFd_3b3bef19b61c38
());
salaryInfo
.
setFd_3b
3beee3ec7e12
(
salaryParam
.
getFd_3b3bef19b61c38
());
//开户行支行
//开户行支行
salaryInfo
.
setFd_3b73c214e52982
(
salaryParam
.
getFd_3b73de2809465a
());
salaryInfo
.
setFd_3b73c214e52982
(
salaryParam
.
getFd_3b73de2809465a
());
//初始化导入
//初始化导入
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
View file @
bed14d4d
...
@@ -98,4 +98,8 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
...
@@ -98,4 +98,8 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
int
updateForecastStatusById
(
@Param
(
"tForecastLibrary"
)
TForecastLibrary
tForecastLibrary
);
int
updateForecastStatusById
(
@Param
(
"tForecastLibrary"
)
TForecastLibrary
tForecastLibrary
);
List
<
TForecastLibrary
>
selectTForecastSocialInfoList
();
List
<
TForecastLibrary
>
selectTForecastFundInfoList
();
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
bed14d4d
...
@@ -2416,22 +2416,26 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -2416,22 +2416,26 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
.
eq
(
TForecastLibrary:
:
getDataPush
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TForecastLibrary:
:
getDataPush
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TForecastLibrary:
:
getDataType
,
CommonConstants
.
ZERO_INT
));
.
eq
(
TForecastLibrary:
:
getDataType
,
CommonConstants
.
ZERO_INT
));
if
(
count
>
0
)
{
if
(
count
>
0
)
{
Map
<
String
,
TSettleDomainSelectVo
>
selectVoMap
=
this
.
getSelectVoMap
();
Map
<
String
,
TSettleDomainSelectVo
>
selectVoMap
=
this
.
getSelectVoMap
();
//获取所有未推送的社保预估明细数据
//获取所有未推送的社保预估明细数据
List
<
TForecastLibrary
>
unPushInfo
=
null
;
List
<
TForecastLibrary
>
unPushInfo
=
baseMapper
.
selectTForecastSocialInfoList
()
;
int
i
=
(
int
)
Math
.
ceil
((
double
)
count
/
CommonConstants
.
TEN_THOUSAND_INT
);
int
i
=
(
int
)
Math
.
ceil
((
double
)
count
/
CommonConstants
.
TEN_THOUSAND_INT
);
if
(!
unPushInfo
.
isEmpty
())
{
List
<
TForecastLibrary
>
pushList
;
int
k
=
0
;
for
(
int
j
=
0
;
j
<
i
;
j
++)
{
for
(
int
j
=
0
;
j
<
i
;
j
++)
{
unPushInfo
=
baseMapper
.
selectList
(
Wrappers
.<
TForecastLibrary
>
query
().
lambda
()
if
(
j
==
i
-
1
)
{
.
eq
(
TForecastLibrary:
:
getDataPush
,
CommonConstants
.
ZERO_INT
)
pushList
=
unPushInfo
.
subList
(
k
,
unPushInfo
.
size
());
.
eq
(
TForecastLibrary:
:
getDataType
,
CommonConstants
.
ZERO_INT
)
}
else
{
.
last
(
" limit 0, 10000"
));
pushList
=
unPushInfo
.
subList
(
k
,
k
+
1000
);
if
(
Common
.
isNotNull
(
unPushInfo
)){
}
k
=
k
+
1000
;
if
(
Common
.
isNotNull
(
pushList
))
{
//推送数据封装并推送
//推送数据封装并推送
initEkpPushSocialParam
(
unPushInfo
,
true
,
selectVoMap
);
initEkpPushSocialParam
(
pushList
,
true
,
selectVoMap
);
}
}
}
}
}
// unPushInfo.clear();
// selectVoMap.clear();
}
}
}
}
...
@@ -2453,22 +2457,26 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -2453,22 +2457,26 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
.
eq
(
TForecastLibrary:
:
getDataPush
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TForecastLibrary:
:
getDataPush
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TForecastLibrary:
:
getDataType
,
CommonConstants
.
ONE_INT
));
.
eq
(
TForecastLibrary:
:
getDataType
,
CommonConstants
.
ONE_INT
));
if
(
count
>
0
)
{
if
(
count
>
0
)
{
Map
<
String
,
TSettleDomainSelectVo
>
selectVoMap
=
this
.
getSelectVoMap
();
Map
<
String
,
TSettleDomainSelectVo
>
selectVoMap
=
this
.
getSelectVoMap
();
//获取所有未推送的
公积金
预估明细数据
//获取所有未推送的
社保
预估明细数据
List
<
TForecastLibrary
>
unPushInfo
=
null
;
List
<
TForecastLibrary
>
unPushInfo
=
baseMapper
.
selectTForecastFundInfoList
()
;
int
i
=
(
int
)
Math
.
ceil
((
double
)
count
/
CommonConstants
.
TEN_THOUSAND_INT
);
int
i
=
(
int
)
Math
.
ceil
((
double
)
count
/
CommonConstants
.
TEN_THOUSAND_INT
);
if
(!
unPushInfo
.
isEmpty
())
{
List
<
TForecastLibrary
>
pushList
;
int
k
=
0
;
for
(
int
j
=
0
;
j
<
i
;
j
++)
{
for
(
int
j
=
0
;
j
<
i
;
j
++)
{
unPushInfo
=
baseMapper
.
selectList
(
Wrappers
.<
TForecastLibrary
>
query
().
lambda
()
if
(
j
==
i
-
1
)
{
.
eq
(
TForecastLibrary:
:
getDataPush
,
CommonConstants
.
ZERO_INT
)
pushList
=
unPushInfo
.
subList
(
k
,
unPushInfo
.
size
());
.
eq
(
TForecastLibrary:
:
getDataType
,
CommonConstants
.
ONE_INT
)
}
else
{
.
last
(
" limit 0, 10000"
));
pushList
=
unPushInfo
.
subList
(
k
,
k
+
1000
);
if
(
Common
.
isNotNull
(
unPushInfo
)){
}
k
=
k
+
1000
;
if
(
Common
.
isNotNull
(
pushList
))
{
//推送数据封装并推送
//推送数据封装并推送
initEkpPushFundParam
(
unPushInfo
,
true
,
selectVoMap
);
initEkpPushFundParam
(
pushList
,
true
,
selectVoMap
);
}
}
}
}
}
// unPushInfo.clear();
// selectVoMap.clear();
}
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
View file @
bed14d4d
...
@@ -947,4 +947,15 @@
...
@@ -947,4 +947,15 @@
ID = #{tForecastLibrary.id}
ID = #{tForecastLibrary.id}
</update>
</update>
<select
id=
"selectTForecastSocialInfoList"
resultMap=
"tForecastLibraryMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_forecast_library a where a.data_push = 0 and a.data_type = 0
</select>
<select
id=
"selectTForecastFundInfoList"
resultMap=
"tForecastLibraryMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_forecast_library a where a.data_push = 0 and a.data_type = 1
</select>
</mapper>
</mapper>
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