Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
enterprise-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
enterprise-platform
Commits
2595f6a5
Commit
2595f6a5
authored
Oct 18, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加离职管理
parent
e8b6856c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java
...s/xhx/module/company/service/impl/CompanyServiceImpl.java
+0
-3
enterprise-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
...rtals/xhx/module/staff/service/impl/StaffServiceImpl.java
+1
-0
enterprise-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
...ava/com/mortals/xhx/module/staff/web/StaffController.java
+2
-1
No files found.
enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java
View file @
2595f6a5
...
...
@@ -200,10 +200,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
homeStatInfo
.
setProductDistributionList
(
companyList
);
//发送名片分布
List
<
BussinesscardEntity
>
bussinesscardList
=
bussinesscardService
.
find
(
new
BussinesscardQuery
());
Map
<
String
,
Integer
>
collect
=
bussinesscardList
.
stream
().
collect
(
Collectors
.
groupingBy
(
x
->
x
.
getCompanyId
(),
Collectors
.
summingInt
(
BussinesscardEntity:
:
getSendBusinessCardTimes
)));
/* Map<String, Integer> collect = staffList.stream().collect(Collectors.groupingBy(x -> x.getCompanyIds(), Collectors.summingInt(StaffEntity::getSendBusinessCardTimes)));
*/
...
...
enterprise-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
View file @
2595f6a5
...
...
@@ -53,6 +53,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
staffLeave
.
initAttrValue
();
BeanUtils
.
copyProperties
(
staffCache
,
staffLeave
,
BeanUtil
.
getNullPropertyNames
(
staffCache
));
staffLeave
.
setId
(
null
);
staffLeave
.
setCreateTime
(
new
Date
());
staffLeaveService
.
save
(
staffLeave
,
context
);
}
return
Rest
.
ok
();
...
...
enterprise-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @
2595f6a5
...
...
@@ -113,7 +113,8 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
try
{
Rest
<
Void
>
rest
=
this
.
service
.
leave
(
staff
,
getContext
());
ret
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
ret
.
put
(
KEY_RESULT_DATA
,
model
);
ret
.
put
(
KEY_RESULT_MSG
,
"员工离职成功!"
);
recordSysLog
(
request
,
busiDesc
+
"【成功】"
);
}
catch
(
Exception
e
)
{
log
.
error
(
"离职"
,
e
);
...
...
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