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
81b38a24
Commit
81b38a24
authored
Jul 15, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
0cac0506
ca3a158d
Changes
22
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
9737 additions
and
9207 deletions
+9737
-9207
attendance-performance-manager-ui/admin/src/components/Header.vue
...ce-performance-manager-ui/admin/src/components/Header.vue
+5
-7
attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue
...ger-ui/admin/src/views/check/attend/record/drawershow.vue
+4
-2
attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue
...r-ui/admin/src/views/check/complain/record/drawershow.vue
+3
-2
attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue
...ger-ui/admin/src/views/check/effect/record/drawershow.vue
+3
-2
attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue
...ger-ui/admin/src/views/check/gowork/record/drawershow.vue
+3
-2
attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue
...ager-ui/admin/src/views/check/other/record/drawershow.vue
+3
-2
attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue
...ger-ui/admin/src/views/check/review/record/drawershow.vue
+3
-2
attendance-performance-manager-ui/admin/src/views/homeCharts/record/list.vue
...nce-manager-ui/admin/src/views/homeCharts/record/list.vue
+305
-155
attendance-performance-manager-ui/admin/yarn.lock
attendance-performance-manager-ui/admin/yarn.lock
+9034
-9019
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformAttendAppealDao.java
...ortals/xhx/module/perform/dao/PerformAttendAppealDao.java
+8
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformAttendAppealDaoImpl.java
...module/perform/dao/ibatis/PerformAttendAppealDaoImpl.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/AppealSummaryQuery.java
...rtals/xhx/module/perform/model/vo/AppealSummaryQuery.java
+16
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/PerformAttendAppealService.java
...hx/module/perform/service/PerformAttendAppealService.java
+7
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendAppealServiceImpl.java
.../perform/service/impl/PerformAttendAppealServiceImpl.java
+32
-13
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java
...xhx/module/perform/web/PerformAttendAppealController.java
+43
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/StaffPerformStatDao.java
...com/mortals/xhx/module/staff/dao/StaffPerformStatDao.java
+18
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/ibatis/StaffPerformStatDaoImpl.java
.../xhx/module/staff/dao/ibatis/StaffPerformStatDaoImpl.java
+15
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffPerformStatService.java
...als/xhx/module/staff/service/StaffPerformStatService.java
+7
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffPerformStatServiceImpl.java
...odule/staff/service/impl/StaffPerformStatServiceImpl.java
+38
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformStatController.java
...tals/xhx/module/staff/web/StaffPerformStatController.java
+69
-1
attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformAttendAppealMapperExt.xml
...es/sqlmap/module/perform/PerformAttendAppealMapperExt.xml
+21
-0
attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffPerformStatMapperExt.xml
...sources/sqlmap/module/staff/StaffPerformStatMapperExt.xml
+94
-0
No files found.
attendance-performance-manager-ui/admin/src/components/Header.vue
View file @
81b38a24
...
...
@@ -11,11 +11,11 @@
<router-link
to=
"/"
>
<img
src=
"../assets/images/logo.png"
style=
"margin-bottom:
5px;margin-left: 24px;
"
style=
"margin-bottom:
5px; margin-left: 24px
"
height=
"40"
alt=
""
/>
<b
style=
"color:
white;font-size:20px;
"
>
<b
style=
"color:
white; font-size: 20px
"
>
智慧政务绩效管理系统
</b>
...
...
@@ -43,14 +43,14 @@
</el-badge>
</div>
-->
<div
class=
"controllBar"
@
click=
"returnHome"
>
<i
class=
"el-icon-s-home"
style=
"font-size: 15px;margin-right: 10px"
>
<i
class=
"el-icon-s-home"
style=
"font-size: 15px;
margin-right: 10px"
>
首页
</i
>
</div>
<div
class=
"layout-profile"
>
<el-dropdown
@
command=
"handleCommand"
>
<span
class=
"el-dropdown-link"
style=
"color:white"
>
<span
class=
"el-dropdown-link"
style=
"color:
white"
>
{{
userData
.
currUserName
}}
<i
class=
"el-icon-arrow-down el-icon--right"
></i>
</span>
...
...
@@ -124,9 +124,7 @@ export default {
beforeDestroy
()
{
console
.
log
(
"
beforeDestroy
"
);
},
mounted
()
{
console
.
log
(
this
.
menu
);
},
mounted
()
{},
computed
:
{
group
()
{
const
relativeGroup
=
this
.
$store
.
state
.
group
;
...
...
attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue
View file @
81b38a24
...
...
@@ -137,9 +137,9 @@
<el-row>
<el-form-item
label=
"加分/扣除分值:"
>
<p
v-if=
"form.view == '查看'"
>
{{
form
.
score
?
form
.
score
:
"
--
"
}}
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}
{{
form
.
score
?
form
.
score
:
"
--
"
}}
</p>
<p
v-else
>
{{
form
.
score
}}
</p>
<p
v-else
>
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}{{
form
.
score
}}
</p>
</el-form-item>
</el-row>
</div>
...
...
@@ -368,10 +368,12 @@ export default {
kaoqinCateArr
:
[],
kaoqinArr
:
[],
baseUrl
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
urls
:{
saveUrl
:
'
/check/attend/record/examine
'
}
//重写核查地址
};
},
computed
:
{},
methods
:
{
// 审核
radioChange
(
val
)
{
console
.
log
(
val
);
this
.
form
.
checkResult
=
val
;
...
...
attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue
View file @
81b38a24
...
...
@@ -153,9 +153,9 @@
<el-row>
<el-form-item
label=
"加分/扣除分值:"
>
<p
v-if=
"form.view == '查看'"
>
{{
form
.
score
?
form
.
score
:
"
--
"
}}
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}
{{
form
.
score
?
form
.
score
:
"
--
"
}}
</p>
<p
v-else
>
{{
form
.
score
}}
</p>
<p
v-else
>
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}
{{
form
.
score
}}
</p>
</el-form-item>
</el-row>
</div>
...
...
@@ -404,6 +404,7 @@ export default {
kaoqinCateArr
:
[],
kaoqinArr
:
[],
baseUrl
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
urls
:{
saveUrl
:
'
/check/complain/record/examine
'
}
//重写核查地址
};
},
...
...
attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue
View file @
81b38a24
...
...
@@ -132,9 +132,9 @@
<el-row>
<el-form-item
label=
"加分/扣除分值:"
>
<p
v-if=
"form.view == '查看'"
>
{{
form
.
score
?
form
.
score
:
"
--
"
}}
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}
{{
form
.
score
?
form
.
score
:
"
--
"
}}
</p>
<p
v-else
>
{{
form
.
score
}}
</p>
<p
v-else
>
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}
{{
form
.
score
}}
</p>
</el-form-item>
</el-row>
</div>
...
...
@@ -377,6 +377,7 @@ export default {
kaoqinCateArr
:
[],
kaoqinArr
:
[],
baseUrl
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
urls
:{
saveUrl
:
'
/check/effect/record/examine
'
}
//重写核查地址
};
},
...
...
attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue
View file @
81b38a24
...
...
@@ -134,9 +134,9 @@
<el-row>
<el-form-item
label=
"加分/扣除分值:"
>
<p
v-if=
"form.view == '查看'"
>
{{
form
.
score
?
form
.
score
:
"
--
"
}}
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}{{
form
.
score
?
form
.
score
:
"
--
"
}}
</p>
<p
v-else
>
{{
form
.
score
}}
</p>
<p
v-else
>
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}{{
form
.
score
}}
</p>
</el-form-item>
</el-row>
</div>
...
...
@@ -372,6 +372,7 @@ export default {
kaoqinCateArr
:
[],
kaoqinArr
:
[],
baseUrl
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
urls
:{
saveUrl
:
'
/check/gowork/record/examine
'
}
//重写核查地址
};
},
...
...
attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue
View file @
81b38a24
...
...
@@ -128,9 +128,9 @@
<el-row>
<el-form-item
label=
"加分/扣除分值:"
>
<p
v-if=
"form.view == '查看'"
>
{{
form
.
score
?
form
.
score
:
"
--
"
}}
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}{{
form
.
score
?
form
.
score
:
"
--
"
}}
</p>
<p
v-else
>
{{
form
.
score
}}
</p>
<p
v-else
>
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}{{
form
.
score
}}
</p>
</el-form-item>
</el-row>
</div>
...
...
@@ -367,6 +367,7 @@ export default {
kaoqinCateArr
:
[],
kaoqinArr
:
[],
baseUrl
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
urls
:{
saveUrl
:
'
/check/other/record/examine
'
}
//重写核查地址
};
},
...
...
attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue
View file @
81b38a24
...
...
@@ -135,9 +135,9 @@
<el-row>
<el-form-item
label=
"加分/扣除分值:"
>
<p
v-if=
"form.view == '查看'"
>
{{
form
.
score
?
form
.
score
:
"
--
"
}}
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}{{
form
.
score
?
form
.
score
:
"
--
"
}}
</p>
<p
v-else
>
{{
form
.
score
}}
</p>
<p
v-else
>
{{
form
.
subAddType
==
1
?
'
+
'
:
'
-
'
}}{{
form
.
score
}}
</p>
</el-form-item>
</el-row>
</div>
...
...
@@ -374,6 +374,7 @@ export default {
form
:
{},
kaoqinCateArr
:
[],
kaoqinArr
:
[],
urls
:{
saveUrl
:
'
/check/review/record/examine
'
}
//重写核查地址
};
},
...
...
attendance-performance-manager-ui/admin/src/views/homeCharts/record/list.vue
View file @
81b38a24
This diff is collapsed.
Click to expand it.
attendance-performance-manager-ui/admin/yarn.lock
View file @
81b38a24
This diff is collapsed.
Click to expand it.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformAttendAppealDao.java
View file @
81b38a24
...
...
@@ -4,6 +4,7 @@ import com.mortals.framework.dao.ICRUDDao;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.xhx.module.perform.model.PerformAttendAppealEntity
;
import
com.mortals.xhx.module.perform.model.vo.AppealInfo
;
import
com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery
;
import
java.util.List
;
/**
...
...
@@ -19,4 +20,11 @@ public interface PerformAttendAppealDao extends ICRUDDao<PerformAttendAppealEnt
String
SQLID_GET_STATLIST
=
"getStatList"
;
List
<
AppealInfo
>
getStatList
(
PerformAttendAppealEntity
query
,
PageInfo
pageInfo
);
/**
* 申述分布情况统计
* @param query
* @return
*/
List
<
PerformAttendAppealEntity
>
getAppealSummaryList
(
AppealSummaryQuery
query
);
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformAttendAppealDaoImpl.java
View file @
81b38a24
...
...
@@ -4,6 +4,7 @@ package com.mortals.xhx.module.perform.dao.ibatis;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.model.ParamDto
;
import
com.mortals.xhx.module.perform.model.vo.AppealInfo
;
import
com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery
;
import
org.apache.ibatis.session.RowBounds
;
import
org.springframework.stereotype.Repository
;
import
com.mortals.xhx.module.perform.dao.PerformAttendAppealDao
;
...
...
@@ -31,4 +32,9 @@ public class PerformAttendAppealDaoImpl extends BaseCRUDDaoMybatis<PerformAttend
return
getSqlSession
().
selectList
(
SQLID_GET_STATLIST
,
queryParam
,
rowBounds
);
}
}
@Override
public
List
<
PerformAttendAppealEntity
>
getAppealSummaryList
(
AppealSummaryQuery
query
)
{
return
getSqlSession
().
selectList
(
getSqlId
(
"getAppealSummaryList"
),
query
);
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/AppealSummaryQuery.java
0 → 100644
View file @
81b38a24
package
com.mortals.xhx.module.perform.model.vo
;
import
lombok.Data
;
/**
* 申述分布情况统计
*/
@Data
public
class
AppealSummaryQuery
{
/** 汇总方式 1按年,2按月,3按天*/
private
Integer
summaryType
;
/** 开始 核查时间 */
private
String
checkTimeStart
;
/** 结束 核查时间 */
private
String
checkTimeEnd
;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/PerformAttendAppealService.java
View file @
81b38a24
...
...
@@ -6,6 +6,7 @@ import com.mortals.framework.service.ICRUDService;
import
com.mortals.xhx.module.perform.model.PerformAttendAppealEntity
;
import
com.mortals.xhx.module.perform.dao.PerformAttendAppealDao
;
import
com.mortals.xhx.module.perform.model.vo.AppealInfo
;
import
com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery
;
import
java.util.List
;
...
...
@@ -26,4 +27,10 @@ public interface PerformAttendAppealService extends ICRUDService<PerformAttendAp
Rest
<
List
<
AppealInfo
>>
stat
(
PerformAttendAppealEntity
appeal
,
Context
context
);
/**
* 申述分布情况统计
* @param query
* @return
*/
List
<
PerformAttendAppealEntity
>
getAppealSummaryList
(
AppealSummaryQuery
query
);
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendAppealServiceImpl.java
View file @
81b38a24
...
...
@@ -2,34 +2,34 @@ package com.mortals.xhx.module.perform.service.impl;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.service.impl.AbstractCRUDServiceImpl
;
import
com.mortals.framework.util.DateUtils
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.common.utils.BeanUtil
;
import
com.mortals.xhx.module.check.model.*
;
import
com.mortals.xhx.module.check.service.*
;
import
com.mortals.xhx.module.perform.model.PerformAttendAppealQuery
;
import
com.mortals.xhx.module.perform.model.vo.AppealInfo
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.stereotype.Service
;
import
com.mortals.framework.service.impl.AbstractCRUDServiceImpl
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.xhx.module.perform.dao.PerformAttendAppealDao
;
import
com.mortals.xhx.module.perform.model.PerformAttendAppealEntity
;
import
com.mortals.xhx.module.perform.service.PerformAttendAppealService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
com.mortals.xhx.module.perform.model.PerformAttendAppealFilesEntity
;
import
com.mortals.xhx.module.perform.model.PerformAttendAppealFilesQuery
;
import
com.mortals.xhx.module.perform.model.PerformAttendAppealQuery
;
import
com.mortals.xhx.module.perform.model.vo.AppealInfo
;
import
com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery
;
import
com.mortals.xhx.module.perform.service.PerformAttendAppealFilesService
;
import
com.mortals.xhx.module.perform.service.PerformAttendAppealService
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.ObjectUtils
;
import
java.util.Date
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.List
;
import
lombok.extern.slf4j.Slf4j
;
/**
* PerformAttendAppealService
* 绩效记录申诉信息 service实现
...
...
@@ -176,6 +176,25 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
return
Rest
.
ok
(
statList
);
}
@Override
public
List
<
PerformAttendAppealEntity
>
getAppealSummaryList
(
AppealSummaryQuery
query
)
{
if
(
query
==
null
)
{
query
=
new
AppealSummaryQuery
();
query
.
setSummaryType
(
SummaryTopTypeEnum
.
月
.
getValue
());
}
if
(
query
.
getSummaryType
()
==
SummaryTopTypeEnum
.
年
.
getValue
())
{
query
.
setCheckTimeStart
(
DateUtils
.
getCurrDateTime
(
"yyyy"
)+
"-01-01"
);
}
if
(
query
.
getSummaryType
()
==
SummaryTopTypeEnum
.
月
.
getValue
())
{
query
.
setCheckTimeStart
(
DateUtils
.
getCurrDateTime
(
"yyyy-MM"
)+
"-01"
);
}
if
(
query
.
getSummaryType
()
==
SummaryTopTypeEnum
.
日
.
getValue
())
{
query
.
setCheckTimeStart
(
DateUtils
.
getCurrStrDate
());
}
query
.
setCheckTimeEnd
(
DateUtils
.
getCurrStrDate
());
return
dao
.
getAppealSummaryList
(
query
);
}
@Override
protected
void
saveAfter
(
PerformAttendAppealEntity
entity
,
Context
context
)
throws
AppException
{
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java
View file @
81b38a24
package
com.mortals.xhx.module.perform.web
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.model.Result
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.common.code.EnabledEnum
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.module.perform.model.vo.AppealInfo
;
import
com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -125,5 +129,44 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
return
jsonObject
.
toJSONString
();
}
/**
* 申述分布情况统计
* @param query
* @return
*/
@PostMapping
({
"perform/summary"
})
@UnAuth
public
Rest
<
Object
>
getAppealSummaryList
(
@RequestBody
AppealSummaryQuery
query
)
{
Rest
<
Object
>
ret
=
new
Rest
();
Map
<
String
,
Object
>
model
=
new
HashMap
();
Context
context
=
this
.
getContext
();
String
busiDesc
=
"查询申述分布情况统计"
;
int
code
=
1
;
try
{
List
<
PerformAttendAppealEntity
>
result
=
this
.
getService
().
getAppealSummaryList
(
query
);
Map
<
String
,
String
>
dict
=
new
HashMap
<>();
//attend:考勤绩效,review:评价差评绩效,complain:评价投诉绩效,gowork:办件绩效,effect:效能绩效,other:其它绩效
dict
.
put
(
"attend"
,
"考勤绩效"
);
dict
.
put
(
"review"
,
"评价差评绩效"
);
dict
.
put
(
"complain"
,
"评价投诉绩效"
);
dict
.
put
(
"gowork"
,
"办件绩效"
);
dict
.
put
(
"effect"
,
"效能绩效"
);
dict
.
put
(
"other"
,
"其它绩效"
);
this
.
addDict
(
model
,
"performType"
,
dict
);
model
.
put
(
"data"
,
result
);
model
.
put
(
"message_info"
,
busiDesc
+
"成功"
);
if
(!
ObjectUtils
.
isEmpty
(
context
)
&&
!
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
this
.
recordSysLog
(
this
.
request
,
busiDesc
+
" 【成功】"
);
}
}
catch
(
Exception
var9
)
{
code
=
-
1
;
this
.
doException
(
this
.
request
,
busiDesc
,
model
,
var9
);
}
ret
.
setCode
(
code
);
ret
.
setData
(
model
);
ret
.
setDict
(
model
.
remove
(
"dict"
));
ret
.
setMsg
(
model
.
get
(
"message_info"
)
==
null
?
""
:
model
.
remove
(
"message_info"
).
toString
());
return
ret
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/StaffPerformStatDao.java
View file @
81b38a24
...
...
@@ -33,4 +33,22 @@ public interface StaffPerformStatDao extends ICRUDDao<StaffPerformStatEntity,Lo
* @return
*/
List
<
StaffPerformStatEntity
>
getYearSummaryList
(
StaffSummaryTopQuery
query
);
/**
* 按天异常分值统计
* @param query
* @return
*/
List
<
StaffPerformStatEntity
>
getDayExceptionList
(
StaffSummaryTopQuery
query
);
/**
* 按月异常分值统计
* @param query
* @return
*/
List
<
StaffPerformStatEntity
>
getMonthExceptionList
(
StaffSummaryTopQuery
query
);
/**
* 按年异常分值统计
* @param query
* @return
*/
List
<
StaffPerformStatEntity
>
getYearExceptionList
(
StaffSummaryTopQuery
query
);
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/ibatis/StaffPerformStatDaoImpl.java
View file @
81b38a24
...
...
@@ -32,4 +32,19 @@ public class StaffPerformStatDaoImpl extends BaseCRUDDaoMybatis<StaffPerformStat
public
List
<
StaffPerformStatEntity
>
getYearSummaryList
(
StaffSummaryTopQuery
query
)
{
return
this
.
getSqlSession
().
selectList
(
this
.
getSqlId
(
"getYearSummaryList"
),
query
);
}
@Override
public
List
<
StaffPerformStatEntity
>
getDayExceptionList
(
StaffSummaryTopQuery
query
)
{
return
this
.
getSqlSession
().
selectList
(
this
.
getSqlId
(
"getDayExceptionList"
),
query
);
}
@Override
public
List
<
StaffPerformStatEntity
>
getMonthExceptionList
(
StaffSummaryTopQuery
query
)
{
return
this
.
getSqlSession
().
selectList
(
this
.
getSqlId
(
"getMonthExceptionList"
),
query
);
}
@Override
public
List
<
StaffPerformStatEntity
>
getYearExceptionList
(
StaffSummaryTopQuery
query
)
{
return
this
.
getSqlSession
().
selectList
(
this
.
getSqlId
(
"getYearExceptionList"
),
query
);
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffPerformStatService.java
View file @
81b38a24
...
...
@@ -25,4 +25,11 @@ public interface StaffPerformStatService extends ICRUDService<StaffPerformStatEn
* @return
*/
List
<
StaffPerformStatEntity
>
getSummaryTopList
(
StaffSummaryTopQuery
query
)
throws
AppException
;
/**
* 获取异常分值统计
* @param query
* @return
*/
List
<
StaffPerformStatEntity
>
getExceptionList
(
StaffSummaryTopQuery
query
)
throws
AppException
;
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffPerformStatServiceImpl.java
View file @
81b38a24
...
...
@@ -62,4 +62,42 @@ public class StaffPerformStatServiceImpl extends AbstractCRUDServiceImpl<StaffPe
return
result
;
}
@Override
public
List
<
StaffPerformStatEntity
>
getExceptionList
(
StaffSummaryTopQuery
query
)
throws
AppException
{
LocalDate
now
=
LocalDate
.
now
();
List
<
StaffPerformStatEntity
>
result
=
null
;
if
(
query
==
null
){
query
=
new
StaffSummaryTopQuery
();
query
.
setSummaryType
(
SummaryTopTypeEnum
.
月
.
getValue
());
}
if
(
query
.
getSummaryType
()
==
SummaryTopTypeEnum
.
年
.
getValue
()){
if
(
query
.
getYear
()==
null
){
query
.
setYear
(
now
.
getYear
());
}
result
=
dao
.
getYearExceptionList
(
query
);
}
if
(
query
.
getSummaryType
()
==
SummaryTopTypeEnum
.
月
.
getValue
()){
if
(
query
.
getYear
()==
null
){
query
.
setYear
(
now
.
getYear
());
}
if
(
query
.
getMonth
()==
null
){
query
.
setMonth
(
now
.
getMonthValue
());
}
result
=
dao
.
getMonthExceptionList
(
query
);
}
if
(
query
.
getSummaryType
()
==
SummaryTopTypeEnum
.
日
.
getValue
()){
if
(
query
.
getYear
()==
null
){
query
.
setYear
(
now
.
getYear
());
}
if
(
query
.
getMonth
()==
null
){
query
.
setMonth
(
now
.
getMonthValue
());
}
if
(
query
.
getDay
()==
null
){
query
.
setDay
(
now
.
getDayOfMonth
());
}
result
=
dao
.
getDayExceptionList
(
query
);
}
return
result
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformStatController.java
View file @
81b38a24
package
com.mortals.xhx.module.staff.web
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.model.Context
;
...
...
@@ -8,6 +9,7 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.module.staff.model.StaffPerformStatEntity
;
import
com.mortals.xhx.module.staff.model.vo.StaffSummaryTopQuery
;
import
com.mortals.xhx.module.staff.service.StaffPerformStatService
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
...
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -44,7 +47,7 @@ public class StaffPerformStatController extends BaseCRUDJsonBodyMappingControlle
}
/**
*
部门
绩效排行榜
*
个人
绩效排行榜
* @param query
* @return
*/
...
...
@@ -74,4 +77,69 @@ public class StaffPerformStatController extends BaseCRUDJsonBodyMappingControlle
return
ret
;
}
/**
* 异常分值统计
* @param query
* @return
*/
@PostMapping
({
"summary/exception"
})
@UnAuth
public
Rest
<
Object
>
getExceptionList
(
@RequestBody
StaffSummaryTopQuery
query
)
{
Rest
<
Object
>
ret
=
new
Rest
();
Map
<
String
,
Object
>
model
=
new
HashMap
();
Context
context
=
this
.
getContext
();
String
busiDesc
=
"查询异常分值统计"
;
int
code
=
1
;
try
{
List
<
StaffPerformStatEntity
>
result
=
this
.
getService
().
getExceptionList
(
query
);
List
<
JSONObject
>
data
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
result
))
{
StaffPerformStatEntity
entity
=
result
.
get
(
0
);
JSONObject
jsonObject1
=
new
JSONObject
();
jsonObject1
.
put
(
"name"
,
"考勤绩效"
);
jsonObject1
.
put
(
"add"
,
entity
.
getAttendScoreAdd
());
jsonObject1
.
put
(
"sub"
,
entity
.
getAttendScoreSub
());
data
.
add
(
jsonObject1
);
JSONObject
jsonObject2
=
new
JSONObject
();
jsonObject2
.
put
(
"name"
,
"评价绩效"
);
jsonObject2
.
put
(
"add"
,
entity
.
getReviewScoreAdd
());
jsonObject2
.
put
(
"sub"
,
entity
.
getReviewScoreSub
());
data
.
add
(
jsonObject2
);
JSONObject
jsonObject3
=
new
JSONObject
();
jsonObject3
.
put
(
"name"
,
"投诉绩效"
);
jsonObject3
.
put
(
"add"
,
entity
.
getComplainScoreAdd
());
jsonObject3
.
put
(
"sub"
,
entity
.
getComplainScoreSub
());
data
.
add
(
jsonObject3
);
JSONObject
jsonObject4
=
new
JSONObject
();
jsonObject4
.
put
(
"name"
,
"办件绩效"
);
jsonObject4
.
put
(
"add"
,
entity
.
getGoworkScoreAdd
());
jsonObject4
.
put
(
"sub"
,
entity
.
getGoworkScoreSub
());
data
.
add
(
jsonObject4
);
JSONObject
jsonObject5
=
new
JSONObject
();
jsonObject5
.
put
(
"name"
,
"效能绩效"
);
jsonObject5
.
put
(
"add"
,
entity
.
getEffectScoreAdd
());
jsonObject5
.
put
(
"sub"
,
entity
.
getEffectScoreSub
());
data
.
add
(
jsonObject5
);
JSONObject
jsonObject6
=
new
JSONObject
();
jsonObject6
.
put
(
"name"
,
"其它绩效"
);
jsonObject6
.
put
(
"add"
,
entity
.
getOtherScoreAdd
());
jsonObject6
.
put
(
"sub"
,
entity
.
getOtherScoreSub
());
data
.
add
(
jsonObject6
);
}
model
.
put
(
"data"
,
data
);
model
.
put
(
"message_info"
,
busiDesc
+
"成功"
);
if
(!
ObjectUtils
.
isEmpty
(
context
)
&&
!
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
this
.
recordSysLog
(
this
.
request
,
busiDesc
+
" 【成功】"
);
}
}
catch
(
Exception
var9
)
{
code
=
-
1
;
this
.
doException
(
this
.
request
,
busiDesc
,
model
,
var9
);
}
this
.
init
(
model
,
context
);
ret
.
setCode
(
code
);
ret
.
setData
(
model
.
get
(
"data"
));
ret
.
setMsg
(
model
.
get
(
"message_info"
)
==
null
?
""
:
model
.
remove
(
"message_info"
).
toString
());
return
ret
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformAttendAppealMapperExt.xml
0 → 100644
View file @
81b38a24
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper
namespace=
"com.mortals.xhx.module.perform.dao.ibatis.PerformAttendAppealDaoImpl"
>
<!-- 申述分布情况统计 -->
<select
id=
"getAppealSummaryList"
parameterType=
"com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery"
resultType=
"com.mortals.xhx.module.perform.model.PerformAttendAppealEntity"
>
SELECT
performType,
SUM(score) AS score
FROM
mortals_xhx_perform_attend_appeal
WHERE
processStatus = 2
AND appealResult = 1
<if
test=
"checkTimeStart != null and checkTimeStart!=''"
>
AND checkTime
<![CDATA[ >= ]]>
STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if
test=
"checkTimeEnd != null and checkTimeEnd!=''"
>
AND checkTime
<![CDATA[ <= ]]>
STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
GROUP BY
performType
</select>
</mapper>
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffPerformStatMapperExt.xml
View file @
81b38a24
...
...
@@ -76,4 +76,98 @@
`year`
) AS a ORDER BY totalScore DESC LIMIT 10
</select>
<!-- 按天异常分值统计 -->
<select
id=
"getDayExceptionList"
parameterType=
"com.mortals.xhx.module.staff.model.vo.StaffSummaryTopQuery"
resultType=
"com.mortals.xhx.module.staff.model.StaffPerformStatEntity"
>
SELECT
`year`,
`month`,
`day`,
SUM(attendScoreAdd) AS attendScoreAdd,
SUM(attendScoreSub) AS attendScoreSub,
SUM(reviewScoreAdd) AS reviewScoreAdd,
SUM(reviewScoreSub) AS reviewScoreSub,
SUM(complainScoreAdd) AS complainScoreAdd,
SUM(complainScoreSub) AS complainScoreSub,
SUM(goworkScoreAdd) AS goworkScoreAdd,
SUM(goworkScoreSub) AS goworkScoreSub,
SUM(effectScoreAdd) AS effectScoreAdd,
SUM(effectScoreSub) AS effectScoreSub,
SUM(otherScoreAdd) AS otherScoreAdd,
SUM(otherScoreSub) AS otherScoreSub
FROM
mortals_xhx_staff_perform_stat
WHERE 1=1
<if
test=
"year != null"
>
AND `year` = #{year}
</if>
<if
test=
"month != null"
>
AND `month` = #{month}
</if>
<if
test=
"day != null"
>
AND `day` = #{day}
</if>
GROUP BY
`year`,
`month`,
`day`
</select>
<!-- 按月异常分值统计 -->
<select
id=
"getMonthExceptionList"
parameterType=
"com.mortals.xhx.module.staff.model.vo.StaffSummaryTopQuery"
resultType=
"com.mortals.xhx.module.staff.model.StaffPerformStatEntity"
>
SELECT
`year`,
`month`,
SUM(attendScoreAdd) AS attendScoreAdd,
SUM(attendScoreSub) AS attendScoreSub,
SUM(reviewScoreAdd) AS reviewScoreAdd,
SUM(reviewScoreSub) AS reviewScoreSub,
SUM(complainScoreAdd) AS complainScoreAdd,
SUM(complainScoreSub) AS complainScoreSub,
SUM(goworkScoreAdd) AS goworkScoreAdd,
SUM(goworkScoreSub) AS goworkScoreSub,
SUM(effectScoreAdd) AS effectScoreAdd,
SUM(effectScoreSub) AS effectScoreSub,
SUM(otherScoreAdd) AS otherScoreAdd,
SUM(otherScoreSub) AS otherScoreSub
FROM
mortals_xhx_staff_perform_stat
WHERE 1=1
<if
test=
"year != null"
>
AND `year` = #{year}
</if>
<if
test=
"month != null"
>
AND `month` = #{month}
</if>
GROUP BY
`year`,
`month`
</select>
<!-- 按年异常分值统计 -->
<select
id=
"getYearExceptionList"
parameterType=
"com.mortals.xhx.module.staff.model.vo.StaffSummaryTopQuery"
resultType=
"com.mortals.xhx.module.staff.model.StaffPerformStatEntity"
>
SELECT
`year`,
SUM(attendScoreAdd) AS attendScoreAdd,
SUM(attendScoreSub) AS attendScoreSub,
SUM(reviewScoreAdd) AS reviewScoreAdd,
SUM(reviewScoreSub) AS reviewScoreSub,
SUM(complainScoreAdd) AS complainScoreAdd,
SUM(complainScoreSub) AS complainScoreSub,
SUM(goworkScoreAdd) AS goworkScoreAdd,
SUM(goworkScoreSub) AS goworkScoreSub,
SUM(effectScoreAdd) AS effectScoreAdd,
SUM(effectScoreSub) AS effectScoreSub,
SUM(otherScoreAdd) AS otherScoreAdd,
SUM(otherScoreSub) AS otherScoreSub
FROM
mortals_xhx_staff_perform_stat
WHERE 1=1
<if
test=
"year != null"
>
AND `year` = #{year}
</if>
GROUP BY
`year`
</select>
</mapper>
\ 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