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
48430283
Commit
48430283
authored
Apr 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.10-新菜单:自动化办理查询
parent
a6acd93a
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
137 additions
and
2 deletions
+137
-2
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+20
-1
TDispatchInfoMapper.java
...cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
+10
-0
TDispatchInfoService.java
...oud/plus/v1/yifu/social/service/TDispatchInfoService.java
+11
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+5
-0
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+91
-0
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
48430283
...
...
@@ -216,7 +216,7 @@ public class TDispatchInfoController {
* @Date: 2024/5/9 20:26
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.baomidou.mybatisplus.core.metadata.IPage < com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo>>
**/
@Operation
(
description
=
"简单分页查询--社保士兵列表"
)
@Operation
(
description
=
"简单分页查询--社保士兵
办理
列表"
)
@GetMapping
(
"/pageSocialSoldier"
)
public
R
<
IPage
<
TSocialSoldierPageVo
>>
pageSocialSoldier
(
Page
<
TSocialSoldierPageVo
>
page
,
SocialHandleSearchVo
tDispatchInfo
)
{
tDispatchInfo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
...
...
@@ -229,6 +229,25 @@ public class TDispatchInfoController {
return
new
R
<>(
tDispatchInfoService
.
getTSocialSoldierHandlePage
(
page
,
tDispatchInfo
));
}
/**
* @Description: 简单分页查询--社保士兵列表
* @Author: hgw
* @Date: 2024/5/9 20:26
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.baomidou.mybatisplus.core.metadata.IPage < com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo>>
**/
@Operation
(
description
=
"简单分页查询--社保士兵查询列表-按派单维度"
)
@GetMapping
(
"/getPageSocialSoldierAll"
)
public
R
<
IPage
<
TSocialSoldierPageVo
>>
getPageSocialSoldierAll
(
Page
<
TSocialSoldierPageVo
>
page
,
SocialHandleSearchVo
tDispatchInfo
)
{
tDispatchInfo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
tDispatchInfo
);
if
(
Common
.
isNotNull
(
tDispatchInfo
.
getAuthSql
())
&&
tDispatchInfo
.
getAuthSql
().
contains
(
CommonConstants
.
A_DEPT_ID
))
{
tDispatchInfo
.
setAuthSql
(
tDispatchInfo
.
getAuthSql
().
replace
(
CommonConstants
.
A_DEPT_ID
,
"a.SETTLE_DOMAIN"
));
}
tDispatchInfo
.
setCreateBy
(
user
.
getId
());
return
new
R
<>(
tDispatchInfoService
.
getPageSocialSoldierAll
(
page
,
tDispatchInfo
));
}
/**
* 简单分页查询--社保办理列表
* @param page 分页对象
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
View file @
48430283
...
...
@@ -115,6 +115,16 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
tDispatchInfo
,
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
/**
* @Description: 社保士兵列表查询
* @Author: hgw
* @Date: 2024/5/10 11:50
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo>
**/
IPage
<
TSocialSoldierPageVo
>
getPageSocialSoldierAll
(
Page
<
TSocialSoldierPageVo
>
page
,
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
tDispatchInfo
,
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
/**
* 社保页面查询
* @Author fxj
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @
48430283
...
...
@@ -100,13 +100,23 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
void
doexportSocialRecordRoster
(
HttpServletResponse
response
,
SocialHandleSearchVo
searchVo
,
String
idStr
,
String
[]
exportFields
);
/**
* @Description: 社保士兵列表查询
* @Description: 社保士兵
办理
列表查询
* @Author: hgw
* @Date: 2024/5/10 11:51
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo>
**/
IPage
<
TSocialSoldierPageVo
>
getTSocialSoldierHandlePage
(
Page
<
TSocialSoldierPageVo
>
page
,
SocialHandleSearchVo
tDispatchInfo
);
/**
* @param page
* @param tDispatchInfo
* @Description: 社保士兵查询列表——按派单维度
* @Author: hgw
* @Date: 2025/4/25 18:07
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.social.vo.TSocialSoldierPageVo>
**/
IPage
<
TSocialSoldierPageVo
>
getPageSocialSoldierAll
(
Page
<
TSocialSoldierPageVo
>
page
,
SocialHandleSearchVo
tDispatchInfo
);
IPage
<
TDispatchInfo
>
getTDispatchSocialHandlePage
(
Page
<
TDispatchInfo
>
page
,
SocialHandleSearchVo
tDispatchInfo
);
IPage
<
TDispatchInfo
>
getTDispatchFundHandlePage
(
Page
<
TDispatchInfo
>
page
,
SocialHandleSearchVo
tDispatchInfo
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
48430283
...
...
@@ -5464,6 +5464,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
baseMapper
.
getTSocialSoldierHandlePage
(
page
,
tDispatchInfo
,
null
);
}
@Override
public
IPage
<
TSocialSoldierPageVo
>
getPageSocialSoldierAll
(
Page
<
TSocialSoldierPageVo
>
page
,
SocialHandleSearchVo
tDispatchInfo
)
{
return
baseMapper
.
getPageSocialSoldierAll
(
page
,
tDispatchInfo
,
null
);
}
@Override
public
IPage
<
TDispatchInfo
>
getTDispatchSocialHandlePage
(
Page
<
TDispatchInfo
>
page
,
SocialHandleSearchVo
tDispatchInfo
)
{
return
baseMapper
.
getTDispatchSocialHandlePage
(
page
,
tDispatchInfo
,
null
);
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
48430283
...
...
@@ -1499,6 +1499,97 @@
order by a.AUDIT_TIME desc
</select>
<!-- hgw 2025-4-25 18:09:12 社保士兵查询列表——派单维度 -->
<select
id=
"getPageSocialSoldierAll"
resultMap=
"socialSoldierPageMap"
>
SELECT
a.ID,
a.EMP_ID,
a.EMP_NAME,
a.EMP_NO,
a.EMP_IDCARD,
a.EMP_TYPE,
a.EMP_MOBILE,
a.EMP_NATIONAL,
a.STATUS,
a.TYPE,
a.SOCIAL_ID,
a.FUND_ID,
a.TYPE_SUB,
a.PROCESS_INST_ID,
a.SETTLE_DOMAIN,
a.DELETE_FLAG,
a.SOCIAL_REDUCE_DATE,
a.FUND_REDUCE_DATE,
a.LEAVE_DATE,
a.REDUCE_REASON,
a.REDUCE_REMARK,
a.BELONG_UNIT,
a.CURRENT_OPERATOR,
a.DISPATCH_ID_BAK,
a.CONTRACT_START,
a.CONTRACT_END,
a.CONTRACT_TERM,
a.EMP_REGIS_TYPE,
a.ENJOIN_DATE,
a.FILE_ADDR,
a.POST,
a.TRUST_REMARK,
a.FILE_PROVINCE,
a.FILE_CITY,
a.FILE_TOWN,
a.CONTRACT_TYPE,
a.SOCIAL_HANDLE_STATUS,
a.FUND_HANDLE_STATUS,
a.HANDLE_REMARK,
a.AUDIT_REMARK,
a.FUND_HANDLE_REMARK,
a.SOCIAL_HANDLE_REMARK,
a.SOCIAL_PROVINCE,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
a.FUND_PROVINCE,
a.FUND_CITY,
a.FUND_TOWN,
a.AUDIT_USER,
a.AUDIT_USER_NAME,
a.AUDIT_TIME,
a.WORKING_HOURS,
a.CREATE_BY,
a.UPDATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_TIME,
a.ORGAN_NAME,
a.DISPATCH_ITEM,
a.SETTLE_DOMAIN_NAME,
a.BELONG_UNIT_NAME,
a.DISPATCH_CODE,
a.AGAIN_DISPATCH_CODE,
a.SETTLE_DOMAIN_CODE,
a.CONTRACT_SUB_NAME,
a.CONTRACT_ID,
a.EDUCATION_NAME,
a.TRY_PERIOD,
a.ID_CARD_PROVINCE,
a.ID_CARD_CITY,
a.ID_CARD_TOWN,
a.ID_CARD_ADDRESS,
a.APPLY_NO,
a.ORDER_ID,
a.SCHOOL_NAME,
a.MAJOR,
a.FIRST_PAY_TIME,
a.GRADUATION_TIME,a.AUTO_FLAG
,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS
,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
<include
refid=
"where_getSocialSoldier"
/>
order by a.AUDIT_TIME desc
</select>
<!--tDispatchInfo 社保办理数据查询-->
<select
id=
"getTDispatchSocialHandlePage"
resultMap=
"dispatchPageMap"
>
SELECT
...
...
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