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
200e2372
Commit
200e2372
authored
Apr 12, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5.3-单增的合同日期
parent
53a0258b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
TEmployeeContractInfoMapper.java
.../v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
+1
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+3
-3
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+3
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
View file @
200e2372
...
...
@@ -108,5 +108,5 @@ public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContrac
void
updateContractChange
(
@Param
(
"idCard"
)
String
empIdcard
,
@Param
(
"deptNo"
)
String
deptNo
,
@Param
(
"oldDeptNo"
)
String
odlDeptNo
);
int
getContractByEmpIdCardAndDeptId
(
@Param
(
"empIdCard"
)
String
empIdCard
,
@Param
(
"deptId"
)
String
deptId
);
String
getContractByEmpIdCardAndDeptId
(
@Param
(
"empIdCard"
)
String
empIdCard
,
@Param
(
"deptId"
)
String
deptId
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
200e2372
...
...
@@ -1524,9 +1524,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
@Override
public
R
<
String
>
getContractByEmpIdCardAndDeptId
(
String
mpIdCard
,
String
deptId
)
{
int
coun
t
=
baseMapper
.
getContractByEmpIdCardAndDeptId
(
mpIdCard
,
deptId
);
if
(
count
>
0
)
{
return
R
.
ok
();
String
contractStar
t
=
baseMapper
.
getContractByEmpIdCardAndDeptId
(
mpIdCard
,
deptId
);
if
(
Common
.
isNotNull
(
contractStart
)
)
{
return
R
.
ok
(
contractStart
);
}
else
{
return
R
.
failed
(
"未找到合同"
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
200e2372
...
...
@@ -806,9 +806,9 @@
where a.EMP_IDCARD = #{idCard} and a.DEPT_NO = #{oldDeptNo} and b.DEPART_NO= #{deptNo} and b.DELETE_FLAG='0';
</update>
<select
id=
"getContractByEmpIdCardAndDeptId"
resultType=
"java.lang.
Integer
"
>
<select
id=
"getContractByEmpIdCardAndDeptId"
resultType=
"java.lang.
String
"
>
select
count(1)
e.CONTRACT_START
from t_employee_contract_info e
where e.EMP_IDCARD = #{empIdCard} and e.SETTLE_DOMAIN = #{deptId}
and e.DELETE_FLAG = '0'
...
...
@@ -817,5 +817,6 @@
OR
( e.AUDIT_STATUS = '1' AND e.IN_USE = '1' )
)
limit 1
</select>
</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