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
4f549f7d
Commit
4f549f7d
authored
Jan 07, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
a5203e59
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
10 deletions
+35
-10
SocialHandleExportVo.java
...fu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
+6
-1
TDispatchInfoMapper.java
...cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
+1
-3
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+11
-4
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+17
-2
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
View file @
4f549f7d
...
@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
...
@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.ContentStyle
;
import
com.alibaba.excel.annotation.write.style.ContentStyle
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
@@ -26,6 +25,12 @@ import java.util.Date;
...
@@ -26,6 +25,12 @@ import java.util.Date;
@Data
@Data
public
class
SocialHandleExportVo
implements
Serializable
{
public
class
SocialHandleExportVo
implements
Serializable
{
/**
* 派单ID
*/
@ExcelIgnore
private
String
id
;
/**
/**
* 派单类型:0派增1派减
* 派单类型:0派增1派减
*/
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
View file @
4f549f7d
...
@@ -26,7 +26,6 @@ import org.apache.ibatis.annotations.Mapper;
...
@@ -26,7 +26,6 @@ import org.apache.ibatis.annotations.Mapper;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 派单信息记录表
* 派单信息记录表
...
@@ -80,8 +79,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
...
@@ -80,8 +79,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
* @Param
* @Param
* @return
* @return
**/
**/
int
updateSocialRecords
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
,
int
updateSocialRecords
(
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
/**
/**
* 导出社保花名册数据查询count
* 导出社保花名册数据查询count
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
4f549f7d
...
@@ -52,7 +52,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
...
@@ -52,7 +52,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
import
com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock
;
import
com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseServiceParamListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseServiceParamListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.*
;
...
@@ -6087,6 +6086,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -6087,6 +6086,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
int
index
=
0
;
int
index
=
0
;
String
userId
=
user
.
getId
();
String
userId
=
user
.
getId
();
String
userName
=
user
.
getNickname
();
String
userName
=
user
.
getNickname
();
List
<
String
>
idString
=
null
;
if
(
count
>
CommonConstants
.
ZERO_INT
)
{
if
(
count
>
CommonConstants
.
ZERO_INT
)
{
// 加上非办理人,导出只有姓名身份证和异常
// 加上非办理人,导出只有姓名身份证和异常
...
@@ -6102,6 +6102,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -6102,6 +6102,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
SocialHandleExportVo
vo
;
SocialHandleExportVo
vo
;
for
(
int
i
=
0
;
i
<=
count
;
)
{
for
(
int
i
=
0
;
i
<=
count
;
)
{
logList
=
new
ArrayList
<>();
logList
=
new
ArrayList
<>();
idString
=
new
ArrayList
<>();
// 获取实际记录
// 获取实际记录
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
...
@@ -6110,6 +6111,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -6110,6 +6111,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
util
=
new
ExcelUtil
<>(
SocialHandleExportVo
.
class
);
util
=
new
ExcelUtil
<>(
SocialHandleExportVo
.
class
);
for
(
int
j
=
0
;
j
<
list
.
size
();
j
++)
{
for
(
int
j
=
0
;
j
<
list
.
size
();
j
++)
{
vo
=
list
.
get
(
j
);
vo
=
list
.
get
(
j
);
idString
.
add
(
vo
.
getId
());
util
.
convertEntity
(
vo
,
null
,
null
,
null
);
util
.
convertEntity
(
vo
,
null
,
null
,
null
);
if
(
Common
.
isNotNull
(
vo
.
getSocialHouseholdName
()))
{
if
(
Common
.
isNotNull
(
vo
.
getSocialHouseholdName
()))
{
if
(
socialHuMap
.
get
(
vo
.
getSocialHouseholdName
())
==
null
)
{
if
(
socialHuMap
.
get
(
vo
.
getSocialHouseholdName
())
==
null
)
{
...
@@ -6139,7 +6141,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -6139,7 +6141,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
list
.
clear
();
list
.
clear
();
}
}
updateSocialRecords
(
searchVo
,
idStr
);
if
(
Common
.
isNotNull
(
idString
)){
updateSocialRecords
(
idString
);
}
// 新增导出人记录
// 新增导出人记录
if
(!
logList
.
isEmpty
())
{
if
(!
logList
.
isEmpty
())
{
tDispatchExportLogService
.
saveBatch
(
logList
);
tDispatchExportLogService
.
saveBatch
(
logList
);
...
@@ -6154,6 +6158,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -6154,6 +6158,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
list
.
clear
();
list
.
clear
();
}
}
if
(
Common
.
isNotNull
(
idString
)){
idString
.
clear
();
}
out
.
flush
();
out
.
flush
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"执行异常"
,
e
);
log
.
error
(
"执行异常"
,
e
);
...
@@ -6195,8 +6202,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -6195,8 +6202,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
baseMapper
.
getSocialRecordRosterList
(
searchVo
,
Common
.
getList
(
idStr
));
return
baseMapper
.
getSocialRecordRosterList
(
searchVo
,
Common
.
getList
(
idStr
));
}
}
private
boolean
updateSocialRecords
(
SocialHandleSearchVo
searchVo
,
String
idStr
)
{
private
boolean
updateSocialRecords
(
List
<
String
>
idStr
)
{
return
baseMapper
.
updateSocialRecords
(
searchVo
,
Common
.
getList
(
idStr
)
)
>=
0
;
return
baseMapper
.
updateSocialRecords
(
idStr
)
>=
0
;
}
}
@Override
@Override
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
4f549f7d
...
@@ -1173,6 +1173,7 @@
...
@@ -1173,6 +1173,7 @@
</resultMap>
</resultMap>
<resultMap
id=
"socialHandleExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleExportVo"
>
<resultMap
id=
"socialHandleExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleExportVo"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"empType"
column=
"EMP_TYPE"
/>
<result
property=
"empType"
column=
"EMP_TYPE"
/>
...
@@ -1256,6 +1257,7 @@
...
@@ -1256,6 +1257,7 @@
<!--tDispatchInfo 社保花名册数据查询-->
<!--tDispatchInfo 社保花名册数据查询-->
<select
id=
"getSocialRecordRosterList"
resultMap=
"socialHandleExportMap"
>
<select
id=
"getSocialRecordRosterList"
resultMap=
"socialHandleExportMap"
>
SELECT
SELECT
a.id,
a.TYPE,
a.TYPE,
a.SOCIAL_HANDLE_STATUS,
a.SOCIAL_HANDLE_STATUS,
/*IF(a.TYPE='0',s.PENSION_HANDLE,IF(s.PENSION_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "PENSION_HANDLE",
/*IF(a.TYPE='0',s.PENSION_HANDLE,IF(s.PENSION_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "PENSION_HANDLE",
...
@@ -1477,7 +1479,7 @@
...
@@ -1477,7 +1479,7 @@
order by a.AUDIT_TIME desc
order by a.AUDIT_TIME desc
</select>
</select>
<update
id=
"updateSocialRecords"
>
<
!--<
update id="updateSocialRecords">
update
update
t_dispatch_info a
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
...
@@ -1497,8 +1499,21 @@
...
@@ -1497,8 +1499,21 @@
)
)
</if>
</if>
</update>
</update>-->
<update
id=
"updateSocialRecords"
>
update
t_dispatch_info a
set a.EXPORT_SOCIAL_FLAG = 1
<where>
a.id in
<foreach
item=
"item"
collection=
"idsStr"
separator=
","
close=
")"
open=
"("
index=
"index"
>
#{item}
</foreach>
/>
</where>
</update>
<!--tDispatchInfo 社保花名册数据查询count-->
<!--tDispatchInfo 社保花名册数据查询count-->
<select
id=
"getSocialRecordRosterListCount"
resultType=
"java.lang.Integer"
>
<select
id=
"getSocialRecordRosterListCount"
resultType=
"java.lang.Integer"
>
SELECT
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