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
5d724419
Commit
5d724419
authored
Jun 06, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-wzb :bug修复
parent
ac36c220
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
141 additions
and
19 deletions
+141
-19
TEmployeeRetirementMapper.java
...us/v1/yifu/archives/mapper/TEmployeeRetirementMapper.java
+2
-2
TEmployeeRetirementServiceImpl.java
...archives/service/impl/TEmployeeRetirementServiceImpl.java
+9
-6
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+16
-3
TEmployeeRetirementMapper.xml
...z/src/main/resources/mapper/TEmployeeRetirementMapper.xml
+114
-8
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeRetirementMapper.java
View file @
5d724419
...
...
@@ -37,9 +37,9 @@ public interface TEmployeeRetirementMapper extends BaseMapper<TEmployeeRetiremen
long
selectExportCount
(
@Param
(
"tEmployeeRetirement"
)
TEmployeeRetirementExportVo
tEmployeeRetirement
);
List
<
TEmployeeRetirementExportVo
>
noPageDiy
(
@Param
(
"searchVo"
)
TEmployeeRetirementSearchVo
searchVo
);
List
<
TEmployeeRetirementExportVo
>
noPageDiy
(
@Param
(
"
userId"
)
String
userId
,
@Param
(
"
searchVo"
)
TEmployeeRetirementSearchVo
searchVo
);
int
noPageCountDiy
(
@Param
(
"searchVo"
)
TEmployeeRetirementSearchVo
searchVo
);
int
noPageCountDiy
(
@Param
(
"
userId"
)
String
userId
,
@Param
(
"
searchVo"
)
TEmployeeRetirementSearchVo
searchVo
);
String
selectByIdd
(
@Param
(
"id"
)
Integer
id
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeRetirementServiceImpl.java
View file @
5d724419
...
...
@@ -152,9 +152,11 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
@Override
public
void
listExport
(
HttpServletResponse
response
,
TEmployeeRetirementSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
String
userId
=
user
.
getId
();
String
fileName
=
"人员退休提醒批量导出"
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
List
<
TEmployeeRetirementExportVo
>
list
=
new
ArrayList
<>();
long
count
=
noPageCountDiy
(
searchVo
);
long
count
=
noPageCountDiy
(
userId
,
searchVo
);
try
(
ServletOutputStream
out
=
response
.
getOutputStream
()){
response
.
setContentType
(
CommonConstants
.
MULTIPART_FORM_DATA
);
response
.
setCharacterEncoding
(
"utf-8"
);
...
...
@@ -175,7 +177,7 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
// 获取实际记录
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
list
=
noPageDiy
(
searchVo
);
list
=
noPageDiy
(
userId
,
searchVo
);
for
(
TEmployeeRetirementExportVo
tEmployeeRetirementExportVo
:
list
)
{
String
fileProvince
=
baseMapper
.
selectByIdd
(
tEmployeeRetirementExportVo
.
getFileProvince
());
String
fileCity
=
baseMapper
.
selectByIdd
(
tEmployeeRetirementExportVo
.
getFileCity
());
...
...
@@ -226,11 +228,12 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
return
tEmployeeRetirementFlagDetailMapper
.
getDatail
(
id
);
}
private
List
<
TEmployeeRetirementExportVo
>
noPageDiy
(
TEmployeeRetirementSearchVo
searchVo
)
{
return
baseMapper
.
noPageDiy
(
searchVo
);
private
List
<
TEmployeeRetirementExportVo
>
noPageDiy
(
String
userId
,
TEmployeeRetirementSearchVo
searchVo
)
{
return
baseMapper
.
noPageDiy
(
userId
,
searchVo
);
}
private
int
noPageCountDiy
(
TEmployeeRetirementSearchVo
searchVo
)
{
return
baseMapper
.
noPageCountDiy
(
searchVo
);
private
int
noPageCountDiy
(
String
userId
,
TEmployeeRetirementSearchVo
searchVo
)
{
return
baseMapper
.
noPageCountDiy
(
userId
,
searchVo
);
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
5d724419
...
...
@@ -117,6 +117,7 @@
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"contractStatus"
column=
"CONTRACT_STATUS"
/>
<result
property=
"empLabel"
column=
"EMP_LABEL"
/>
<result
property=
"contractParty"
column=
"CONTRACT_PARTY"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -839,14 +840,15 @@
left join t_employee_info b on a.EMP_ID = b.id
LEFT JOIN (
SELECT
t1.EMP_ID ,t1.CONTRACT_PARTY
t1.EMP_ID ,t1.CONTRACT_PARTY
,t1.IN_USE
FROM
t_employee_contract_info t1
INNER JOIN ( SELECT EMP_ID, MAX( CREATE_TIME ) CREATE_TIME FROM t_employee_contract_info GROUP BY EMP_ID ) t2 ON t2.EMP_ID = t1.EMP_ID
AND t2.CREATE_TIME = t1.CREATE_TIME
WHERE
t1.CONTRACT_TYPE = '1'
t1.IN_USE='0'
AND
t1.IN_USE='0'
) AS t ON t.EMP_ID = a.EMP_ID
LEFT JOIN sys_area a1 on a1.id=b.ID_PROVINCE
LEFT JOIN sys_area a2 on a2.id=b.ID_CITY
...
...
@@ -859,7 +861,6 @@
LEFT JOIN sys_area a9 on a9.id=a.SOCIAL_TOWN
<where>
a.DELETE_FLAG = '0'
<include
refid=
"exportTEmployeeProject_where"
/>
<if
test=
"tEmployeeProject.authSql != null and tEmployeeProject.authSql.trim() != ''"
>
${tEmployeeProject.authSql}
...
...
@@ -880,6 +881,18 @@
count(1)
FROM t_employee_project a
left join t_employee_info b on a.EMP_ID = b.id
LEFT JOIN (
SELECT
t1.EMP_ID ,t1.CONTRACT_PARTY,t1.IN_USE
FROM
t_employee_contract_info t1
INNER JOIN ( SELECT EMP_ID, MAX( CREATE_TIME ) CREATE_TIME FROM t_employee_contract_info GROUP BY EMP_ID ) t2 ON t2.EMP_ID = t1.EMP_ID
AND t2.CREATE_TIME = t1.CREATE_TIME
WHERE
t1.CONTRACT_TYPE = '1'
AND
t1.IN_USE='0'
) AS t ON t.EMP_ID = a.EMP_ID
<where>
a.DELETE_FLAG = '0'
<include
refid=
"exportTEmployeeProject_where"
/>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeRetirementMapper.xml
View file @
5d724419
...
...
@@ -298,21 +298,127 @@
ELSE "" END as "HANDLE_FLAG",
FILE_CITY, FILE_TOWN, SOCIAL_PROVINCE, SOCIAL_CITY, SOCIAL_TOWN,
DEPT_NAME, UNIT_NAME, UNIT_NO, DEPT_NO
<include
refid=
"Base_Column_List"
/>
FROM t_employee_retirement a
<where>
<include
refid=
"tEmployeeRetirement_pageWhere"
/>
</where>
order by a.CREATE_TIME desc
LEFT JOIN t_cutsomer_data_permisson b ON b.SETTLE_DOMAIN_NO = a.DEPT_NO
WHERE
b.USER_ID = #{userId}
<if
test=
"searchVo.empName != null and searchVo.empName.trim() != ''"
>
AND a.EMP_NAME like concat('%',#{searchVo.empName},'%')
</if>
<if
test=
"searchVo.empIdcard != null and searchVo.empIdcard.trim() != ''"
>
AND a.EMP_IDCARD like concat('%',#{searchVo.empIdcard},'%')
</if>
<if
test=
"searchVo.fileProvince != null"
>
AND a.FILE_PROVINCE = #{searchVo.fileProvince}
</if>
<if
test=
"searchVo.fileCity != null"
>
AND a.FILE_CITY = #{searchVo.fileCity}
</if>
<if
test=
"searchVo.fileTown != null"
>
AND a.FILE_TOWN = #{searchVo.fileTown}
</if>
<if
test=
"searchVo.socialProvince != null"
>
AND a.SOCIAL_PROVINCE = #{searchVo.socialProvince}
</if>
<if
test=
"searchVo.socialCity != null"
>
AND a.SOCIAL_CITY = #{searchVo.socialCity}
</if>
<if
test=
"searchVo.socialTown != null"
>
AND a.SOCIAL_TOWN = #{searchVo.socialTown}
</if>
<if
test=
"searchVo.unitName!= null"
>
AND a.UNIT_NAME = #{searchVo.unitName}
</if>
<if
test=
"searchVo.unitNo!= null and searchVo.unitNo!=''"
>
AND a.UNIT_NO = #{searchVo.unitNo}
</if>
<if
test=
"searchVo.deptName!= null"
>
AND a.DEPT_NAME like concat('%',#{searchVo.deptName},'%')
</if>
<if
test=
"searchVo.deptNo!= null and searchVo.deptNo!=''"
>
AND a.DEPT_NO =#{searchVo.deptNo}
</if>
<if
test=
"searchVo.handleFlag!= null"
>
AND a.HANDLE_FLAG =#{searchVo.handleFlag}
</if>
<if
test=
"searchVo.empTypeList != null and searchVo.empTypeList.length>0"
>
AND a.EMP_NATRUE IN
<foreach
collection=
"searchVo.empTypeList"
item=
"item"
index=
"index"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"searchVo.idList != null and searchVo.idList.length > 0"
>
and a.ID in
<foreach
collection=
"searchVo.idList"
item=
"item"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{item}
</foreach>
</if>
ORDER BY
field(a.HANDLE_FLAG,0,1) asc,
a.CREATE_TIME desc
</select>
<!--tEmployeeInfo导出查询count改造 fxj 2022-11-03-->
<select
id=
"noPageCountDiy"
resultType=
"java.lang.Integer"
>
SELECT
count(1)
from t_employee_retirement a
<where>
<include
refid=
"tEmployeeRetirement_pageWhere"
/>
</where>
LEFT JOIN t_cutsomer_data_permisson b ON b.SETTLE_DOMAIN_NO = a.DEPT_NO
WHERE
b.USER_ID = #{userId}
<if
test=
"searchVo.empName != null and searchVo.empName.trim() != ''"
>
AND a.EMP_NAME like concat('%',#{searchVo.empName},'%')
</if>
<if
test=
"searchVo.empIdcard != null and searchVo.empIdcard.trim() != ''"
>
AND a.EMP_IDCARD like concat('%',#{searchVo.empIdcard},'%')
</if>
<if
test=
"searchVo.fileProvince != null"
>
AND a.FILE_PROVINCE = #{searchVo.fileProvince}
</if>
<if
test=
"searchVo.fileCity != null"
>
AND a.FILE_CITY = #{searchVo.fileCity}
</if>
<if
test=
"searchVo.fileTown != null"
>
AND a.FILE_TOWN = #{searchVo.fileTown}
</if>
<if
test=
"searchVo.socialProvince != null"
>
AND a.SOCIAL_PROVINCE = #{searchVo.socialProvince}
</if>
<if
test=
"searchVo.socialCity != null"
>
AND a.SOCIAL_CITY = #{searchVo.socialCity}
</if>
<if
test=
"searchVo.socialTown != null"
>
AND a.SOCIAL_TOWN = #{searchVo.socialTown}
</if>
<if
test=
"searchVo.unitName!= null"
>
AND a.UNIT_NAME = #{searchVo.unitName}
</if>
<if
test=
"searchVo.unitNo!= null and searchVo.unitNo!=''"
>
AND a.UNIT_NO = #{searchVo.unitNo}
</if>
<if
test=
"searchVo.deptName!= null"
>
AND a.DEPT_NAME like concat('%',#{searchVo.deptName},'%')
</if>
<if
test=
"searchVo.deptNo!= null and searchVo.deptNo!=''"
>
AND a.DEPT_NO =#{searchVo.deptNo}
</if>
<if
test=
"searchVo.handleFlag!= null"
>
AND a.HANDLE_FLAG =#{searchVo.handleFlag}
</if>
<if
test=
"searchVo.empTypeList != null and searchVo.empTypeList.length>0"
>
AND a.EMP_NATRUE IN
<foreach
collection=
"searchVo.empTypeList"
item=
"item"
index=
"index"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"searchVo.idList != null and searchVo.idList.length > 0"
>
and a.ID in
<foreach
collection=
"searchVo.idList"
item=
"item"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{item}
</foreach>
</if>
ORDER BY
field(a.HANDLE_FLAG,0,1) asc,
a.CREATE_TIME desc
</select>
<select
id=
"selectByIdd"
resultType=
"String"
>
SELECT a.AREA_NAME
...
...
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