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
8c11c35e
Commit
8c11c35e
authored
Mar 04, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
42b32858
5fe7354a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
5 deletions
+73
-5
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+10
-0
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+52
-5
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+4
-0
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+7
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
8c11c35e
...
...
@@ -16,6 +16,7 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
...
...
@@ -24,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Size
;
...
...
@@ -425,4 +427,12 @@ public class TEmployeeProject extends BaseEntity {
@TableField
(
exist
=
false
)
private
LocalDateTime
createTimeEnd
;
@Schema
(
description
=
"所属部门名称"
)
@TableField
(
exist
=
false
)
private
String
empDeptname
;
@Schema
(
description
=
"所属部门id"
)
@TableField
(
exist
=
false
)
private
String
empDeptid
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
8c11c35e
...
...
@@ -253,6 +253,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
tEmployeeProject
.
setProjectSource
(
CommonConstants
.
dingleDigitStrArray
[
5
]);
this
.
save
(
tEmployeeProject
);
// 新增,同步CSP
this
.
doSaveBelongDept
(
tEmployeeProject
,
CommonConstants
.
ONE_STRING
);
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tEmployeeProject
.
getEmpNatrue
()))
{
tEmployeeInfo
.
setEmpNatrue
(
CommonConstants
.
ZERO_STRING
);
}
else
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tEmployeeProject
.
getEmpNatrue
())
&&
...
...
@@ -342,6 +345,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
tEmployeeProject
.
setDeleteFlag
(
CommonConstants
.
ONE_STRING
);
baseMapper
.
updateById
(
tEmployeeProject
);
// 减少,同步CSP
YifuUser
user
=
SecurityUtils
.
getUser
();
tEmployeeProject
.
setLeaveTime
(
LocalDateTime
.
now
());
tEmployeeProject
.
setLeaveUser
(
user
.
getNickname
());
this
.
doSaveBelongDept
(
tEmployeeProject
,
CommonConstants
.
TWO_STRING
);
//更新操作记录
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
tEmployeeProject
.
getId
(),
compareProject
,
tEmployeeProject
);
...
...
@@ -354,7 +363,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
Common
.
isNotNull
(
tEmployeeInfo
))
{
updList
.
add
(
tEmployeeInfo
);
YifuUser
user
=
SecurityUtils
.
getUser
();
doJointTask
.
doUpdateEmployeeInfo
(
updList
,
user
);
}
return
R
.
ok
();
...
...
@@ -383,6 +391,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
dingleDigitIntArray
[
0
]);
this
.
updateById
(
tEmployeeProject
);
// 增加,同步CSP
this
.
doSaveBelongDept
(
tEmployeeProject
,
CommonConstants
.
ONE_STRING
);
TEmployeeInfo
tEmployeeInfo
=
tEmployeeInfoMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
tEmployeeProject
.
getEmpIdcard
())
.
eq
(
TEmployeeInfo:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
...
...
@@ -423,6 +434,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
TEmployeeProject
tEmployeeProject
=
this
.
getById
(
empProId
);
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
dingleDigitIntArray
[
0
]);
this
.
updateById
(
tEmployeeProject
);
// 增加,同步CSP
this
.
doSaveBelongDept
(
tEmployeeProject
,
CommonConstants
.
ONE_STRING
);
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
empProId
,
tEmployeeProjectOld
,
tEmployeeProject
);
...
...
@@ -494,9 +509,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
R
.
failed
(
errorTemp
.
substring
(
0
,
errorTemp
.
length
()-
1
)
+
",禁止减项"
);
}
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
dingleDigitIntArray
[
1
]);
YifuUser
user
=
SecurityUtils
.
getUser
();
tEmployeeProject
.
setLeaveUser
(
user
.
getNickname
());
tEmployeeProject
.
setLeaveTime
(
LocalDateTime
.
now
());
this
.
updateById
(
tEmployeeProject
);
// 减少,同步CSP
this
.
doSaveBelongDept
(
tEmployeeProject
,
CommonConstants
.
TWO_STRING
);
TEmployeeInfo
tEmployeeInfo
=
tEmployeeInfoMapper
.
selectById
(
tEmployeeProject
.
getEmpId
());
//查询该人员其他的项目档案
...
...
@@ -516,7 +537,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
tEmployeeInfo
.
setLeaveRemark
(
tEmployeeProject
.
getLeaveRemark
());
}
tEmployeeInfo
.
setLeaveTime
(
DateUtil
.
getCurrentDateTime
());
YifuUser
user
=
SecurityUtils
.
getUser
();
tEmployeeInfo
.
setLeaveUser
(
user
.
getId
());
tEmployeeInfo
.
setLeaveUserName
(
user
.
getNickname
());
code
=
CommonConstants
.
ONE_STRING
;
...
...
@@ -637,6 +657,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
long
contractCount
;
StringBuilder
errorTemp
;
StringBuilder
errorMessage
;
YifuUser
user
=
SecurityUtils
.
getUser
();
// 执行数据插入操作 组装 PostDto
for
(
EmployeeXProjectVO
excel
:
excelVOList
)
{
//根据身份证和项目编码获取项目档案
...
...
@@ -702,6 +723,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
tEmployeeProject
.
setLeaveReason
(
excel
.
getLeaveReason
());
tEmployeeProject
.
setLeaveRemark
(
excel
.
getLeaveRemark
());
tEmployeeProject
.
setLeaveTime
(
LocalDateTime
.
now
());
tEmployeeProject
.
setLeaveUser
(
user
.
getNickname
());
updProjectList
.
add
(
tEmployeeProject
);
newOldProject
=
new
EmployeeProjectNewOldVO
();
...
...
@@ -720,11 +742,16 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(!
errorMessageList
.
isEmpty
())
{
return
R
.
failed
(
errorMessageList
);
}
else
{
YifuUser
user
=
SecurityUtils
.
getUser
();
//更新项目档案
if
(!
updProjectList
.
isEmpty
())
{
baseMapper
.
updateReduceEmpProject
(
updProjectList
);
for
(
TEmployeeProject
reduceProject
:
updProjectList
)
{
// 减少,同步CSP
this
.
doSaveBelongDept
(
reduceProject
,
CommonConstants
.
TWO_STRING
);
}
}
//更新人员档案
if
(!
updList
.
isEmpty
())
{
List
<
TEmployeeInfo
>
updEmpInfoList
=
updList
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
...
...
@@ -936,6 +963,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
if
(!
proInsList
.
isEmpty
())
{
baseMapper
.
insertExcelEmpProject
(
proInsList
);
for
(
TEmployeeProject
addProject
:
proInsList
)
{
// 增加,同步CSP
this
.
doSaveBelongDept
(
addProject
,
CommonConstants
.
ONE_STRING
);
}
}
if
(!
proupdateList
.
isEmpty
())
{
baseMapper
.
updateExcelEmpProject
(
proupdateList
);
...
...
@@ -1142,6 +1173,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
list
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
().
in
(
TEmployeeProject:
:
getId
,
ids
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
}
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
Common
.
isNotEmpty
(
list
))
{
TEmployeeInfo
tEmployeeInfo
;
int
i
=
0
;
...
...
@@ -1158,6 +1190,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
if
(
CommonConstants
.
dingleDigitIntArray
[
0
]
==
delProject
.
getStatus
())
{
delProject
.
setDeleteFlag
(
CommonConstants
.
ONE_STRING
);
delProject
.
setLeaveTime
(
LocalDateTime
.
now
());
delProject
.
setLeaveUser
(
user
.
getNickname
());
updList
.
add
(
delProject
);
tEmployeeInfo
=
tEmployeeInfoMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
delProject
.
getEmpIdcard
())
...
...
@@ -1180,10 +1214,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(!
updList
.
isEmpty
())
{
for
(
TEmployeeProject
tEmployeeProject
:
updList
)
{
baseMapper
.
updateById
(
tEmployeeProject
);
// 减少,同步CSP
this
.
doSaveBelongDept
(
tEmployeeProject
,
CommonConstants
.
TWO_STRING
);
}
}
if
(!
infoUpdList
.
isEmpty
())
{
YifuUser
user
=
SecurityUtils
.
getUser
();
doJointTask
.
doUpdateEmployeeInfo
(
infoUpdList
,
user
);
}
}
...
...
@@ -1295,6 +1331,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
tEmployeeProject
.
setUnitName
(
tSettleDomain
.
getCustomerName
());
}
baseMapper
.
insert
(
tEmployeeProject
);
// 增加,同步CSP
this
.
doSaveBelongDept
(
tEmployeeProject
,
CommonConstants
.
ONE_STRING
);
}
/**
...
...
@@ -1337,7 +1375,16 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
project
.
setProjectStatus
(
CommonConstants
.
ZERO_INT
);
}
project
.
setDeleteFlag
(
CommonConstants
.
STATUS_NORMAL
);
return
this
.
list
(
Wrappers
.
query
(
project
));
List
<
TEmployeeProject
>
projectList
=
this
.
list
(
Wrappers
.
query
(
project
));
TEmployeeProjectBelongDept
dept
;
for
(
TEmployeeProject
employeeProject
:
projectList
)
{
dept
=
tEmployeeProjectBelongDeptService
.
getById
(
employeeProject
.
getId
());
if
(
dept
!=
null
)
{
employeeProject
.
setEmpDeptid
(
dept
.
getEmpDeptid
());
employeeProject
.
setEmpDeptname
(
dept
.
getEmpDeptname
());
}
}
return
projectList
;
}
@Override
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
8c11c35e
...
...
@@ -1841,6 +1841,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
emp
==
null
)
{
return
R
.
failed
(
"新建员工失败!"
);
}
// 增加,同步CSP
tEmployeeProjectService
.
doSaveBelongDept
(
project
,
CommonConstants
.
ONE_STRING
);
// 更新或新增薪资人员
// 2024-11-6 16:56:46 新逻辑:在项人员,要更新薪资人员,及时卡号为空也要更新
if
(
Common
.
isNotNull
(
tPreEmployeeInfo
.
getBankNo
())
||
isMustUpdateSalary
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
8c11c35e
...
...
@@ -811,6 +811,13 @@
</if>
</foreach>
</trim>
<trim
prefix=
"LEAVE_USER =case"
suffix=
"end,"
>
<foreach
collection=
"list"
item=
"i"
index=
"index"
>
<if
test=
"i.leaveUser!=null"
>
when ID=#{i.id} then #{i.leaveUser}
</if>
</foreach>
</trim>
<trim
prefix=
"LEAVE_REMARK =case"
suffix=
"end,"
>
<foreach
collection=
"list"
item=
"i"
index=
"index"
>
<if
test=
"i.leaveRemark!=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