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
341c532e
Commit
341c532e
authored
Apr 27, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.10-新菜单:自动化办理查询-导出-改逻辑
parent
6a6341da
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
83 additions
and
13 deletions
+83
-13
TSocialInfo.java
...om/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
+57
-0
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+3
-4
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+8
-0
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+15
-9
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @
341c532e
...
...
@@ -1073,6 +1073,63 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty
(
"医生大税友的任务ID"
)
private
String
ysdRequestId
;
// 以下专门为自动化办理查询使用的:(派减,清空派增信息,再次之前,留存派增信息到下面的 add字段里) hgw 2025-4-27 17:43:59
/**
* 减少时留存的增加时的-养工失状态:(0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理)
*/
@Length
(
max
=
32
,
message
=
"减少时留存的增加时的-养工失状态 不能超过32个字符"
)
@ExcelAttribute
(
name
=
"减少时留存的增加时的-养工失状态"
,
maxLength
=
32
)
@Schema
(
description
=
"减少时留存的增加时的-养工失状态:(0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理、6成功。7提交成功)"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"减少时留存的增加时的-养工失状态"
)
private
String
addYgsHandleStatus
;
/**
* 减少时留存的增加时的-医生大状态:(0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理)
*/
@Length
(
max
=
32
,
message
=
"减少时留存的增加时的-医生大状态 不能超过32个字符"
)
@ExcelAttribute
(
name
=
"减少时留存的增加时的-医生大状态"
,
maxLength
=
32
)
@Schema
(
description
=
"减少时留存的增加时的-医生大状态:(0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理、6成功。7提交成功)"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"减少时留存的增加时的-医生大状态"
)
private
String
addYsdHandleStatus
;
/**
* 减少时留存的增加时的-养工失反馈
*/
@Length
(
max
=
500
,
message
=
"减少时留存的增加时的-养工失反馈 不能超过500个字符"
)
@ExcelAttribute
(
name
=
"减少时留存的增加时的-养工失反馈"
,
maxLength
=
500
)
@Schema
(
description
=
"减少时留存的增加时的-养工失反馈"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"减少时留存的增加时的-养工失反馈"
)
private
String
addYgsRemark
;
/**
* 减少时留存的增加时的-医生大反馈
*/
@Length
(
max
=
500
,
message
=
"减少时留存的增加时的-医生大反馈 不能超过500个字符"
)
@ExcelAttribute
(
name
=
"减少时留存的增加时的-医生大反馈"
,
maxLength
=
500
)
@Schema
(
description
=
"减少时留存的增加时的-医生大反馈"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"减少时留存的增加时的-医生大反馈"
)
private
String
addYsdRemark
;
/**
* 减少时留存的增加时的-养工失税友的任务ID
*/
@Length
(
max
=
50
,
message
=
"减少时留存的增加时的-养工失税友的任务ID 不能超过50个字符"
)
@ExcelAttribute
(
name
=
"减少时留存的增加时的-养工失税友的任务ID"
,
maxLength
=
50
)
@Schema
(
description
=
"减少时留存的增加时的-养工失税友的任务ID"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"减少时留存的增加时的-养工失税友的任务ID"
)
private
String
addYgsRequestId
;
/**
* 减少时留存的增加时的-医生大税友的任务ID
*/
@Length
(
max
=
50
,
message
=
"减少时留存的增加时的-医生大税友的任务ID 不能超过50个字符"
)
@ExcelAttribute
(
name
=
"减少时留存的增加时的-医生大税友的任务ID"
,
maxLength
=
50
)
@Schema
(
description
=
"减少时留存的增加时的-医生大税友的任务ID"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"减少时留存的增加时的-医生大税友的任务ID"
)
private
String
addYsdRequestId
;
// 以上是转为自动化办理查询使用的
// 派单id,社保士兵使用
@TableField
(
exist
=
false
)
private
String
dispatchId
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
341c532e
...
...
@@ -230,12 +230,11 @@ public class TDispatchInfoController {
}
/**
* @Description: 简单分页查询--
社保士兵列表
* @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>>
* @Date: 2025-4-27 17:58:29
**/
@Operation
(
description
=
"简单分页查询--
社保士兵查询列表
-按派单维度"
)
@Operation
(
description
=
"简单分页查询--
自动化办理查询
-按派单维度"
)
@GetMapping
(
"/getPageSocialSoldierAll"
)
public
R
<
IPage
<
TSocialSoldierPageVo
>>
getPageSocialSoldierAll
(
Page
<
TSocialSoldierPageVo
>
page
,
SocialHandleSearchVo
tDispatchInfo
)
{
tDispatchInfo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
341c532e
...
...
@@ -3593,6 +3593,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
//自动化处理,如果未配置还是人工处理
if
(
CommonConstants
.
THREE_STRING
.
equals
(
auditStatus
)){
// 初始化之前,保留原状态给 自动化办理查询使用 hgw 2025-4-27 17:37:09
socialInfo
.
setAddYgsHandleStatus
(
socialInfo
.
getYgsHandleStatus
());
socialInfo
.
setAddYsdHandleStatus
(
socialInfo
.
getYsdHandleStatus
());
socialInfo
.
setAddYgsRequestId
(
socialInfo
.
getYgsRequestId
());
socialInfo
.
setAddYsdRequestId
(
socialInfo
.
getYsdRequestId
());
socialInfo
.
setAddYgsRemark
(
socialInfo
.
getYgsRemark
());
socialInfo
.
setAddYsdRemark
(
socialInfo
.
getYsdRemark
());
if
((
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
341c532e
...
...
@@ -1414,11 +1414,12 @@
a.FIRST_PAY_TIME,
a.GRADUATION_TIME,
IF(a.LEAVE_DATE is not null,DATE_FORMAT(a.LEAVE_DATE,"%Y-%m-%d"),"") as "LEAVE_DATE"
,s.ygs_Handle_Status
,s.ysd_Handle_Status
,s.YGS_REMARK
,s.YSD_REMARK
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
,if(a.type ='1', s.add_ygs_Handle_Status, s.ygs_Handle_Status) ygs_Handle_Status
,if(a.type ='1', s.add_ysd_Handle_Status, s.ysd_Handle_Status) ysd_Handle_Status
,if(a.type ='1', s.add_YGS_REMARK, s.YGS_REMARK) YGS_REMARK
,if(a.type ='1', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='1', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='1', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) 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
...
...
@@ -1581,7 +1582,7 @@
order by a.AUDIT_TIME desc
</select>
<!-- hgw 2025-4-25 18:09:12
社保士兵查询列表
——派单维度 -->
<!-- hgw 2025-4-25 18:09:12
自动化办理查询
——派单维度 -->
<select
id=
"getPageSocialSoldierAll"
resultMap=
"socialSoldierPageMap"
>
SELECT
a.ID,
...
...
@@ -1662,9 +1663,14 @@
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
,a.SOCIAL_HOUSEHOLD_NAME
,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
,if(a.type ='1', s.add_ygs_Handle_Status, s.ygs_Handle_Status) ygs_Handle_Status
,if(a.type ='1', s.add_ysd_Handle_Status, s.ysd_Handle_Status) ysd_Handle_Status
,if(a.type ='1', s.add_YGS_REMARK, s.YGS_REMARK) YGS_REMARK
,if(a.type ='1', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='1', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='1', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) 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
...
...
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