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
4877fb6d
Commit
4877fb6d
authored
May 09, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
社保办理 &公积金办理 导出标识
parent
27f5b523
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
179 additions
and
13 deletions
+179
-13
TDispatchInfo.java
.../yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
+26
-0
FundHandleExportVo.java
...yifu/cloud/plus/v1/yifu/social/vo/FundHandleExportVo.java
+12
-0
SocialHandleExportVo.java
...fu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
+12
-1
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+28
-1
TDispatchInfoMapper.java
...cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
+25
-0
TDispatchInfoService.java
...oud/plus/v1/yifu/social/service/TDispatchInfoService.java
+4
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+21
-1
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+51
-10
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @
4877fb6d
...
...
@@ -715,4 +715,30 @@ public class TDispatchInfo extends BaseEntity {
@TableField
(
exist
=
false
)
private
String
pid
;
/**
* @Author fxj
* @Description 社保是否已导出
* @Date 15:32 2023/5/9
* @Param
* @return
**/
@ExcelAttribute
(
name
=
"社保是否已导出"
,
maxLength
=
1
)
@Schema
(
description
=
"社保是否已导出:0否、1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保是否已导出"
)
private
String
exportSocialFlag
;
/**
* @Author fxj
* @Description 公積金是否已导出
* @Date 15:32 2023/5/9
* @Param
* @return
**/
@ExcelAttribute
(
name
=
"公积金是否已导出"
,
maxLength
=
1
)
@Schema
(
description
=
"公积金是否已导出:0否、1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"公积金是否已导出"
)
private
String
exportFundFlag
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/FundHandleExportVo.java
View file @
4877fb6d
...
...
@@ -208,4 +208,16 @@ public class FundHandleExportVo implements Serializable {
/*******************************导出字段结束*************************************************/
/**
* @Author fxj
* @Description 公積金是否已导出
* @Date 15:32 2023/5/9
* @Param
* @return
**/
@ExcelAttribute
(
name
=
"是否已导出"
,
maxLength
=
1
,
isDataId
=
true
,
readConverterExp
=
"0=否,1=是"
)
@Schema
(
description
=
"是否已导出:0否、1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否已导出"
)
private
String
exportFundFlag
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
View file @
4877fb6d
...
...
@@ -414,5 +414,16 @@ public class SocialHandleExportVo implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"减少原因"
)
private
String
reduceReason
;
/**
* @Author fxj
* @Description 社保是否已导出
* @Date 15:32 2023/5/9
* @Param
* @return
**/
@ExcelAttribute
(
name
=
"是否已导出"
,
maxLength
=
1
,
isDataId
=
true
,
readConverterExp
=
"0=否,1=是"
)
@Schema
(
description
=
"是否已导出:0否、1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否已导出"
)
private
String
exportSocialFlag
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
4877fb6d
...
...
@@ -264,7 +264,6 @@ public class TDispatchInfoController {
return
R
.
ok
(
tDispatchInfoService
.
getSocialAndFundInfoById
(
id
));
}
/**
* 新增派单信息记录表
* @param tDispatchInfo 派单信息记录表
...
...
@@ -621,4 +620,32 @@ public class TDispatchInfoController {
}
}
/**
* 社保花名册导出标识变更为否
* @param id
* @return R
*/
@Operation
(
summary
=
"社保花名册导出标识变更为否"
,
description
=
"社保花名册导出标识变更为否"
)
@SysLog
(
"社保花名册导出标识变更为否"
)
@PutMapping
public
R
<
Boolean
>
updateExportSocialFlagById
(
@RequestParam
(
value
=
"id"
)
String
id
)
{
if
(
Common
.
isEmpty
(
id
)){
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_EMPTY
);
}
return
tDispatchInfoService
.
updateExportSocialFlagById
(
id
);
}
/**
* 公积金变更清册导出标识变更为否
* @param id
* @return R
*/
@Operation
(
summary
=
"公积金变更清册导出标识变更为否"
,
description
=
"公积金变更清册导出标识变更为否"
)
@SysLog
(
"公积金变更清册导出标识变更为否"
)
@PutMapping
public
R
<
Boolean
>
updateExportFundFlagById
(
@RequestParam
(
value
=
"id"
)
String
id
)
{
if
(
Common
.
isEmpty
(
id
)){
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_EMPTY
);
}
return
tDispatchInfoService
.
updateExportFundFlagById
(
id
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
View file @
4877fb6d
...
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
org.apache.ibatis.annotations.Mapper
;
...
...
@@ -72,6 +73,15 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
**/
List
<
SocialHandleExportVo
>
getSocialRecordRosterList
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
,
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
/**
* @Author fxj
* @Description 导出社保花名册数据更新导出状态
* @Date 16:20 2023/5/9
* @Param
* @return
**/
int
updateSocialRecords
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
,
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
/**
* 导出社保花名册数据查询count
...
...
@@ -136,5 +146,20 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
List
<
FundHandleExportVo
>
getFundRecordList
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
,
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
/**
* @Author fxj
* @Description 公积金变更清楚 导出状态更新
* @Date 16:16 2023/5/9
* @Param
* @return
**/
int
updateFundRecords
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
,
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
String
getMaxDispatchCode
();
int
updateExportSocialFlagById
(
@Param
(
"id"
)
String
id
);
int
updateExportFundFlagById
(
@Param
(
"id"
)
String
id
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @
4877fb6d
...
...
@@ -110,4 +110,8 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
R
<
List
<
ErrorMessage
>>
dispatchAdd
(
TDispatchImportVo
importVo
);
R
<
List
<
ErrorMessage
>>
fundImportHandle
(
InputStream
inputStream
);
R
<
Boolean
>
updateExportSocialFlagById
(
String
id
);
R
<
Boolean
>
updateExportFundFlagById
(
String
id
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
4877fb6d
...
...
@@ -64,7 +64,6 @@ import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.shardingsphere.transaction.annotation.ShardingTransactionType
;
import
org.apache.shardingsphere.transaction.core.TransactionType
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -4678,6 +4677,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
list
)){
list
.
clear
();
}
updateSocialRecords
(
searchVo
,
idStr
);
}
excelWriter
.
finish
();
}
else
{
...
...
@@ -4726,6 +4726,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
List
<
SocialHandleExportVo
>
getRecordRosterList
(
SocialHandleSearchVo
searchVo
,
String
idStr
)
{
return
baseMapper
.
getSocialRecordRosterList
(
searchVo
,
Common
.
getList
(
idStr
));
}
private
boolean
updateSocialRecords
(
SocialHandleSearchVo
searchVo
,
String
idStr
)
{
return
baseMapper
.
updateSocialRecords
(
searchVo
,
Common
.
getList
(
idStr
))
>=
0
;
}
@Override
public
IPage
<
TDispatchInfo
>
getTDispatchSocialHandlePage
(
Page
<
TDispatchInfo
>
page
,
SocialHandleSearchVo
tDispatchInfo
)
{
...
...
@@ -4792,6 +4795,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
list
)){
list
.
clear
();
}
// 更新导出状态
updateFundRecords
(
searchVo
,
idStr
);
}
excelWriter
.
finish
();
}
else
{
...
...
@@ -4819,6 +4824,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
List
<
FundHandleExportVo
>
getFundRecordList
(
SocialHandleSearchVo
searchVo
,
String
idStr
)
{
return
baseMapper
.
getFundRecordList
(
searchVo
,
Common
.
getList
(
idStr
));
}
private
boolean
updateFundRecords
(
SocialHandleSearchVo
searchVo
,
String
idStr
)
{
return
baseMapper
.
updateFundRecords
(
searchVo
,
Common
.
getList
(
idStr
))
>=
0
;
}
private
long
getFundRecordCount
(
SocialHandleSearchVo
searchVo
,
String
idStr
)
{
return
baseMapper
.
getFundRecordCount
(
searchVo
,
Common
.
getList
(
idStr
));
...
...
@@ -5014,6 +5023,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
return
this
.
judgeAllMessage
(
errorMessageList
);
}
/**
* @Author fxj
* @Description 批量导入办理 处理逻辑
...
...
@@ -5074,4 +5084,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
}
@Override
public
R
<
Boolean
>
updateExportSocialFlagById
(
String
id
)
{
return
R
.
ok
(
baseMapper
.
updateExportSocialFlagById
(
id
)
>=
0
);
}
@Override
public
R
<
Boolean
>
updateExportFundFlagById
(
String
id
)
{
return
R
.
ok
(
baseMapper
.
updateExportFundFlagById
(
id
)
>=
0
);
}
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
4877fb6d
...
...
@@ -103,6 +103,8 @@
<resultMap
id=
"dispatchPageMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo"
extends=
"tDispatchInfoMap"
>
<result
property=
"providentHouseholdName"
column=
"PROVIDENT_HOUSEHOLD_NAME"
/>
<result
property=
"socialHouseholdName"
column=
"SOCIAL_HOUSEHOLD_NAME"
/>
<result
property=
"exportFundFlag"
column=
"EXPORT_FUND_FLAG"
/>
<result
property=
"exportSocialFlag"
column=
"EXPORT_SOCIAL_FLAG"
/>
</resultMap>
<!-- 派单导出vo -->
<resultMap
id=
"exportMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo"
>
...
...
@@ -939,7 +941,7 @@
<result
property=
"workInjuryStart"
column=
"WORK_INJURY_START"
/>
<result
property=
"birthStart"
column=
"BIRTH_START"
/>
<result
property=
"bigailmentStart"
column=
"BIGAILMENT_START"
/>
<result
property=
"exportSocialFlag"
column=
"EXPORT_SOCIAL_FLAG"
/>
</resultMap>
<resultMap
id=
"fundHandleMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.FundHandleExportVo"
>
...
...
@@ -967,7 +969,7 @@
<result
property=
"fundTrustRemark"
column=
"TRUST_REMARK"
/>
<result
property=
"leaveDate"
column=
"LEAVE_DATE"
/>
<result
property=
"reduceReason"
column=
"REDUCE_REASON"
/>
<result
property=
"exportFundFlag"
column=
"EXPORT_FUND_FLAG"
/>
</resultMap>
<!--tDispatchInfo 社保花名册数据查询-->
<select
id=
"getSocialRecordRosterList"
resultMap=
"socialHandleExportMap"
>
...
...
@@ -1023,10 +1025,21 @@
s.UNIT_BIGAILMENT_MONEY,
s.PERSONAL_BIGAILMENT_MONEY,
a.TRUST_REMARK,
a.REDUCE_REASON
a.REDUCE_REASON,
a.EXPORT_SOCIAL_FLAG
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
<include
refid=
"where_getSocialRecordRoster"
/>
</select>
<update
id=
"updateSocialRecords"
>
update
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
set a.EXPORT_FUND_FLAG = 1
<include
refid=
"where_getSocialRecordRoster"
/>
</update>
<!--tDispatchInfo 社保花名册数据查询count-->
<select
id=
"getSocialRecordRosterListCount"
resultType=
"java.lang.Integer"
>
SELECT
...
...
@@ -1034,6 +1047,8 @@
(
SELECT
a.id
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
<include
refid=
"where_getSocialRecordRoster"
/>
) a
</select>
...
...
@@ -1041,14 +1056,18 @@
<select
id=
"getTDispatchSocialHandlePage"
resultMap=
"dispatchPageMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
,
a.SOCIAL_HOUSEHOLD_NAME
a.SOCIAL_HOUSEHOLD_NAME,a.EXPORT_SOCIAL_FLAG
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
<include
refid=
"where_getSocialRecordRoster"
/>
</select>
<!--tDispatchInfo 公积金办理数据查询-->
<select
id=
"getTDispatchFundHandlePage"
resultMap=
"dispatchPageMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
,
a.PROVIDENT_HOUSEHOLD_NAME
a.PROVIDENT_HOUSEHOLD_NAME,a.EXPORT_FUND_FLAG
FROM t_dispatch_info a
left join t_provident_fund f on a.FUND_ID = f.id
<include
refid=
"where_getFundRecord"
/>
</select>
...
...
@@ -1057,6 +1076,8 @@
SELECT
<include
refid=
"Base_Column_List"
/>
,
a.PROVIDENT_HOUSEHOLD_NAME
FROM t_dispatch_info a
left join t_provident_fund f on a.FUND_ID = f.id
<include
refid=
"where_getFundRecord"
/>
</select>
...
...
@@ -1066,6 +1087,8 @@
count(1) from
(SELECT
a.id
FROM t_dispatch_info a
left join t_provident_fund f on a.FUND_ID = f.id
<include
refid=
"where_getFundRecord"
/>
) a
</select>
<!--tDispatchInfo 公积金变更清册查询-->
...
...
@@ -1095,9 +1118,16 @@
a.TRUST_REMARK,
a.LEAVE_DATE,
a.REDUCE_REASON
FROM t_dispatch_info a
left join t_provident_fund f on a.FUND_ID = f.id
<include
refid=
"where_getFundRecord"
/>
</select>
<update
id=
"updateFundRecords"
>
update t_dispatch_info a
left join t_provident_fund f on a.FUND_ID = f.id
set a.EXPORT_SOCIAL_FLAG = 1
<include
refid=
"where_getFundRecord"
/>
</update>
<!--tDispatchInfo 公积金补交清册-->
<select
id=
"getFundSupplementaryRecords"
resultMap=
"fundSupplementaryMap"
>
SELECT
...
...
@@ -1109,11 +1139,11 @@
f.UNIT_PROVIDENT_FEE,
f.PERSONAL_PROVIDENT_FEE,
f.EMP_NAME
FROM t_dispatch_info a
left join t_provident_fund f on a.FUND_ID = f.id
<include
refid=
"where_getFundRecord"
/>
</select>
<sql
id=
"where_getSocialRecordRoster"
>
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
<where>
s.DELETE_FLAG = 0
<if
test=
"idsStr != null and idsStr.size > 0"
>
...
...
@@ -1227,6 +1257,9 @@
<if
test=
"tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''"
>
${tDispatchInfo.authSql}
</if>
<if
test=
"tDispatchInfo.exportSocialFlag != null and tDispatchInfo.exportSocialFlag.trim() != ''"
>
AND a.EXPORT_SOCIAL_FLAG = ${tDispatchInfo.exportSocialFlag}
</if>
</if>
group by a.id
order by a.APPLY_NO desc
...
...
@@ -1234,8 +1267,6 @@
</sql>
<sql
id=
"where_getFundRecord"
>
FROM t_dispatch_info a
left join t_provident_fund f on a.FUND_ID = f.id
<where>
a.DELETE_FLAG = 0
<if
test=
"idsStr != null and idsStr.size > 0"
>
...
...
@@ -1356,6 +1387,9 @@
<if
test=
"tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''"
>
${tDispatchInfo.authSql}
</if>
<if
test=
"tDispatchInfo.exportFundFlag != null and tDispatchInfo.exportFundFlag.trim() != ''"
>
AND a.EXPORT_FUND_FLAG = ${tDispatchInfo.exportFundFlag}
</if>
</if>
group by a.id
order by a.APPLY_NO desc
...
...
@@ -1366,4 +1400,11 @@
<select
id=
"getMaxDispatchCode"
resultType=
"java.lang.String"
>
SELECT ifnull(max(right(e.APPLY_NO,4)),0) APPLY_NO FROM t_dispatch_info e where e.DELETE_FLAG = 0 and e.CREATE_TIME>DATE_FORMAT(now(),'%Y-%m-%d')
</select>
<update
id=
"updateExportSocialFlagById"
>
update t_dispatch_info a set a.EXPORT_SOCIAL_FLAG = 1 WHERE a.id = #{id}
</update>
<update
id=
"updateExportFundFlagById"
>
update t_dispatch_info a set a.EXPORT_FUND_FLAG = 1 WHERE a.id = #{id}
</update>
</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