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
ecfb30ee
Commit
ecfb30ee
authored
Dec 18, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试bug修改
parent
58b91050
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
6 deletions
+24
-6
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/StaffApiController.java
...com/mortals/xhx/busiz/applets/web/StaffApiController.java
+1
-1
enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/BussinesscardService.java
...hx/module/bussinesscard/service/BussinesscardService.java
+2
-1
enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/impl/BussinesscardServiceImpl.java
.../bussinesscard/service/impl/BussinesscardServiceImpl.java
+19
-1
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/vo/HomeStatInfo.java
...com/mortals/xhx/module/company/model/vo/HomeStatInfo.java
+1
-2
enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java
...s/xhx/module/company/service/impl/CompanyServiceImpl.java
+1
-1
No files found.
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/StaffApiController.java
View file @
ecfb30ee
...
...
@@ -137,7 +137,7 @@ public class StaffApiController extends AbstractBaseController<StaffReq>{
}
try
{
if
(!
ObjectUtils
.
isEmpty
(
staffReq
.
getId
())){
bussinesscardService
.
sendBusinessCard
(
staffReq
.
getId
());
bussinesscardService
.
sendBusinessCard
(
staffReq
.
getId
()
,
context
);
}
else
{
rest
=
Rest
.
fail
(
"缺少id"
);
}
...
...
enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/BussinesscardService.java
View file @
ecfb30ee
package
com.mortals.xhx.module.bussinesscard.service
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.service.ICRUDService
;
import
com.mortals.xhx.module.bussinesscard.model.BussinesscardEntity
;
import
com.mortals.xhx.module.bussinesscard.dao.BussinesscardDao
;
...
...
@@ -18,5 +19,5 @@ public interface BussinesscardService extends ICRUDService<BussinesscardEntity,L
* 发送名片
* @param id
*/
void
sendBusinessCard
(
Long
id
);
void
sendBusinessCard
(
Long
id
,
Context
context
);
}
\ No newline at end of file
enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/impl/BussinesscardServiceImpl.java
View file @
ecfb30ee
...
...
@@ -3,6 +3,8 @@ import com.alibaba.fastjson.JSON;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.util.DataUtil
;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.xhx.base.system.user.model.UserEntity
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.module.company.model.CompanyEntity
;
import
com.mortals.xhx.module.company.service.CompanyService
;
import
com.mortals.xhx.module.favorites.model.FavoritesBusinesscardEntity
;
...
...
@@ -45,6 +47,8 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
private
FavoritesBusinesscardService
favoritesBusinesscardService
;
@Autowired
private
StaffService
staffService
;
@Autowired
private
UserService
userService
;
@Override
protected
void
saveBefore
(
BussinesscardEntity
entity
,
Context
context
)
throws
AppException
{
...
...
@@ -116,7 +120,7 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
}
@Override
public
void
sendBusinessCard
(
Long
id
)
{
public
void
sendBusinessCard
(
Long
id
,
Context
context
)
{
BussinesscardEntity
entity
=
this
.
get
(
id
);
if
(
entity
!=
null
)
{
Map
condition
=
new
HashMap
();
...
...
@@ -126,5 +130,19 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
data
.
put
(
"updateTime"
,
new
Date
());
this
.
dao
.
update
(
data
,
condition
);
}
if
(
context
!=
null
&&
context
.
getUser
()!=
null
){
UserEntity
userEntity
=
userService
.
get
(
context
.
getUser
().
getId
());
if
(
userEntity
!=
null
&&
userEntity
.
getStaffId
()!=
null
){
StaffEntity
staffEntity
=
staffService
.
get
(
userEntity
.
getStaffId
());
if
(
staffEntity
!=
null
){
Map
condition
=
new
HashMap
();
condition
.
put
(
"id"
,
staffEntity
.
getId
());
Map
data
=
new
HashMap
();
data
.
put
(
"sendBusinessCardTimesIncrement"
,
1
);
data
.
put
(
"updateTime"
,
new
Date
());
staffService
.
getDao
().
update
(
data
,
condition
);
}
}
}
}
}
\ No newline at end of file
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/vo/HomeStatInfo.java
View file @
ecfb30ee
package
com.mortals.xhx.module.company.model.vo
;
import
com.mortals.xhx.module.bussinesscard.model.BussinesscardEntity
;
import
com.mortals.xhx.module.company.model.CompanyEntity
;
import
com.mortals.xhx.module.news.model.NewsCategoryEntity
;
import
com.mortals.xhx.module.product.model.ProductEntity
;
...
...
@@ -74,7 +73,7 @@ public class HomeStatInfo {
/**
* 发送卡片总量
*/
private
List
<
Bussinesscard
Entity
>
sendCardStaffList
;
private
List
<
Staff
Entity
>
sendCardStaffList
;
}
enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java
View file @
ecfb30ee
...
...
@@ -289,7 +289,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
homeStatInfo
.
setAccessStatList
(
dayAccessList
);
homeStatInfo
.
setSendCardStaffList
(
bussinesscard
List
);
homeStatInfo
.
setSendCardStaffList
(
staff
List
);
return
Rest
.
ok
(
homeStatInfo
);
}
...
...
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