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
1455fa29
Commit
1455fa29
authored
Jan 14, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.19-第二天
parent
dcdd449c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
31 deletions
+45
-31
TDispatchInfoMapper.java
...cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
+2
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+12
-16
SysHouseHoldInfoMapper.xml
...-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
+3
-1
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+26
-12
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+2
-2
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
View file @
1455fa29
...
@@ -51,6 +51,8 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
...
@@ -51,6 +51,8 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo>
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo>
**/
**/
List
<
TDispatchInfoExportVo
>
exportDispatch
(
@Param
(
"tDispatchInfo"
)
TDispatchInfoSearchVo
tDispatchInfo
);
List
<
TDispatchInfoExportVo
>
exportDispatch
(
@Param
(
"tDispatchInfo"
)
TDispatchInfoSearchVo
tDispatchInfo
);
// 派单导出count
long
exportDispatchCount
(
@Param
(
"tDispatchInfo"
)
TDispatchInfoSearchVo
tDispatchInfo
);
/**
/**
* @Description: 派单审核导出
* @Description: 派单审核导出
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
1455fa29
...
@@ -211,7 +211,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -211,7 +211,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
String
fileName
=
"派单批量导出"
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
String
fileName
=
"派单批量导出"
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
//获取要导出的列表
//获取要导出的列表
List
<
TDispatchInfoExportVo
>
list
=
new
ArrayList
<>();
List
<
TDispatchInfoExportVo
>
list
=
new
ArrayList
<>();
long
count
=
noPageCountDiy
(
searchVo
);
long
count
=
exportDispatchCount
(
searchVo
);
HashMap
<
String
,
String
>
userMap
=
new
HashMap
<>();
HashMap
<
String
,
String
>
userMap
=
new
HashMap
<>();
try
{
try
{
// 获取用户信息
// 获取用户信息
...
@@ -367,6 +367,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -367,6 +367,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
baseMapper
.
selectList
(
wrapper
);
return
baseMapper
.
selectList
(
wrapper
);
}
}
// 派单查询的导出list
private
List
<
TDispatchInfoExportVo
>
exportDispatch
(
TDispatchInfoSearchVo
searchVo
)
{
private
List
<
TDispatchInfoExportVo
>
exportDispatch
(
TDispatchInfoSearchVo
searchVo
)
{
if
(
Common
.
isNotNull
(
searchVo
.
getIds
()))
{
if
(
Common
.
isNotNull
(
searchVo
.
getIds
()))
{
List
<
String
>
idList
=
Common
.
getList
(
searchVo
.
getIds
());
List
<
String
>
idList
=
Common
.
getList
(
searchVo
.
getIds
());
...
@@ -375,22 +376,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -375,22 +376,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
baseMapper
.
exportDispatch
(
searchVo
);
return
baseMapper
.
exportDispatch
(
searchVo
);
}
}
private
List
<
TDispatchAuditExportVo
>
exportAuditDispatch
(
TDispatchInfoSearchVo
searchVo
)
{
// 派单查询的导出count
return
baseMapper
.
exportAuditDispatch
(
searchVo
);
private
long
exportDispatchCount
(
TDispatchInfoSearchVo
searchVo
)
{
}
private
Long
noPageCountDiy
(
TDispatchInfoSearchVo
searchVo
)
{
LambdaQueryWrapper
<
TDispatchInfo
>
wrapper
=
buildQueryWrapper
(
searchVo
);
List
<
String
>
idList
;
if
(
Common
.
isNotNull
(
searchVo
.
getIds
()))
{
if
(
Common
.
isNotNull
(
searchVo
.
getIds
()))
{
idList
=
Common
.
getList
(
searchVo
.
getIds
());
List
<
String
>
idList
=
Common
.
getList
(
searchVo
.
getIds
());
wrapper
.
in
(
TDispatchInfo:
:
getId
,
idList
);
searchVo
.
setIdList
(
idList
);
}
else
if
(
searchVo
.
getIdList
()
!=
null
)
{
idList
=
searchVo
.
getIdList
();
wrapper
.
in
(
TDispatchInfo:
:
getId
,
idList
);
}
}
wrapper
.
eq
(
TDispatchInfo:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
);
return
baseMapper
.
exportDispatchCount
(
searchVo
);
return
baseMapper
.
selectCount
(
wrapper
);
}
private
List
<
TDispatchAuditExportVo
>
exportAuditDispatch
(
TDispatchInfoSearchVo
searchVo
)
{
return
baseMapper
.
exportAuditDispatch
(
searchVo
);
}
}
private
LambdaQueryWrapper
buildQueryWrapper
(
TDispatchInfoSearchVo
entity
)
{
private
LambdaQueryWrapper
buildQueryWrapper
(
TDispatchInfoSearchVo
entity
)
{
...
@@ -402,7 +398,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -402,7 +398,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
wrapper
.
le
(
TDispatchInfo:
:
getCreateTime
,
entity
.
getCreateTimeEnd
());
wrapper
.
le
(
TDispatchInfo:
:
getCreateTime
,
entity
.
getCreateTimeEnd
());
}
}
if
(
Common
.
isNotNull
(
entity
.
getCreateName
()))
{
if
(
Common
.
isNotNull
(
entity
.
getCreateName
()))
{
wrapper
.
eq
(
TDispatchInfo:
:
getCreateName
,
entity
.
getCreateName
());
wrapper
.
like
(
TDispatchInfo:
:
getCreateName
,
entity
.
getCreateName
());
}
}
if
(
Common
.
isNotNull
(
entity
.
getEmpIdcard
()))
{
if
(
Common
.
isNotNull
(
entity
.
getEmpIdcard
()))
{
wrapper
.
eq
(
TDispatchInfo:
:
getEmpIdcard
,
entity
.
getEmpIdcard
());
wrapper
.
eq
(
TDispatchInfo:
:
getEmpIdcard
,
entity
.
getEmpIdcard
());
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
View file @
1455fa29
...
@@ -280,7 +280,9 @@
...
@@ -280,7 +280,9 @@
1 = 1
1 = 1
<include
refid=
"sysHouseHoldInfo_where"
/>
<include
refid=
"sysHouseHoldInfo_where"
/>
</where>
</where>
order by a.CREATE_TIME desc
order by
FIELD(a.name, '安徽皖信人力资源管理有限公司-市直', '安徽皖信人力资源管理有限公司-省直', '安徽皖信人力资源管理有限公司') DESC,
a.CREATE_TIME desc
</select>
</select>
<!-- 获取自动生成解除劳动合同书的户与公章src -->
<!-- 获取自动生成解除劳动合同书的户与公章src -->
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
1455fa29
...
@@ -660,7 +660,7 @@
...
@@ -660,7 +660,7 @@
AND a.UPDATE_BY = #{tDispatchInfo.updateBy}
AND a.UPDATE_BY = #{tDispatchInfo.updateBy}
</if>
</if>
<if
test=
"tDispatchInfo.createName != null and tDispatchInfo.createName.trim() != ''"
>
<if
test=
"tDispatchInfo.createName != null and tDispatchInfo.createName.trim() != ''"
>
AND a.CREATE_NAME
= #{tDispatchInfo.createName}
AND a.CREATE_NAME
like concat('%',#{tDispatchInfo.createName},'%')
</if>
</if>
<if
test=
"tDispatchInfo.updateTime != null"
>
<if
test=
"tDispatchInfo.updateTime != null"
>
AND a.UPDATE_TIME = #{tDispatchInfo.updateTime}
AND a.UPDATE_TIME = #{tDispatchInfo.updateTime}
...
@@ -676,10 +676,10 @@
...
@@ -676,10 +676,10 @@
</if>
</if>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
AND a.SOCIAL_HOUSEHOLD_NAME
like CONCAT(CONCAT(#{tDispatchInfo.socialHouseholdName}), '%')
AND a.SOCIAL_HOUSEHOLD_NAME
= #{tDispatchInfo.socialHouseholdName}
</if>
</if>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD_NAME
like CONCAT(CONCAT(#{tDispatchInfo.providentHouseholdName}), '%')
AND a.PROVIDENT_HOUSEHOLD_NAME
= #{tDispatchInfo.providentHouseholdName}
</if>
</if>
<if
test=
"tDispatchInfo.createTimeStart != null"
>
<if
test=
"tDispatchInfo.createTimeStart != null"
>
AND a.CREATE_TIME
<![CDATA[ >= ]]>
#{tDispatchInfo.createTimeStart}
AND a.CREATE_TIME
<![CDATA[ >= ]]>
#{tDispatchInfo.createTimeStart}
...
@@ -751,13 +751,13 @@
...
@@ -751,13 +751,13 @@
AND a.FUND_TOWN = #{tDispatchInfo.fundTown}
AND a.FUND_TOWN = #{tDispatchInfo.fundTown}
</if>
</if>
<if
test=
"tDispatchInfo.createName != null and tDispatchInfo.createName.trim() != ''"
>
<if
test=
"tDispatchInfo.createName != null and tDispatchInfo.createName.trim() != ''"
>
AND a.CREATE_NAME
= #{tDispatchInfo.createName}
AND a.CREATE_NAME
like concat('%',#{tDispatchInfo.createName},'%')
</if>
</if>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
AND a.SOCIAL_HOUSEHOLD_NAME
like CONCAT(#{tDispatchInfo.socialHouseholdName}, '%')
AND a.SOCIAL_HOUSEHOLD_NAME
= #{tDispatchInfo.socialHouseholdName}
</if>
</if>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD_NAME
like CONCAT(#{tDispatchInfo.providentHouseholdName}, '%')
AND a.PROVIDENT_HOUSEHOLD_NAME
= #{tDispatchInfo.providentHouseholdName}
</if>
</if>
<if
test=
"tDispatchInfo.createTimeStart != null"
>
<if
test=
"tDispatchInfo.createTimeStart != null"
>
AND a.CREATE_TIME
<![CDATA[ >= ]]>
#{tDispatchInfo.createTimeStart}
AND a.CREATE_TIME
<![CDATA[ >= ]]>
#{tDispatchInfo.createTimeStart}
...
@@ -803,6 +803,20 @@
...
@@ -803,6 +803,20 @@
order by a.APPLY_NO desc
order by a.APPLY_NO desc
</select>
</select>
<!-- 派单导出count -->
<select
id=
"exportDispatchCount"
resultType=
"java.lang.Long"
>
select
count(1)
from t_dispatch_info a
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
left join t_social_info s on s.id=a.SOCIAL_ID
left join t_provident_fund c on c.id=a.FUND_ID
<where>
a.DELETE_FLAG = '0'
<include
refid=
"tDispatchInfo_where"
/>
</where>
</select>
<!-- 派单导出 -->
<!-- 派单导出 -->
<select
id=
"exportDispatch"
resultMap=
"exportMap"
>
<select
id=
"exportDispatch"
resultMap=
"exportMap"
>
select
select
...
@@ -2398,7 +2412,7 @@
...
@@ -2398,7 +2412,7 @@
</if>
</if>
<if
test=
"tDispatchInfo.createName != null and tDispatchInfo.createName.trim() != ''"
>
<if
test=
"tDispatchInfo.createName != null and tDispatchInfo.createName.trim() != ''"
>
AND a.CREATE_NAME
= #{tDispatchInfo.createName}
AND a.CREATE_NAME
like concat('%',#{tDispatchInfo.createName},'%')
</if>
</if>
<if
test=
"tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''"
>
<if
test=
"tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''"
>
...
@@ -2423,7 +2437,7 @@
...
@@ -2423,7 +2437,7 @@
AND a.AUDIT_USER_NAME like concat('%',#{tDispatchInfo.auditUserName},'%')
AND a.AUDIT_USER_NAME like concat('%',#{tDispatchInfo.auditUserName},'%')
</if>
</if>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
AND a.SOCIAL_HOUSEHOLD_NAME
like CONCAT(CONCAT(#{tDispatchInfo.socialHouseholdName}), '%')
AND a.SOCIAL_HOUSEHOLD_NAME
= #{tDispatchInfo.socialHouseholdName}
</if>
</if>
<if
test=
"tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''"
>
<if
test=
"tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''"
>
${tDispatchInfo.authSql}
${tDispatchInfo.authSql}
...
@@ -2501,7 +2515,7 @@
...
@@ -2501,7 +2515,7 @@
</if>
</if>
<if
test=
"tDispatchInfo.createName != null and tDispatchInfo.createName.trim() != ''"
>
<if
test=
"tDispatchInfo.createName != null and tDispatchInfo.createName.trim() != ''"
>
AND a.CREATE_NAME
= #{tDispatchInfo.createName}
AND a.CREATE_NAME
like concat('%',#{tDispatchInfo.createName},'%')
</if>
</if>
<if
test=
"tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''"
>
<if
test=
"tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''"
>
...
@@ -2526,7 +2540,7 @@
...
@@ -2526,7 +2540,7 @@
AND a.AUDIT_USER_NAME like concat('%',#{tDispatchInfo.auditUserName},'%')
AND a.AUDIT_USER_NAME like concat('%',#{tDispatchInfo.auditUserName},'%')
</if>
</if>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
AND a.SOCIAL_HOUSEHOLD_NAME
like CONCAT(CONCAT(#{tDispatchInfo.socialHouseholdName}), '%')
AND a.SOCIAL_HOUSEHOLD_NAME
= #{tDispatchInfo.socialHouseholdName}
</if>
</if>
<if
test=
"tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''"
>
<if
test=
"tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''"
>
${tDispatchInfo.authSql}
${tDispatchInfo.authSql}
...
@@ -2633,7 +2647,7 @@
...
@@ -2633,7 +2647,7 @@
</if>
</if>
<if
test=
"tDispatchInfo.createName != null and tDispatchInfo.createName.trim() != ''"
>
<if
test=
"tDispatchInfo.createName != null and tDispatchInfo.createName.trim() != ''"
>
AND a.CREATE_NAME
= #{tDispatchInfo.createName}
AND a.CREATE_NAME
like concat('%',#{tDispatchInfo.createName},'%')
</if>
</if>
<if
test=
"tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''"
>
<if
test=
"tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''"
>
...
@@ -2658,7 +2672,7 @@
...
@@ -2658,7 +2672,7 @@
AND a.AUDIT_USER_NAME like concat('%',#{tDispatchInfo.auditUserName},'%')
AND a.AUDIT_USER_NAME like concat('%',#{tDispatchInfo.auditUserName},'%')
</if>
</if>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD_NAME
like CONCAT(CONCAT(#{tDispatchInfo.providentHouseholdName}), '%')
AND a.PROVIDENT_HOUSEHOLD_NAME
= #{tDispatchInfo.providentHouseholdName}
</if>
</if>
<if
test=
"tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''"
>
<if
test=
"tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''"
>
${tDispatchInfo.authSql}
${tDispatchInfo.authSql}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
1455fa29
...
@@ -626,7 +626,7 @@
...
@@ -626,7 +626,7 @@
AND a.SOCIAL_HOUSEHOLD = #{tSocialFundInfo.socialHousehold}
AND a.SOCIAL_HOUSEHOLD = #{tSocialFundInfo.socialHousehold}
</if>
</if>
<if
test=
"tSocialFundInfo.socialHouseholdName != null and tSocialFundInfo.socialHouseholdName.trim() != ''"
>
<if
test=
"tSocialFundInfo.socialHouseholdName != null and tSocialFundInfo.socialHouseholdName.trim() != ''"
>
AND a.SOCIAL_HOUSEHOLD_NAME
like concat('%',#{tSocialFundInfo.socialHouseholdName},'%')
AND a.SOCIAL_HOUSEHOLD_NAME
= #{tSocialFundInfo.socialHouseholdName}
</if>
</if>
<if
test=
"tSocialFundInfo.socialProvince != null and tSocialFundInfo.socialProvince.trim() != ''"
>
<if
test=
"tSocialFundInfo.socialProvince != null and tSocialFundInfo.socialProvince.trim() != ''"
>
AND a.SOCIAL_PROVINCE = #{tSocialFundInfo.socialProvince}
AND a.SOCIAL_PROVINCE = #{tSocialFundInfo.socialProvince}
...
@@ -641,7 +641,7 @@
...
@@ -641,7 +641,7 @@
AND a.PROVIDENT_HOUSEHOLD = #{tSocialFundInfo.providentHousehold}
AND a.PROVIDENT_HOUSEHOLD = #{tSocialFundInfo.providentHousehold}
</if>
</if>
<if
test=
"tSocialFundInfo.providentHouseholdName != null and tSocialFundInfo.providentHouseholdName.trim() != ''"
>
<if
test=
"tSocialFundInfo.providentHouseholdName != null and tSocialFundInfo.providentHouseholdName.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD_NAME
like concat('%',#{tSocialFundInfo.providentHouseholdName},'%')
AND a.PROVIDENT_HOUSEHOLD_NAME
= #{tSocialFundInfo.providentHouseholdName}
</if>
</if>
<if
test=
"tSocialFundInfo.fundProvince != null and tSocialFundInfo.fundProvince.trim() != ''"
>
<if
test=
"tSocialFundInfo.fundProvince != null and tSocialFundInfo.fundProvince.trim() != ''"
>
AND a.FUND_PROVINCE = #{tSocialFundInfo.fundProvince}
AND a.FUND_PROVINCE = #{tSocialFundInfo.fundProvince}
...
...
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