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
7638cff7
You need to sign in or sign up before continuing.
Commit
7638cff7
authored
Mar 27, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8
parents
8063bdf0
524d9295
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
11 deletions
+30
-11
SysAutoDictItemController.java
...1/yifu/archives/controller/SysAutoDictItemController.java
+1
-0
SysAutoDictItemServiceImpl.java
...ifu/archives/service/impl/SysAutoDictItemServiceImpl.java
+1
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+4
-0
ExcelUtil.java
...m/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java
+2
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+22
-9
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/SysAutoDictItemController.java
View file @
7638cff7
...
...
@@ -181,6 +181,7 @@ public class SysAutoDictItemController {
SysAutoDictItemVo
settleDomainSelectVo
=
new
SysAutoDictItemVo
();
LambdaQueryWrapper
<
SysAutoDictItem
>
dictQuery
=
Wrappers
.<
SysAutoDictItem
>
lambdaQuery
()
.
eq
(
SysAutoDictItem:
:
getDeptNo
,
dictItemVo
.
getDeptNo
())
.
eq
(
SysAutoDictItem:
:
getDisable
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysAutoDictItem:
:
getDelFlag
,
CommonConstants
.
NOT_DELETE_FLAG
);
List
<
SysAutoDictItem
>
list
=
sysAutoDictItemService
.
list
(
dictQuery
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/SysAutoDictItemServiceImpl.java
View file @
7638cff7
...
...
@@ -260,6 +260,7 @@ public class SysAutoDictItemServiceImpl extends ServiceImpl<SysAutoDictItemMappe
@Override
public
List
<
SysAutoDictItem
>
selectByDeptNo
(
SysAutoDictItemSearchVo
searchVo
)
{
LambdaQueryWrapper
<
SysAutoDictItem
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
eq
(
SysAutoDictItem:
:
getDisable
,
CommonConstants
.
ZERO_STRING
);
wrapper
.
eq
(
SysAutoDictItem:
:
getDelFlag
,
CommonConstants
.
NOT_DELETE_FLAG
);
if
(
Common
.
isNotNull
(
searchVo
.
getDeptNo
())){
wrapper
.
eq
(
SysAutoDictItem:
:
getDeptNo
,
searchVo
.
getDeptNo
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
7638cff7
...
...
@@ -2844,6 +2844,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
project
.
setProjectSource
(
CommonConstants
.
ONE_STRING
);
project
.
setEmpNo
(
tEmployeeProjectService
.
getEmpNo
(
project
.
getDeptNo
()));
tEmployeeProjectService
.
save
(
project
);
// 增加,同步CSP
tEmployeeProjectService
.
doSaveBelongDept
(
project
,
CommonConstants
.
ONE_STRING
);
// 更新入职待建档状态为已完成
registrationPreService
.
updatePreStatusToEnd
(
project
.
getDeptNo
(),
project
.
getEmpIdcard
());
projectAdd
.
setId
(
project
.
getId
());
projectAdd
.
setEmpNo
(
project
.
getEmpNo
());
projectsMap
.
put
(
project
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
project
.
getDeptNo
(),
projectAdd
);
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java
View file @
7638cff7
...
...
@@ -659,7 +659,7 @@ public class ExcelUtil <T> implements Serializable {
private
String
validateUtil
(
String
c
,
ExcelAttribute
attr
,
int
i
)
{
//非空校验
if
(
attr
.
isNotEmpty
()
&&
!
Common
.
isNotNull
(
c
))
{
return
errorInfo
(
attr
,
"_
字段
不可为空"
,
i
);
return
errorInfo
(
attr
,
"_不可为空"
,
i
);
}
if
(
Common
.
isNotNull
(
c
))
{
//日期格式校验
...
...
@@ -780,7 +780,7 @@ public class ExcelUtil <T> implements Serializable {
if
(
null
!=
errorMessageHashMap
&&
null
!=
errorMessage
)
{
temp
=
errorMessageHashMap
.
get
(
errorMessage
.
getLineNum
());
if
(
null
!=
temp
)
{
temp
.
setMessage
(
temp
.
getMessage
()
+
CommonConstants
.
DOWN_LINE_STRING
+
errorMessage
.
getMessage
());
temp
.
setMessage
(
temp
.
getMessage
()
+
";"
+
errorMessage
.
getMessage
());
errorMessageHashMap
.
put
(
temp
.
getLineNum
(),
temp
);
}
else
{
errorMessageHashMap
.
put
(
errorMessage
.
getLineNum
(),
errorMessage
);
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
7638cff7
...
...
@@ -933,17 +933,30 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
**/
@Override
public
TEmployeeProjectBelongDept
getZeroRegistrationAndUpdateTwo
(
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
)
{
List
<
TEmployeeProjectBelongDept
>
belongDeptList
=
baseMapper
.
getZeroRegistrationByIdCard
(
searchCspVo
);
if
(
belongDeptList
!=
null
&&
!
belongDeptList
.
isEmpty
())
{
// 1:加日志
if
(
doSaveLogBatch
(
searchCspVo
,
belongDeptList
))
return
null
;
// 更新为已处理
baseMapper
.
updateTwoRegistrationByIdCard
(
searchCspVo
);
return
belongDeptList
.
get
(
0
);
}
else
{
EmployeeRegistration
registration
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getDeptId
,
searchCspVo
.
getDeptId
())
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
searchCspVo
.
getEmpIdCard
())
.
eq
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
EmployeeRegistration:
:
getDataSource
,
CommonConstants
.
TWO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
registration
))
{
registration
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
baseMapper
.
updateById
(
registration
);
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
MESSAGE_FINISH
,
searchCspVo
.
getEmpCreateAndLeaveTime
(),
searchCspVo
.
getEmpCreateAndLeaveUser
(),
RegistConstants
.
BEFORE_IN_PROJECT
);
return
null
;
}
else
{
List
<
TEmployeeProjectBelongDept
>
belongDeptList
=
baseMapper
.
getZeroRegistrationByIdCard
(
searchCspVo
);
if
(
belongDeptList
!=
null
&&
!
belongDeptList
.
isEmpty
())
{
// 1:加日志
if
(
doSaveLogBatch
(
searchCspVo
,
belongDeptList
))
return
null
;
// 更新为已处理
baseMapper
.
updateTwoRegistrationByIdCard
(
searchCspVo
);
return
belongDeptList
.
get
(
0
);
}
else
{
return
null
;
}
}
}
/**
...
...
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