Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-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
赵啸非
attendance-performance-platform
Commits
77f18581
Commit
77f18581
authored
Jul 19, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改考勤汇总
parent
89fb7c26
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
4 deletions
+14
-4
attendance-performance-manager/pom.xml
attendance-performance-manager/pom.xml
+2
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/TestController.java
...r/src/main/java/com/mortals/xhx/busiz/TestController.java
+7
-3
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/DeptService.java
...java/com/mortals/xhx/module/dept/service/DeptService.java
+3
-0
attendance-performance-manager/src/main/resources/bootstrap.yml
...ance-performance-manager/src/main/resources/bootstrap.yml
+1
-0
attendance-performance-manager/src/main/resources/config/mybatis-sqlmap-config.xml
...nager/src/main/resources/config/mybatis-sqlmap-config.xml
+1
-1
No files found.
attendance-performance-manager/pom.xml
View file @
77f18581
...
@@ -68,6 +68,7 @@
...
@@ -68,6 +68,7 @@
<profiles.hik.appSecret>
2m9RcPJOKq5j2QPQM4v5
</profiles.hik.appSecret>
<profiles.hik.appSecret>
2m9RcPJOKq5j2QPQM4v5
</profiles.hik.appSecret>
<profiles.dingtalk.domain>
https://oapi.dingtalk.com
</profiles.dingtalk.domain>
<profiles.dingtalk.domain>
https://oapi.dingtalk.com
</profiles.dingtalk.domain>
<profiles.dingtalk.oaUrl>
api.dingtalk.com
</profiles.dingtalk.oaUrl>
<profiles.dingtalk.agentId>
2652674890
</profiles.dingtalk.agentId>
<profiles.dingtalk.agentId>
2652674890
</profiles.dingtalk.agentId>
<profiles.dingtalk.appKey>
dingpqzradgfr4efdi2j
</profiles.dingtalk.appKey>
<profiles.dingtalk.appKey>
dingpqzradgfr4efdi2j
</profiles.dingtalk.appKey>
<profiles.dingtalk.appSecret>
bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd
</profiles.dingtalk.appSecret>
<profiles.dingtalk.appSecret>
bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd
</profiles.dingtalk.appSecret>
...
@@ -98,6 +99,7 @@
...
@@ -98,6 +99,7 @@
<profiles.hik.appSecret>
2m9RcPJOKq5j2QPQM4v5
</profiles.hik.appSecret>
<profiles.hik.appSecret>
2m9RcPJOKq5j2QPQM4v5
</profiles.hik.appSecret>
<profiles.dingtalk.domain>
http://172.15.28.113:8918
</profiles.dingtalk.domain>
<profiles.dingtalk.domain>
http://172.15.28.113:8918
</profiles.dingtalk.domain>
<profiles.dingtalk.oaUrl>
172.15.28.113:8919
</profiles.dingtalk.oaUrl>
<profiles.dingtalk.agentId>
2652674890
</profiles.dingtalk.agentId>
<profiles.dingtalk.agentId>
2652674890
</profiles.dingtalk.agentId>
<profiles.dingtalk.appKey>
dingpqzradgfr4efdi2j
</profiles.dingtalk.appKey>
<profiles.dingtalk.appKey>
dingpqzradgfr4efdi2j
</profiles.dingtalk.appKey>
<profiles.dingtalk.appSecret>
bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd
</profiles.dingtalk.appSecret>
<profiles.dingtalk.appSecret>
bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd
</profiles.dingtalk.appSecret>
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/TestController.java
View file @
77f18581
...
@@ -93,10 +93,14 @@ public class TestController {
...
@@ -93,10 +93,14 @@ public class TestController {
log
.
info
(
"更新部门用户数量"
);
log
.
info
(
"更新部门用户数量"
);
Map
<
Long
,
Long
>
collect
=
staffService
.
find
(
new
StaffQuery
()).
stream
().
collect
(
Collectors
.
groupingBy
(
x
->
x
.
getDeptId
(),
Collectors
.
counting
()));
Map
<
Long
,
Long
>
collect
=
staffService
.
find
(
new
StaffQuery
()).
stream
().
collect
(
Collectors
.
groupingBy
(
x
->
x
.
getDeptId
(),
Collectors
.
counting
()));
DeptEntity
deptEntity1
=
new
DeptEntity
();
deptEntity1
.
setPersonNum
(
0
);
deptService
.
getDao
().
update
(
deptEntity1
,
new
HashMap
<>());
collect
.
entrySet
().
stream
().
forEach
(
item
->
{
collect
.
entrySet
().
stream
().
forEach
(
item
->
{
Long
deptId
=
item
.
getKey
();
Long
deptId
=
item
.
getKey
();
Long
count
=
item
.
getValue
();
Long
count
=
item
.
getValue
();
log
.
info
(
"dept
:{},num:{}"
,
deptId
,
count
);
log
.
info
(
"dept
Id:{},num:{}"
,
deptId
,
count
);
DeptEntity
deptEntity
=
deptService
.
get
(
deptId
);
DeptEntity
deptEntity
=
deptService
.
get
(
deptId
);
if
(!
ObjectUtils
.
isEmpty
(
deptEntity
))
{
if
(!
ObjectUtils
.
isEmpty
(
deptEntity
))
{
deptEntity
.
setPersonNum
(
count
.
intValue
());
deptEntity
.
setPersonNum
(
count
.
intValue
());
...
@@ -114,7 +118,7 @@ public class TestController {
...
@@ -114,7 +118,7 @@ public class TestController {
if
(!
ObjectUtils
.
isEmpty
(
deptEntity
)
&&
!
ObjectUtils
.
isEmpty
(
deptEntity
.
getParentId
()))
{
if
(!
ObjectUtils
.
isEmpty
(
deptEntity
)
&&
!
ObjectUtils
.
isEmpty
(
deptEntity
.
getParentId
()))
{
int
sum
=
deptService
.
find
(
new
DeptQuery
().
parentId
(
deptEntity
.
getId
())).
stream
().
mapToInt
(
i
->
i
.
getPersonNum
()).
sum
();
int
sum
=
deptService
.
find
(
new
DeptQuery
().
parentId
(
deptEntity
.
getId
())).
stream
().
mapToInt
(
i
->
i
.
getPersonNum
()).
sum
();
DeptEntity
parentDept
=
deptService
.
get
(
deptEntity
.
getParentId
());
DeptEntity
parentDept
=
deptService
.
get
(
deptEntity
.
getParentId
());
log
.
info
(
"dept:{},
num:{}"
,
parentDept
.
getDeptName
(),
sum
);
log
.
info
(
"dept:{},
sum:{}"
,
parentDept
.
getDeptName
(),
sum
);
if
(
ObjectUtils
.
isEmpty
(
parentDept
))
{
if
(
ObjectUtils
.
isEmpty
(
parentDept
))
{
parentDept
.
setPersonNum
(
sum
);
parentDept
.
setPersonNum
(
sum
);
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/DeptService.java
View file @
77f18581
package
com.mortals.xhx.module.dept.service
;
package
com.mortals.xhx.module.dept.service
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.service.ICRUDService
;
import
com.mortals.framework.service.ICRUDService
;
import
com.mortals.xhx.module.dept.dao.DeptDao
;
import
com.mortals.xhx.module.dept.model.DeptEntity
;
import
com.mortals.xhx.module.dept.model.DeptEntity
;
import
com.mortals.xhx.module.dept.model.DeptTreeSelect
;
import
com.mortals.xhx.module.dept.model.DeptTreeSelect
;
...
@@ -15,6 +16,8 @@ import java.util.List;
...
@@ -15,6 +16,8 @@ import java.util.List;
*/
*/
public
interface
DeptService
extends
ICRUDService
<
DeptEntity
,
Long
>{
public
interface
DeptService
extends
ICRUDService
<
DeptEntity
,
Long
>{
DeptDao
getDao
();
/**
/**
* 是否存在部门信息节点
* 是否存在部门信息节点
*
*
...
...
attendance-performance-manager/src/main/resources/bootstrap.yml
View file @
77f18581
...
@@ -74,4 +74,5 @@ dingtalk:
...
@@ -74,4 +74,5 @@ dingtalk:
AppSecret
:
@
profiles.dingtalk.appSecret@
AppSecret
:
@
profiles.dingtalk.appSecret@
AesKey
:
@
profiles.dingtalk.aesKey@
AesKey
:
@
profiles.dingtalk.aesKey@
token
:
@
profiles.dingtalk.token@
token
:
@
profiles.dingtalk.token@
oaUrl
:
@
profiles.dingtalk.oaUrl@
attendance-performance-manager/src/main/resources/config/mybatis-sqlmap-config.xml
View file @
77f18581
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<plugin
interceptor=
"com.mortals.framework.thirty.mybatis.LogInterceptor"
>
<plugin
interceptor=
"com.mortals.framework.thirty.mybatis.LogInterceptor"
>
<property
name=
"enableExecutorTime"
value=
"true"
/>
<property
name=
"enableExecutorTime"
value=
"true"
/>
<property
name=
"showSql"
value=
"
tru
e"
/>
<property
name=
"showSql"
value=
"
fals
e"
/>
</plugin>
</plugin>
</plugins>
</plugins>
</configuration>
</configuration>
\ No newline at end of file
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