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
aa6e8234
Commit
aa6e8234
authored
Aug 04, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化-预估库获取基数配置
parent
34a67cd5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
27 deletions
+25
-27
TForecastLibraryService.java
.../plus/v1/yifu/social/service/TForecastLibraryService.java
+6
-0
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+19
-27
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TForecastLibraryService.java
View file @
aa6e8234
...
@@ -42,6 +42,12 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
...
@@ -42,6 +42,12 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
*/
*/
IPage
<
TForecastLibrary
>
getTForecastLibraryPage
(
Page
<
TForecastLibrary
>
page
,
TForecastLibrary
tForecastLibrary
);
IPage
<
TForecastLibrary
>
getTForecastLibraryPage
(
Page
<
TForecastLibrary
>
page
,
TForecastLibrary
tForecastLibrary
);
/**
* @Description: 批量导出
* @Author: hgw
* @Date: 2022/8/4 9:34
* @return: void
**/
void
listExport
(
HttpServletResponse
response
,
TForecastLibrary
searchVo
);
void
listExport
(
HttpServletResponse
response
,
TForecastLibrary
searchVo
);
/**
/**
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
aa6e8234
...
@@ -312,13 +312,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -312,13 +312,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
String
sfMapKey
;
String
sfMapKey
;
if
(
Common
.
isNotNull
(
librarySocialList
))
{
if
(
Common
.
isNotNull
(
librarySocialList
))
{
for
(
TForecastLibrary
library
:
librarySocialList
)
{
for
(
TForecastLibrary
library
:
librarySocialList
)
{
sfMapKey
=
this
.
getMapKey
(
library
.
getEmpIdcard
(),
library
.
getSettleDomainId
(),
library
.
getSocialPayMonth
(),
library
.
getSocialCreateMonth
());
sfMapKey
=
this
.
getMapKey
(
library
.
getEmpIdcard
(),
library
.
getSettleDomainId
(),
library
.
getSocialPayMonth
(),
library
.
getSocialCreateMonth
()
,
CommonConstants
.
ZERO_STRING
);
socialHistoryMap
.
put
(
sfMapKey
,
library
);
socialHistoryMap
.
put
(
sfMapKey
,
library
);
}
}
}
}
if
(
Common
.
isNotNull
(
libraryFundList
))
{
if
(
Common
.
isNotNull
(
libraryFundList
))
{
for
(
TForecastLibrary
library
:
libraryFundList
)
{
for
(
TForecastLibrary
library
:
libraryFundList
)
{
sfMapKey
=
this
.
getMapKey
(
library
.
getEmpIdcard
(),
library
.
getSettleDomainId
(),
library
.
getProvidentPayMonth
(),
library
.
getProvidentCreateMonth
());
sfMapKey
=
this
.
getMapKey
(
library
.
getEmpIdcard
(),
library
.
getSettleDomainId
(),
library
.
getProvidentPayMonth
(),
library
.
getProvidentCreateMonth
()
,
CommonConstants
.
ONE_STRING
);
fundHistoryMap
.
put
(
sfMapKey
,
library
);
fundHistoryMap
.
put
(
sfMapKey
,
library
);
}
}
}
}
...
@@ -326,7 +326,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -326,7 +326,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
if
(
Common
.
isNotNull
(
librarySocialListTemp
))
{
if
(
Common
.
isNotNull
(
librarySocialListTemp
))
{
TForecastLibrary
libraryOld
;
TForecastLibrary
libraryOld
;
for
(
TForecastLibrary
library
:
librarySocialListTemp
)
{
for
(
TForecastLibrary
library
:
librarySocialListTemp
)
{
sfMapKey
=
this
.
getMapKey
(
library
.
getEmpIdcard
(),
library
.
getSettleDomainId
(),
library
.
getSocialPayMonth
(),
library
.
getSocialCreateMonth
());
sfMapKey
=
this
.
getMapKey
(
library
.
getEmpIdcard
(),
library
.
getSettleDomainId
(),
library
.
getSocialPayMonth
(),
library
.
getSocialCreateMonth
()
,
CommonConstants
.
ZERO_STRING
);
libraryOld
=
socialPushMap
.
get
(
sfMapKey
);
libraryOld
=
socialPushMap
.
get
(
sfMapKey
);
if
(
libraryOld
!=
null
)
{
if
(
libraryOld
!=
null
)
{
this
.
getChangeAddData
(
libraryOld
,
library
);
this
.
getChangeAddData
(
libraryOld
,
library
);
...
@@ -338,7 +338,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -338,7 +338,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
if
(
Common
.
isNotNull
(
libraryFundListTemp
))
{
if
(
Common
.
isNotNull
(
libraryFundListTemp
))
{
TForecastLibrary
libraryOld
;
TForecastLibrary
libraryOld
;
for
(
TForecastLibrary
library
:
libraryFundListTemp
)
{
for
(
TForecastLibrary
library
:
libraryFundListTemp
)
{
sfMapKey
=
this
.
getMapKey
(
library
.
getEmpIdcard
(),
library
.
getSettleDomainId
(),
library
.
getProvidentPayMonth
(),
library
.
getProvidentCreateMonth
());
sfMapKey
=
this
.
getMapKey
(
library
.
getEmpIdcard
(),
library
.
getSettleDomainId
(),
library
.
getProvidentPayMonth
(),
library
.
getProvidentCreateMonth
()
,
CommonConstants
.
ONE_STRING
);
libraryOld
=
fundPushMap
.
get
(
sfMapKey
);
libraryOld
=
fundPushMap
.
get
(
sfMapKey
);
if
(
libraryOld
!=
null
)
{
if
(
libraryOld
!=
null
)
{
this
.
getChangeAddData
(
libraryOld
,
library
);
this
.
getChangeAddData
(
libraryOld
,
library
);
...
@@ -349,14 +349,22 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -349,14 +349,22 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
}
}
}
/**
* @param type 类型:0社保,1公积金
* @Description:
* @Author: hgw
* @Date: 2022/8/4 9:50
* @return: java.lang.String
**/
private
String
getMapKey
(
String
empIdcard
,
String
settleDomainId
private
String
getMapKey
(
String
empIdcard
,
String
settleDomainId
,
String
socialPayMonth
,
String
socialCreateMonth
)
{
,
String
socialPayMonth
,
String
socialCreateMonth
,
String
type
)
{
StringBuilder
sfMapKey
;
StringBuilder
sfMapKey
;
sfMapKey
=
new
StringBuilder
(
empIdcard
);
sfMapKey
=
new
StringBuilder
(
empIdcard
);
// 获取key
// 获取key
sfMapKey
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
settleDomainId
);
sfMapKey
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
settleDomainId
);
sfMapKey
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
socialPayMonth
);
sfMapKey
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
socialPayMonth
);
sfMapKey
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
socialCreateMonth
);
sfMapKey
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
socialCreateMonth
);
sfMapKey
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
type
);
return
sfMapKey
.
toString
();
return
sfMapKey
.
toString
();
}
}
...
@@ -438,26 +446,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -438,26 +446,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
}
}
}
/**
* @Description: 填充key的基本信息
* @Author: hgw
* @Date: 2022-7-19 15:30:45
* @return: void
**/
private
void
getMapKey
(
StringBuilder
mapKeyBuilder
,
String
socialProvince
,
String
socialCity
,
String
socialTown
)
{
if
(
Common
.
isNotNull
(
socialProvince
))
{
mapKeyBuilder
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
socialProvince
);
}
if
(
Common
.
isNotNull
(
socialCity
))
{
mapKeyBuilder
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
socialCity
);
}
else
if
(
Common
.
isNotNull
(
socialProvince
)
&&
"12"
.
equals
(
socialProvince
))
{
mapKeyBuilder
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
"135"
);
}
if
(
Common
.
isNotNull
(
socialTown
))
{
mapKeyBuilder
.
append
(
CommonConstants
.
DOWN_LINE_STRING
).
append
(
socialTown
);
}
}
private
void
initSocialLibary
(
String
diffType
,
String
payMonth
,
Map
<
String
,
TForecastLibrary
>
saveLibraryMap
private
void
initSocialLibary
(
String
diffType
,
String
payMonth
,
Map
<
String
,
TForecastLibrary
>
saveLibraryMap
,
TSocialFundInfo
tSocialInfo
,
boolean
isReduceFund
,
HashMap
<
String
,
TAgentConfig
>
agentConfigMap
,
TSocialFundInfo
tSocialInfo
,
boolean
isReduceFund
,
HashMap
<
String
,
TAgentConfig
>
agentConfigMap
,
TForecastLibrary
lib
,
String
sfMapKey
,
TForecastLibrary
historyLibrary
)
{
,
TForecastLibrary
lib
,
String
sfMapKey
,
TForecastLibrary
historyLibrary
)
{
...
@@ -1125,6 +1113,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -1125,6 +1113,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
}
// 大病取值方式:1 按比例 按派单的基数和比例来
// 大病取值方式:1 按比例 按派单的基数和比例来
if
(
CommonConstants
.
ONE_STRING
.
equals
(
sysBaseSetInfo
.
getValueType
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
sysBaseSetInfo
.
getValueType
()))
{
library
.
setUnitBigailmentBase
(
baseLimit
);
library
.
setUnitBigailmentPro
(
sysBaseSetInfo
.
getPayCompanyPro
());
library
.
setPersonalBigailmentBase
(
baseLimit
);
library
.
setPersonalBigailmentPro
(
sysBaseSetInfo
.
getPayPersonalPro
());
library
.
setPersonalBigailmentFee
(
BigDecimalUtils
.
safeMultiply
(
library
.
setPersonalBigailmentFee
(
BigDecimalUtils
.
safeMultiply
(
baseLimit
,
baseLimit
,
sysBaseSetInfo
.
getPayPersonalPro
(),
sysBaseSetInfo
.
getPayPersonalPro
(),
...
@@ -1744,7 +1736,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -1744,7 +1736,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
for
(
TSocialFundInfo
tSocialInfo
:
socialInfoList
)
{
for
(
TSocialFundInfo
tSocialInfo
:
socialInfoList
)
{
minStartDate
=
this
.
getMinDate
(
tSocialInfo
);
minStartDate
=
this
.
getMinDate
(
tSocialInfo
);
createMonth
=
ServiceUtil
.
initCreateMonth
(
tSocialInfo
.
getCreateTime
(),
payMonth
);
createMonth
=
ServiceUtil
.
initCreateMonth
(
tSocialInfo
.
getCreateTime
(),
payMonth
);
sfMapKey
=
this
.
getMapKey
(
tSocialInfo
.
getEmpIdcard
(),
tSocialInfo
.
getSettleDomain
(),
payMonth
,
createMonth
);
sfMapKey
=
this
.
getMapKey
(
tSocialInfo
.
getEmpIdcard
(),
tSocialInfo
.
getSettleDomain
(),
payMonth
,
createMonth
,
CommonConstants
.
ZERO_STRING
);
// 变更:已推送的,计算变更值
// 变更:已推送的,计算变更值
tForecastLibrary
=
socialPushMap
.
get
(
sfMapKey
);
tForecastLibrary
=
socialPushMap
.
get
(
sfMapKey
);
...
@@ -1777,7 +1769,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -1777,7 +1769,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
if
(
Common
.
isNotNull
(
fundList
))
{
if
(
Common
.
isNotNull
(
fundList
))
{
for
(
TSocialFundInfo
providentFund
:
fundList
)
{
for
(
TSocialFundInfo
providentFund
:
fundList
)
{
createMonth
=
ServiceUtil
.
initCreateMonth
(
providentFund
.
getCreateTime
(),
payMonth
);
createMonth
=
ServiceUtil
.
initCreateMonth
(
providentFund
.
getCreateTime
(),
payMonth
);
sfMapKey
=
this
.
getMapKey
(
providentFund
.
getEmpIdcard
(),
providentFund
.
getSettleDomainFund
(),
payMonth
,
createMonth
);
sfMapKey
=
this
.
getMapKey
(
providentFund
.
getEmpIdcard
(),
providentFund
.
getSettleDomainFund
(),
payMonth
,
createMonth
,
CommonConstants
.
ONE_STRING
);
// 变更:已推送的,计算变更值
// 变更:已推送的,计算变更值
tForecastLibrary
=
fundPushMap
.
get
(
sfMapKey
);
tForecastLibrary
=
fundPushMap
.
get
(
sfMapKey
);
diffType
=
SocialConstants
.
DIFF_TYPE_ONE
;
diffType
=
SocialConstants
.
DIFF_TYPE_ONE
;
...
...
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