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
af67cc6d
Commit
af67cc6d
authored
Aug 23, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.5.7-划转,减项的可划转——项目的合同状态
parent
7a7f2fb3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
TEmployeeProjectMapper.java
.../plus/v1/yifu/archives/mapper/TEmployeeProjectMapper.java
+1
-1
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+1
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-1
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+2
-2
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeProjectMapper.java
View file @
af67cc6d
...
...
@@ -115,5 +115,5 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
int
updateChangeById
(
@Param
(
"project"
)
TEmployeeProject
project
);
void
updateContractStatus
(
@Param
(
"empId"
)
String
empId
,
@Param
(
"status"
)
int
status
);
void
updateContractStatus
(
@Param
(
"empId"
)
String
empId
,
@Param
(
"
deptId"
)
String
deptId
,
@Param
(
"
status"
)
int
status
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
af67cc6d
...
...
@@ -260,5 +260,5 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
void
updateChangeById
(
TEmployeeProject
oldEmpProject
);
void
updateContractStatus
(
String
empId
,
int
status
);
void
updateContractStatus
(
String
empId
,
String
deptId
,
int
status
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
af67cc6d
...
...
@@ -2256,7 +2256,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
contractAudit
.
setRemark
(
vo
.
getRemarkTemp
());
contractAudit
.
setRootName
(
"合同审核"
);
contractServicer
.
updateInUseStatusById
(
c
.
getEmpId
(),
c
.
getDeptNo
(),
c
.
getId
());
tEmployeeProjectService
.
updateContractStatus
(
c
.
getEmpId
(),
CommonConstants
.
ONE_INT
);
tEmployeeProjectService
.
updateContractStatus
(
c
.
getEmpId
(),
c
.
getSettleDomain
(),
CommonConstants
.
ONE_INT
);
baseMapper
.
updateContractStatus
(
c
.
getEmpId
(),
CommonConstants
.
ONE_INT
);
//审核不同
}
else
if
(
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getType
())){
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
af67cc6d
...
...
@@ -1848,8 +1848,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
@Override
public
void
updateContractStatus
(
String
empId
,
int
status
)
{
baseMapper
.
updateContractStatus
(
empId
,
status
);
public
void
updateContractStatus
(
String
empId
,
String
deptId
,
int
status
)
{
baseMapper
.
updateContractStatus
(
empId
,
deptId
,
status
);
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
af67cc6d
...
...
@@ -1064,6 +1064,6 @@
<update
id=
"updateContractStatus"
>
update t_employee_project a
set CONTRACT_STATUS = #{status}
WHERE a.EMP_ID=#{empId}
WHERE a.EMP_ID=#{empId}
and a.DEPT_ID=#{deptId}
</update>
</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