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
12d9832a
Commit
12d9832a
authored
Oct 11, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
社保自动化配置-fxj
parent
60b26040
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
643 additions
and
10 deletions
+643
-10
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+6
-5
SocialDaprUtils.java
.../cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
+3
-2
SysBaseSetInfoVo.java
...m/yifu/cloud/plus/v1/yifu/social/vo/SysBaseSetInfoVo.java
+627
-0
SysBaseSetInfoController.java
...s/v1/yifu/social/controller/SysBaseSetInfoController.java
+7
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
12d9832a
...
...
@@ -41,6 +41,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -1320,18 +1321,18 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
return
R
.
failed
(
"备案基数不可空"
);
}
if
((
CommonConstants
.
ZERO_STRING
.
equals
(
rel
.
getPaymentType
())
||
CommonConstants
.
ONE
_STRING
.
equals
(
rel
.
getPaymentType
()))){
R
<
SysBaseSetInfo
>
resR
=
socialDaprUtils
.
getSocialHouseBaseSet
(
rel
.
getConfigHouseId
());
||
CommonConstants
.
TWO
_STRING
.
equals
(
rel
.
getPaymentType
()))){
R
<
SysBaseSetInfo
Vo
>
resR
=
socialDaprUtils
.
getSocialHouseBaseSet
(
rel
.
getConfigHouseId
());
if
(
Common
.
isNotNull
(
resR
)
&&
resR
.
getData
()
!=
null
)
{
SysBaseSetInfo
setInfo
=
resR
.
getData
();
SysBaseSetInfo
Vo
setInfo
=
resR
.
getData
();
if
(
Common
.
isNotNull
(
setInfo
))
{
try
{
// 添加了异常处理,避免 recordBase 不是合法数字格式时程序崩溃
if
(
CommonConstants
.
ZER
O_STRING
.
equals
(
rel
.
getPaymentType
()))
{
if
(
CommonConstants
.
TW
O_STRING
.
equals
(
rel
.
getPaymentType
()))
{
if
(
BigDecimal
.
valueOf
(
Double
.
valueOf
(
rel
.
getRecordBase
())).
compareTo
(
setInfo
.
getUpperLimit
())
!=
0
)
{
return
R
.
failed
(
"备案基数不等于社保户最高基数"
);
}
}
else
{
}
else
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
rel
.
getPaymentType
()))
{
if
(
BigDecimal
.
valueOf
(
Double
.
valueOf
(
rel
.
getRecordBase
())).
compareTo
(
setInfo
.
getLowerLimit
())
!=
0
)
{
return
R
.
failed
(
"备案基数不等于社保户最低基数"
);
}
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
View file @
12d9832a
...
...
@@ -13,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.vo.*;
import
com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo
;
import
lombok.extern.log4j.Log4j2
;
...
...
@@ -245,8 +246,8 @@ public class SocialDaprUtils {
* @Param
* @return
**/
public
R
<
SysBaseSetInfo
>
getSocialHouseBaseSet
(
String
houseId
)
{
R
<
SysBaseSetInfo
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/sysbasesetinfo/inner/getSocialHouseBaseSet"
,
houseId
,
SysBaseSetInf
o
.
class
,
SecurityConstants
.
FROM_IN
);
public
R
<
SysBaseSetInfo
Vo
>
getSocialHouseBaseSet
(
String
houseId
)
{
R
<
SysBaseSetInfo
Vo
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/sysbasesetinfo/inner/getSocialHouseBaseSet"
,
houseId
,
SysBaseSetInfoV
o
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"获取社保配置信息失败!"
);
}
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SysBaseSetInfoVo.java
0 → 100644
View file @
12d9832a
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysBaseSetInfoController.java
View file @
12d9832a
...
...
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.bean.BeanCopyUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
...
...
@@ -29,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import
com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion
;
import
com.yifu.cloud.plus.v1.yifu.social.service.SysBaseSetInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.SysPayProportionService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
...
...
@@ -182,12 +184,14 @@ public class SysBaseSetInfoController {
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@Inner
@
Ge
tMapping
(
"/inner/getSocialHouseBaseSet"
)
public
SysBaseSetInfo
getSocialHouseBaseSet
(
@RequestBody
String
houseId
)
{
@
Pos
tMapping
(
"/inner/getSocialHouseBaseSet"
)
public
SysBaseSetInfo
Vo
getSocialHouseBaseSet
(
@RequestBody
String
houseId
)
{
SysBaseSetInfo
baseSetInfo
=
sysBaseSetInfoService
.
getById
(
houseId
);
if
(
null
!=
baseSetInfo
&&
CommonConstants
.
ONE_STRING
.
equals
(
baseSetInfo
.
getBaseType
())){
baseSetInfo
.
setFundProList
(
sysPayProportionService
.
list
(
Wrappers
.<
SysPayProportion
>
query
().
lambda
().
eq
(
SysPayProportion:
:
getSysBaseSetId
,
houseId
)));
}
return
baseSetInfo
;
SysBaseSetInfoVo
sysBaseSetInfoVo
=
new
SysBaseSetInfoVo
();
BeanCopyUtils
.
copyProperties
(
baseSetInfo
,
sysBaseSetInfoVo
);
return
sysBaseSetInfoVo
;
}
}
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