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
cac77a8a
Commit
cac77a8a
authored
Jun 06, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-wzb :bug修复
parent
a1d3f6dd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
TEmployeeRetirementMapper.java
...us/v1/yifu/archives/mapper/TEmployeeRetirementMapper.java
+1
-1
TEmployeeRetirementServiceImpl.java
...archives/service/impl/TEmployeeRetirementServiceImpl.java
+3
-2
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+2
-0
TEmployeeRetirementMapper.xml
...z/src/main/resources/mapper/TEmployeeRetirementMapper.xml
+3
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeRetirementMapper.java
View file @
cac77a8a
...
...
@@ -23,7 +23,7 @@ import java.util.List;
public
interface
TEmployeeRetirementMapper
extends
BaseMapper
<
TEmployeeRetirement
>
{
IPage
<
TEmployeeRetirement
>
getTEmployeeRetirementPage
(
Page
page
,
@Param
(
"searchVo"
)
TEmployeeRetirementSearchVo
searchVo
);
IPage
<
TEmployeeRetirement
>
getTEmployeeRetirementPage
(
Page
page
,
@Param
(
"
userId"
)
String
userId
,
@Param
(
"
searchVo"
)
TEmployeeRetirementSearchVo
searchVo
);
List
<
TEmployeeRetirement
>
getBirthday
(
@Param
(
"oo"
)
String
oo
,
@Param
(
"pp"
)
String
pp
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeRetirementServiceImpl.java
View file @
cac77a8a
...
...
@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.net.URLEncoder
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
...
...
@@ -50,7 +49,9 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
@Override
public
IPage
<
TEmployeeRetirement
>
getTEmployeeRetirementPage
(
Page
page
,
TEmployeeRetirementSearchVo
searchVo
)
{
return
baseMapper
.
getTEmployeeRetirementPage
(
page
,
searchVo
);
YifuUser
user
=
SecurityUtils
.
getUser
();
String
userId
=
user
.
getId
();
return
baseMapper
.
getTEmployeeRetirementPage
(
page
,
userId
,
searchVo
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
cac77a8a
...
...
@@ -846,6 +846,7 @@
AND t2.CREATE_TIME = t1.CREATE_TIME
WHERE
t1.CONTRACT_TYPE = '1'
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
...
...
@@ -858,6 +859,7 @@
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}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeRetirementMapper.xml
View file @
cac77a8a
...
...
@@ -153,7 +153,9 @@
<where>
<include
refid=
"tEmployeeRetirement_pageWhere"
/>
</where>
order by a.CREATE_TIME desc
ORDER BY
field(a.HANDLE_FLAG,0,1) asc,
CREATE_TIME desc
</select>
<select
id=
"selectByEmpIdcard"
resultType=
"Integer"
>
SELECT count(*)
...
...
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