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
62fdab7c
Commit
62fdab7c
authored
May 31, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-wzb:bug修复
parent
b523baa8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+0
-1
TEmployeeContractInfoMapper.java
.../v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
+2
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+4
-1
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+5
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
62fdab7c
...
...
@@ -115,7 +115,6 @@ public class TEmployeeContractInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"合同到期时间"
,
needExport
=
true
)
@Schema
(
description
=
"合同到期时间"
,
name
=
"contractEnd"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+08:00"
)
@TableField
(
value
=
"contract_end"
,
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Date
contractEnd
;
/**
* 项目名称
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
View file @
62fdab7c
...
...
@@ -109,4 +109,6 @@ public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContrac
void
updateContractChange
(
@Param
(
"idCard"
)
String
empIdcard
,
@Param
(
"deptNo"
)
String
deptNo
,
@Param
(
"oldDeptNo"
)
String
odlDeptNo
);
String
getContractByEmpIdCardAndDeptId
(
@Param
(
"empIdCard"
)
String
empIdCard
,
@Param
(
"deptId"
)
String
deptId
);
void
updateContractEnd
(
@Param
(
"tEmployeeContractInfo"
)
TEmployeeContractInfo
tEmployeeContractInfo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
62fdab7c
...
...
@@ -482,11 +482,13 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
this
.
updateFileMainId
(
tEmployeeContractInfo
);
}
}
else
{
baseMapper
.
updateById
(
tEmployeeContractInfo
);
if
(
CommonConstants
.
TWO_STRING
.
equals
(
tEmployeeContractInfo
.
getContractType
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
tEmployeeContractInfo
.
getContractType
()))
{
tEmployeeContractInfo
.
setContractEnd
(
null
);
baseMapper
.
updateContractEnd
(
tEmployeeContractInfo
);
}
baseMapper
.
updateById
(
tEmployeeContractInfo
);
}
// 不是待提交,记录审核记录
this
.
setAuditInfo
(
tEmployeeContractInfo
);
...
...
@@ -496,6 +498,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
TWO_INT
)
{
this
.
updateEmployeeContractStatus
(
tEmployeeContractInfo
);
}
return
R
.
ok
(
null
,
CommonConstants
.
SAVE_SUCCESS
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
62fdab7c
...
...
@@ -806,6 +806,11 @@
where a.EMP_IDCARD = #{idCard} and a.DEPT_NO = #{oldDeptNo} and b.DEPART_NO= #{deptNo} and b.DELETE_FLAG='0';
</update>
<update
id=
"updateContractEnd"
>
update t_employee_contract_info a
set a.CONTRACT_END=#{tEmployeeContractInfo.contractEnd}
where a.ID=#{tEmployeeContractInfo.id}
</update>
<select
id=
"getContractByEmpIdCardAndDeptId"
resultType=
"java.lang.String"
>
select
e.CONTRACT_START
...
...
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