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
4ae6e7bd
Commit
4ae6e7bd
authored
Jul 17, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
税友反馈文件下载-fxj
parent
19000d23
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1790 additions
and
1298 deletions
+1790
-1298
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+207
-12
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+13
-0
TDispatchInfoMapper.java
...cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
+10
-0
TDispatchInfoService.java
...oud/plus/v1/yifu/social/service/TDispatchInfoService.java
+2
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1487
-1281
application-test.yml
...l/yifu-social-biz/src/main/resources/application-test.yml
+16
-4
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+55
-1
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
4ae6e7bd
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
4ae6e7bd
...
@@ -947,4 +947,17 @@ public class TDispatchInfoController {
...
@@ -947,4 +947,17 @@ public class TDispatchInfoController {
return
tDispatchInfoService
.
doExportRoster
(
socialId
,
type
,
unitCreditCode
);
return
tDispatchInfoService
.
doExportRoster
(
socialId
,
type
,
unitCreditCode
);
}
}
/**
* @Author fxj
* @Description
* @Date 15:20 2025/7/15
**/
@PostMapping
(
"/doExportSocialSoldierAllBackFile"
)
@Operation
(
description
=
"自动化办理查询导出反馈文件"
)
@SysLog
(
"自动化办理查询导出反馈文件"
)
public
void
doExportSocialSoldierAllBackFile
(
HttpServletResponse
response
,
HttpServletRequest
request
,
@RequestBody
SocialHandleSearchVo
searchVo
)
{
tDispatchInfoService
.
doExportSocialSoldierAllBackFile
(
response
,
searchVo
,
searchVo
.
getIdStr
());
}
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
View file @
4ae6e7bd
...
@@ -306,4 +306,14 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
...
@@ -306,4 +306,14 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
List
<
String
>
getSingleFlagMap
(
@Param
(
"idsList"
)
List
<
String
>
idsList
);
List
<
String
>
getSingleFlagMap
(
@Param
(
"idsList"
)
List
<
String
>
idsList
);
// 获取自动生成减员离职证明的派单ID
// 获取自动生成减员离职证明的派单ID
List
<
String
>
getAutoDocFlagMap
(
@Param
(
"idsList"
)
List
<
String
>
idsList
);
List
<
String
>
getAutoDocFlagMap
(
@Param
(
"idsList"
)
List
<
String
>
idsList
);
/**
* @Author fxj
* @Description 自动化办理查询导出反馈文件
* @Date 15:29 2025/7/15
**/
List
<
SocialSoldierBackVo
>
getSocialSoldierAllListBackFile
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
,
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
int
updateBackFileFlag
(
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @
4ae6e7bd
...
@@ -187,4 +187,6 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
...
@@ -187,4 +187,6 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
List
<
SocialHandleExportVo
>
getRecordRosterList
(
SocialHandleSearchVo
searchVo
,
String
idStr
);
List
<
SocialHandleExportVo
>
getRecordRosterList
(
SocialHandleSearchVo
searchVo
,
String
idStr
);
R
<
URL
>
doExportRoster
(
String
socialId
,
String
type
,
String
unitCreditCode
);
R
<
URL
>
doExportRoster
(
String
socialId
,
String
type
,
String
unitCreditCode
);
void
doExportSocialSoldierAllBackFile
(
HttpServletResponse
response
,
SocialHandleSearchVo
searchVo
,
String
idStr
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
4ae6e7bd
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/resources/application-test.yml
View file @
4ae6e7bd
...
@@ -57,11 +57,23 @@ soldier:
...
@@ -57,11 +57,23 @@ soldier:
urlPre
:
http://36.7.147.29:55555
urlPre
:
http://36.7.147.29:55555
#税友相关属性配置
#税友相关属性配置
socialFriend
:
socialFriend
:
urlPre
:
https://test-openapi.17win.com
#urlPre : https://test-openapi.17win.com
#urlPushAdd: /gateway/socins/hrss/employee/v2/register
#urlGetInfoAdd: /gateway/socins/hrss/employee/v2/getRegisterFeedback
#urlPushReduce: /gateway/socins/hrss/employee/v2/stop
#urlGetInfoReduce: /gateway/socins/hrss/employee/v2/getStopFeedback
#urlDownloadEmployeeAsync: /gateway/pts/hrss/sourceFile/downloadEmployeeAsync
#urlDownloadEmployeeFeedback: /gateway/pts/hrss/sourceFile/downloadEmployeeFeedback
#urlUpload : /gateway/file/upload
#appKey : 89357285571962202409230949030
#appSecret : V52dkvxtFUgIvzlfNE9G8g==
urlPre
:
https://openapi.17win.com
urlPushAdd
:
/gateway/socins/hrss/employee/v2/register
urlPushAdd
:
/gateway/socins/hrss/employee/v2/register
urlGetInfoAdd
:
/gateway/socins/hrss/employee/v2/getRegisterFeedback
urlGetInfoAdd
:
/gateway/socins/hrss/employee/v2/getRegisterFeedback
urlPushReduce
:
/gateway/socins/hrss/employee/v2/stop
urlPushReduce
:
/gateway/socins/hrss/employee/v2/stop
urlGetInfoReduce
:
/gateway/socins/hrss/employee/v2/getStopFeedback
urlGetInfoReduce
:
/gateway/socins/hrss/employee/v2/getStopFeedback
urlUpload
:
/gateway/file/upload
urlDownloadEmployeeAsync
:
/gateway/pts/hrss/sourceFile/downloadEmployeeAsync
appKey
:
89357285571962202409230949030
urlDownloadEmployeeFeedback
:
/gateway/pts/hrss/sourceFile/downloadEmployeeFeedback
appSecret
:
V52dkvxtFUgIvzlfNE9G8g==
urlUpload
:
/gateway/file/upload
\ No newline at end of file
appKey
:
3082B14EE2114C2D93B3A222DD925C26=
appSecret
:
VmURqoxqmoKnNLXzAWynqQ==
\ No newline at end of file
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
4ae6e7bd
...
@@ -356,7 +356,16 @@
...
@@ -356,7 +356,16 @@
<result
property=
"firstPayTime"
column=
"FIRST_PAY_TIME"
/>
<result
property=
"firstPayTime"
column=
"FIRST_PAY_TIME"
/>
<result
property=
"graduationTime"
column=
"GRADUATION_TIME"
/>
<result
property=
"graduationTime"
column=
"GRADUATION_TIME"
/>
</resultMap>
</resultMap>
<!-- 社保反馈文件下载专用 -->
<resultMap
id=
"socialSoldierBackMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierBackVo"
>
<result
property=
"dispatchId"
column=
"id"
/>
<result
property=
"socialId"
column=
"social_id"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"ygsHandleStatus"
column=
"ygs_Handle_Status"
/>
<result
property=
"ysdHandleStatus"
column=
"ysd_Handle_Status"
/>
<result
property=
"socialHouseholdName"
column=
"SOCIAL_HOUSEHOLD_NAME"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.ID,
a.ID,
a.EMP_ID,
a.EMP_ID,
...
@@ -1514,6 +1523,7 @@
...
@@ -1514,6 +1523,7 @@
<result
property=
"ysdRequestId"
column=
"YSD_REQUEST_ID"
/>
<result
property=
"ysdRequestId"
column=
"YSD_REQUEST_ID"
/>
<result
property=
"ygsSocialStartDateNext"
column=
"YGS_SOCIAL_START_DATE_NEXT"
/>
<result
property=
"ygsSocialStartDateNext"
column=
"YGS_SOCIAL_START_DATE_NEXT"
/>
<result
property=
"ysdSocialStartDateNext"
column=
"YSD_SOCIAL_START_DATE_NEXT"
/>
<result
property=
"ysdSocialStartDateNext"
column=
"YSD_SOCIAL_START_DATE_NEXT"
/>
<result
property=
"backFileFlag"
column=
"BACK_FILE_FLAG"
/>
</resultMap>
</resultMap>
<!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 -->
<!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 -->
...
@@ -1602,6 +1612,7 @@
...
@@ -1602,6 +1612,7 @@
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
,a.BACK_FILE_FLAG
FROM t_dispatch_info a
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
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
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...
@@ -1701,6 +1712,7 @@
...
@@ -1701,6 +1712,7 @@
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
,a.BACK_FILE_FLAG
FROM t_dispatch_info a
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
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
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...
@@ -2136,6 +2148,9 @@
...
@@ -2136,6 +2148,9 @@
<include
refid=
"where_getSocialRecordRoster_base"
/>
<include
refid=
"where_getSocialRecordRoster_base"
/>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo.backFileFlag != null and tDispatchInfo.backFileFlag.trim() != ''"
>
AND a.BACK_FILE_FLAG = #{tDispatchInfo.backFileFlag}
</if>
<if
test=
"tDispatchInfo.ygsHandleStatus != null and tDispatchInfo.ygsHandleStatus.trim() != ''"
>
<if
test=
"tDispatchInfo.ygsHandleStatus != null and tDispatchInfo.ygsHandleStatus.trim() != ''"
>
AND s.YGS_HANDLE_STATUS = #{tDispatchInfo.ygsHandleStatus}
AND s.YGS_HANDLE_STATUS = #{tDispatchInfo.ygsHandleStatus}
</if>
</if>
...
@@ -2825,4 +2840,43 @@
...
@@ -2825,4 +2840,43 @@
#{item}
#{item}
</foreach>
</foreach>
</select>
</select>
<!--tDispatchInfo 自动化办理查询导出反馈文件-->
<select
id=
"getSocialSoldierAllListBackFile"
resultMap=
"socialSoldierBackMap"
>
SELECT
a.id,
a.social_id,
a.EMP_NAME,
a.EMP_IDCARD
,s.ygs_Handle_Status
,s.ysd_Handle_Status
,a.SOCIAL_HOUSEHOLD_NAME
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
<where>
a.DELETE_FLAG = '0'
AND a.social_id is not null
and a.AUTO_FLAG = '0'
and a.type = '0'
<!-- 税友反馈接口目前只支持社保附件下载,必须是办理成功的 -->
and s.ygs_Handle_Status = '6'
<if
test=
"idsStr != null and idsStr.size > 0"
>
AND a.ID in
<foreach
item=
"items"
index=
"index"
collection=
"idsStr"
open=
"("
separator=
","
close=
")"
>
#{items}
</foreach>
</if>
</where>
order by a.AUDIT_TIME desc
</select>
<update
id=
"updateBackFileFlag"
>
update t_dispatch_info a set a.BACK_FILE_FLAG = '已下载'
WHERE 1=2
<if
test=
"idsStr != null and idsStr.size > 0"
>
or a.ID in
<foreach
item=
"items"
index=
"index"
collection=
"idsStr"
open=
"("
separator=
","
close=
")"
>
#{items}
</foreach>
</if>
</update>
</mapper>
</mapper>
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