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
3d9f8652
Commit
3d9f8652
authored
Feb 04, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商险、社保、公积金右上角数字不含已完成数,列表默认不含已完成,但可查询已完成的状态-fxj
parent
cc5710b6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
62 additions
and
1 deletion
+62
-1
TEmployeeInsurancePreController.java
...nsurances/controller/TEmployeeInsurancePreController.java
+12
-0
TDispatchInfoPreController.java
...v1/yifu/social/controller/TDispatchInfoPreController.java
+50
-1
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TEmployeeInsurancePreController.java
View file @
3d9f8652
...
...
@@ -6,6 +6,8 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
...
...
@@ -23,6 +25,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -53,6 +56,15 @@ public class TEmployeeInsurancePreController {
public
R
<
IPage
<
TEmployeeInsurancePre
>>
getTEmployeeInsurancePrePage
(
Page
<
TEmployeeInsurancePre
>
page
,
@RequestBody
TEmployeeInsurancePreSearchVo
tEmployeeInsurancePre
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
tEmployeeInsurancePre
);
//无查询条件的时候直接 默认传非 已完成的数据
if
(
Common
.
isEmpty
(
tEmployeeInsurancePre
.
getProcessStatus
())){
tEmployeeInsurancePre
.
setStatusList
(
CommonConstants
.
processListPreArchivesStatus
);
}
else
{
//有查询条件的时候 按查询条件查询 后面有判断statusList 为空默认的情况
List
<
String
>
statusList
=
new
ArrayList
<>();
statusList
.
add
(
tEmployeeInsurancePre
.
getProcessStatus
());
tEmployeeInsurancePre
.
setStatusList
(
statusList
);
}
return
new
R
<>(
tEmployeeInsurancePreService
.
getTEmployeeInsurancePrePage
(
page
,
tEmployeeInsurancePre
));
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoPreController.java
View file @
3d9f8652
...
...
@@ -24,7 +24,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.
List
;
import
java.util.
*
;
/**
* 社保待购买表
...
...
@@ -41,6 +41,36 @@ public class TDispatchInfoPreController {
private
final
TDispatchInfoPreService
tDispatchInfoPreService
;
private
final
MenuUtil
menuUtil
;
// 提取公共方法用于构建状态列表
private
static
final
Map
<
String
,
List
<
String
>>
STATUS_MAP
=
new
HashMap
<>();
static
{
// 社保购买状态列表:社保购买状态,0待确认,1待派单,2派单失败,3待审核,4审核不通过,5待办理,6办理中,7办理成功,8办理失败,9部分办理失败
STATUS_MAP
.
put
(
CommonConstants
.
ZERO_STRING
,
Arrays
.
asList
(
CommonConstants
.
ZERO_STRING
,
CommonConstants
.
ONE_STRING
,
CommonConstants
.
TWO_STRING
,
CommonConstants
.
THREE_STRING
,
CommonConstants
.
FOUR_STRING
,
CommonConstants
.
FIVE_STRING
,
CommonConstants
.
SIX_STRING
,
CommonConstants
.
EIGHT_STRING
,
CommonConstants
.
NINE_STRING
));
// 公积金购买状态列表:公积金购买状态,0待确认,1待派单,2派单失败,3待审核,4审核不通过,5待办理,7办理成功,8办理失败
STATUS_MAP
.
put
(
CommonConstants
.
ONE_STRING
,
Arrays
.
asList
(
CommonConstants
.
ZERO_STRING
,
CommonConstants
.
ONE_STRING
,
CommonConstants
.
TWO_STRING
,
CommonConstants
.
THREE_STRING
,
CommonConstants
.
FOUR_STRING
,
CommonConstants
.
FIVE_STRING
,
CommonConstants
.
EIGHT_STRING
));
}
/**
* 简单分页查询
...
...
@@ -60,6 +90,15 @@ public class TDispatchInfoPreController {
}
else
if
(!
Common
.
isEmpty
(
tDispatchInfoPre
.
getTypeSub
())){
tDispatchInfoPre
.
setTypeSub
(
tDispatchInfoPre
.
getTypeSub
());
}
// 主逻辑优化
if
(
Common
.
isEmpty
(
tDispatchInfoPre
.
getProcessStatus
()))
{
String
typeSub
=
null
==
tDispatchInfoPre
.
getTypeSub
()?
CommonConstants
.
EMPTY_STRING
:
tDispatchInfoPre
.
getTypeSub
();
List
<
String
>
statusList
=
STATUS_MAP
.
get
(
typeSub
);
if
(
statusList
!=
null
)
{
tDispatchInfoPre
.
setStatusList
(
new
ArrayList
<>(
statusList
));
// 拷贝以防止外部修改
}
}
return
new
R
<>(
tDispatchInfoPreService
.
getTDispatchInfoPrePage
(
page
,
tDispatchInfoPre
));
}
...
...
@@ -228,6 +267,11 @@ public class TDispatchInfoPreController {
public
R
getListCount
(
@RequestBody
TDispatchInfoPreSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
//社保购买状态,0待确认,1待派单,2派单失败,3待审核,4审核不通过,5待办理,6办理中,7办理成功,8办理失败,9部分办理失败
List
<
String
>
statusList
=
STATUS_MAP
.
get
(
CommonConstants
.
ZERO_STRING
);
if
(
statusList
!=
null
)
{
searchVo
.
setStatusList
(
new
ArrayList
<>(
statusList
));
// 拷贝以防止外部修改
}
return
R
.
ok
(
tDispatchInfoPreService
.
getDispatchInfoCount
(
searchVo
));
}
...
...
@@ -241,6 +285,11 @@ public class TDispatchInfoPreController {
public
R
getListCountFund
(
@RequestBody
TDispatchInfoPreSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
// 公积金购买状态,0待确认,1待派单,2派单失败,3待审核,4审核不通过,5待办理,7办理成功,8办理失败
List
<
String
>
statusList
=
STATUS_MAP
.
get
(
CommonConstants
.
ONE_STRING
);
if
(
statusList
!=
null
)
{
searchVo
.
setStatusList
(
new
ArrayList
<>(
statusList
));
// 拷贝以防止外部修改
}
return
R
.
ok
(
tDispatchInfoPreService
.
getDispatchInfoFundCount
(
searchVo
));
}
...
...
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