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
e87da21d
Commit
e87da21d
authored
Oct 24, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
8795ec66
ccb00d91
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
6 deletions
+20
-6
TEmpChangeInfoController.java
...v1/yifu/archives/controller/TEmpChangeInfoController.java
+3
-2
TEmpChangeInfoService.java
.../plus/v1/yifu/archives/service/TEmpChangeInfoService.java
+1
-1
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+6
-3
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+10
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpChangeInfoController.java
View file @
e87da21d
...
@@ -125,8 +125,9 @@ public class TEmpChangeInfoController {
...
@@ -125,8 +125,9 @@ public class TEmpChangeInfoController {
*/
*/
@Operation
(
description
=
"分页查询"
)
@Operation
(
description
=
"分页查询"
)
@GetMapping
(
"/getAllDeptPage"
)
@GetMapping
(
"/getAllDeptPage"
)
public
R
<
IPage
<
TSettleDomain
>>
getItemNamePage
(
Page
page
,
String
departName
)
{
public
R
<
IPage
<
TSettleDomain
>>
getItemNamePage
(
Page
page
,
@RequestParam
(
required
=
false
)
String
departName
return
new
R
<>(
tEmpChangeInfoService
.
getAllDeptPage
(
page
,
departName
));
,
@RequestParam
(
required
=
false
)
String
customerId
)
{
return
new
R
<>(
tEmpChangeInfoService
.
getAllDeptPage
(
page
,
departName
,
customerId
));
}
}
/**
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpChangeInfoService.java
View file @
e87da21d
...
@@ -68,5 +68,5 @@ public interface TEmpChangeInfoService extends IService<TEmpChangeInfo> {
...
@@ -68,5 +68,5 @@ public interface TEmpChangeInfoService extends IService<TEmpChangeInfo> {
*/
*/
R
<
List
<
TCustomerInfo
>>
getAllUint
();
R
<
List
<
TCustomerInfo
>>
getAllUint
();
IPage
<
TSettleDomain
>
getAllDeptPage
(
Page
page
,
String
deptName
);
IPage
<
TSettleDomain
>
getAllDeptPage
(
Page
page
,
String
deptName
,
String
customerId
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
e87da21d
...
@@ -304,16 +304,19 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
...
@@ -304,16 +304,19 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
* @Date 2022-07-26
* @Date 2022-07-26
*/
*/
@Override
@Override
public
IPage
<
TSettleDomain
>
getAllDeptPage
(
Page
page
,
String
deptName
)
{
public
IPage
<
TSettleDomain
>
getAllDeptPage
(
Page
page
,
String
deptName
,
String
customerId
)
{
LambdaQueryWrapper
<
TSettleDomain
>
wrapper
=
buildQueryWrapper
(
deptName
);
LambdaQueryWrapper
<
TSettleDomain
>
wrapper
=
buildQueryWrapper
(
deptName
,
customerId
);
return
tSettleDomainMapper
.
selectPage
(
page
,
wrapper
);
return
tSettleDomainMapper
.
selectPage
(
page
,
wrapper
);
}
}
private
LambdaQueryWrapper
buildQueryWrapper
(
String
deptName
)
{
private
LambdaQueryWrapper
buildQueryWrapper
(
String
deptName
,
String
customerId
)
{
LambdaQueryWrapper
<
TSettleDomain
>
wrapper
=
Wrappers
.
lambdaQuery
();
LambdaQueryWrapper
<
TSettleDomain
>
wrapper
=
Wrappers
.
lambdaQuery
();
if
(
Common
.
isNotNull
(
deptName
))
{
if
(
Common
.
isNotNull
(
deptName
))
{
wrapper
.
like
(
TSettleDomain:
:
getDepartName
,
deptName
);
wrapper
.
like
(
TSettleDomain:
:
getDepartName
,
deptName
);
}
}
if
(
Common
.
isNotNull
(
customerId
))
{
wrapper
.
eq
(
TSettleDomain:
:
getCustomerId
,
customerId
);
}
wrapper
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
);
wrapper
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
);
wrapper
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
ZERO_STRING
);
wrapper
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
ZERO_STRING
);
return
wrapper
;
return
wrapper
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
e87da21d
...
@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
...
@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
import
com.yifu.cloud.plus.v1.check.entity.TCheckMobile
;
import
com.yifu.cloud.plus.v1.check.entity.TCheckMobile
;
import
com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants
;
import
com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractAuditMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
...
@@ -83,6 +84,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -83,6 +84,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private
final
TEmpEducationService
tEmpEducationService
;
private
final
TEmpEducationService
tEmpEducationService
;
private
final
TSettleDomainService
tSettleDomainService
;
private
final
TSettleDomainService
tSettleDomainService
;
private
final
TEmployeeContractAuditMapper
contractAuditMapper
;
private
final
TEmployeeContractInfoService
contractServicer
;
private
final
TEmployeeContractInfoService
contractServicer
;
...
@@ -2156,6 +2159,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2156,6 +2159,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
c
.
setAuditStatus
(
CommonConstants
.
TWO_INT
);
c
.
setAuditStatus
(
CommonConstants
.
TWO_INT
);
c
.
setInUse
(
CommonConstants
.
ZERO_STRING
);
c
.
setInUse
(
CommonConstants
.
ZERO_STRING
);
c
.
setAuditTimeLast
(
LocalDateTime
.
now
());
c
.
setAuditTimeLast
(
LocalDateTime
.
now
());
TEmployeeContractAudit
contractAudit
=
new
TEmployeeContractAudit
();
contractAudit
.
setAuditStatus
(
"审核通过"
);
contractAudit
.
setRemark
(
"派单审核通过,同步审核通过合同"
);
contractAudit
.
setLinkId
(
c
.
getId
());
contractAudit
.
setLinkType
(
CommonConstants
.
ONE_INT
);
contractAudit
.
setRootName
(
"合同审核-派单审核通过"
);
contractAuditMapper
.
insert
(
contractAudit
);
contractServicer
.
updateInUseStatusById
(
c
.
getEmpId
(),
c
.
getDeptNo
(),
c
.
getId
());
contractServicer
.
updateInUseStatusById
(
c
.
getEmpId
(),
c
.
getDeptNo
(),
c
.
getId
());
//审核不同
//审核不同
}
else
if
(
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getType
())){
}
else
if
(
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getType
())){
...
...
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