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
9101106b
Commit
9101106b
authored
Jul 19, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改考勤汇总
parent
93f29c07
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
109 additions
and
23 deletions
+109
-23
attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue
...rformance-manager-ui/admin/src/views/staff/drawershow.vue
+9
-5
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
.../module/attendance/model/AttendanceLeaveRecordEntity.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
...als/xhx/module/check/web/CheckAttendRecordController.java
+7
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
...s/xhx/module/check/web/CheckComplainRecordController.java
+7
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
...als/xhx/module/check/web/CheckEffectRecordController.java
+27
-10
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
...als/xhx/module/check/web/CheckGoworkRecordController.java
+5
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
...tals/xhx/module/check/web/CheckOtherRecordController.java
+5
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
...als/xhx/module/check/web/CheckReviewRecordController.java
+5
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
...xhx/module/perform/web/PerformAttendRecordController.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
...x/module/perform/web/PerformComplainRecordController.java
+7
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
...xhx/module/perform/web/PerformEffectRecordController.java
+5
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
...xhx/module/perform/web/PerformGoworkRecordController.java
+6
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
.../xhx/module/perform/web/PerformOtherRecordController.java
+6
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
...xhx/module/perform/web/PerformReviewRecordController.java
+6
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
...ava/com/mortals/xhx/module/staff/web/StaffController.java
+4
-0
No files found.
attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue
View file @
9101106b
...
...
@@ -22,7 +22,11 @@
<Field
label=
"手机号码"
:maxLength=
"11"
prop=
"phoneNumber"
v-model=
"form.phoneNumber"
placeholder=
"请输入联系电话"
/>
<Field
label=
"所属部门"
:maxLength=
"10"
prop=
"deptName"
v-model=
"form.deptName"
placeholder=
"请选择所属部门"
@
focus=
"ishowBumen = true"
/>
<!--
<Field
label=
"所属部门"
:maxLength=
"10"
prop=
"deptName"
v-model=
"form.deptName"
placeholder=
"请选择所属部门"
@
focus=
"ishowBumen = true"
/>
-->
<Field
label=
"所属部门"
prop=
"deptId"
v-model=
"form.deptId"
:enumData=
"dict.deptId"
type=
"select"
placeholder=
"请选择所属部门"
/>
<Field
label=
"职位"
prop=
"positionId"
v-model=
"form.positionId"
:enumData=
"dict.positionId"
type=
"select"
placeholder=
"请选择职位"
/>
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
View file @
9101106b
...
...
@@ -33,6 +33,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
/**
* 所属部门
*/
@Excel
(
name
=
"所属部门"
)
private
String
deptName
;
/**
* 电话号码
...
...
@@ -71,6 +72,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
/**
* 审批负责人
*/
@Excel
(
name
=
"审批负责人"
)
private
String
approver
;
/**
* 附件
...
...
@@ -87,6 +89,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
/**
* 申请时间
*/
@Excel
(
name
=
"申请时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
appealTime
;
/**
* 审核结果(1.申请通过,2.申请不通过)
...
...
@@ -106,6 +109,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
/**
* 处理状态
*/
@Excel
(
name
=
"处理状态"
,
readConverterExp
=
"1=待处理,2=已处理"
)
private
Integer
processStatus
;
@Override
public
int
hashCode
()
{
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
View file @
9101106b
...
...
@@ -7,6 +7,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -51,7 +53,8 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
private
ParamService
paramService
;
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
CheckAttendRecordController
()
{
super
.
setModuleDesc
(
"考勤绩效记录核查信息"
);
}
...
...
@@ -66,6 +69,9 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
this
.
addDict
(
model
,
"checkResultAdd"
,
CheckResultAddEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkResultSub"
,
CheckResultSubEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
View file @
9101106b
...
...
@@ -6,6 +6,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -43,7 +45,8 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
private
ParamService
paramService
;
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
CheckComplainRecordController
(){
super
.
setModuleDesc
(
"评价绩效投诉核查信息"
);
}
...
...
@@ -60,6 +63,9 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
this
.
addDict
(
model
,
"complainSource"
,
ReviewSourceEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
View file @
9101106b
package
com.mortals.xhx.module.check.web
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -6,52 +7,63 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
com.mortals.framework.model.Context
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.module.check.model.CheckEffectRecordEntity
;
import
com.mortals.xhx.module.check.service.CheckEffectRecordService
;
import
org.apache.commons.lang3.ArrayUtils
;
import
com.mortals.framework.util.StringUtils
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
com.alibaba.fastjson.JSONObject
;
import
java.util.Arrays
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
static
com
.
mortals
.
framework
.
ap
.
SysConstains
.*;
/**
*
* 效能绩效核查信息
*
* @author zxfei
* @date 2023-07-11
*/
* 效能绩效核查信息
*
* @author zxfei
* @date 2023-07-11
*/
@RestController
@RequestMapping
(
"check/effect/record"
)
public
class
CheckEffectRecordController
extends
BaseCRUDJsonBodyMappingController
<
CheckEffectRecordService
,
CheckEffectRecordEntity
,
Long
>
{
public
class
CheckEffectRecordController
extends
BaseCRUDJsonBodyMappingController
<
CheckEffectRecordService
,
CheckEffectRecordEntity
,
Long
>
{
@Autowired
private
ParamService
paramService
;
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
CheckEffectRecordController
(){
super
.
setModuleDesc
(
"效能绩效核查信息"
);
public
CheckEffectRecordController
()
{
super
.
setModuleDesc
(
"效能绩效核查信息"
);
}
@Override
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
this
.
addDict
(
model
,
"irregularType"
,
paramService
.
getParamBySecondOrganize
(
"CheckEffectRecord"
,
"irregularType"
));
this
.
addDict
(
model
,
"irregularType"
,
paramService
.
getParamBySecondOrganize
(
"CheckEffectRecord"
,
"irregularType"
));
this
.
addDict
(
model
,
"checkStatus"
,
CheckStatusEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subMethod"
,
SubMethodEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subAddType"
,
SubAddTypeEnum
.
getEnumMap
());
...
...
@@ -59,6 +71,10 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
this
.
addDict
(
model
,
"checkResult"
,
CheckResultEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkResultAdd"
,
CheckResultAddEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkResultSub"
,
CheckResultSubEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"processStatus"
,
ProcessStatusEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
...
...
@@ -79,6 +95,7 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
/**
* 审核
*
* @param entity
* @return
*/
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
View file @
9101106b
...
...
@@ -6,6 +6,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -44,7 +46,8 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
CheckGoworkRecordController
(){
super
.
setModuleDesc
(
"办件绩效核查信息"
);
}
...
...
@@ -60,6 +63,7 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
this
.
addDict
(
model
,
"checkResultAdd"
,
CheckResultAddEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkResultSub"
,
CheckResultSubEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
View file @
9101106b
...
...
@@ -6,6 +6,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -44,7 +46,8 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
CheckOtherRecordController
(){
super
.
setModuleDesc
(
"其它绩效核查信息"
);
}
...
...
@@ -60,6 +63,7 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
this
.
addDict
(
model
,
"checkResultAdd"
,
CheckResultAddEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkResultSub"
,
CheckResultSubEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
View file @
9101106b
...
...
@@ -7,6 +7,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -52,7 +54,8 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
CheckReviewRecordController
()
{
super
.
setModuleDesc
(
"评价差评绩效核查信息"
);
}
...
...
@@ -73,6 +76,7 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
this
.
addDict
(
model
,
"reviewSource"
,
ReviewSourceEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
View file @
9101106b
...
...
@@ -6,6 +6,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -43,6 +45,8 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
private
ParamService
paramService
;
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
PerformAttendRecordController
(){
super
.
setModuleDesc
(
"考勤绩效记录信息"
);
...
...
@@ -55,6 +59,8 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
this
.
addDict
(
model
,
"subMethod"
,
SubMethodEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subAddType"
,
SubAddTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkType"
,
CheckTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
View file @
9101106b
...
...
@@ -5,6 +5,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
...
...
@@ -30,6 +32,9 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
PerformComplainRecordController
()
{
super
.
setModuleDesc
(
"评价绩效投诉记录信息"
);
}
...
...
@@ -41,6 +46,8 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
this
.
addDict
(
model
,
"subMethod"
,
SubMethodEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subAddType"
,
SubAddTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkType"
,
CheckTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
this
.
addDict
(
model
,
"complainSource"
,
ReviewSourceEnum
.
getEnumMap
());
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
View file @
9101106b
...
...
@@ -6,6 +6,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -43,6 +45,8 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
private
ParamService
paramService
;
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
PerformEffectRecordController
(){
super
.
setModuleDesc
(
"效能绩效记录信息"
);
...
...
@@ -56,6 +60,7 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
this
.
addDict
(
model
,
"subMethod"
,
SubMethodEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subAddType"
,
SubAddTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkType"
,
CheckTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
View file @
9101106b
...
...
@@ -6,6 +6,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -43,7 +45,8 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
private
ParamService
paramService
;
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
PerformGoworkRecordController
(){
super
.
setModuleDesc
(
"办件绩效记录信息"
);
}
...
...
@@ -55,6 +58,8 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
this
.
addDict
(
model
,
"subMethod"
,
SubMethodEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subAddType"
,
SubAddTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkType"
,
CheckTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
View file @
9101106b
...
...
@@ -6,6 +6,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -43,7 +45,8 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
private
ParamService
paramService
;
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
PerformOtherRecordController
(){
super
.
setModuleDesc
(
"其它绩效记录信息"
);
}
...
...
@@ -56,6 +59,8 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
this
.
addDict
(
model
,
"subMethod"
,
SubMethodEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subAddType"
,
SubAddTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkType"
,
CheckTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
View file @
9101106b
...
...
@@ -6,6 +6,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -43,7 +45,8 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
private
ParamService
paramService
;
@Autowired
private
UserService
userService
;
@Autowired
private
DeptService
deptService
;
public
PerformReviewRecordController
(){
super
.
setModuleDesc
(
"评价差评绩效记录信息"
);
}
...
...
@@ -57,6 +60,8 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
this
.
addDict
(
model
,
"subMethod"
,
SubMethodEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subAddType"
,
SubAddTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkType"
,
CheckTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
this
.
addDict
(
model
,
"reviewSource"
,
ReviewSourceEnum
.
getEnumMap
());
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @
9101106b
...
...
@@ -57,6 +57,10 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
List
<
DeptEntity
>
list
=
deptService
.
find
(
new
DeptQuery
());
List
<
DeptTreeSelect
>
treeSelects
=
deptService
.
buildDeptTreeSelect
(
list
);
this
.
addDict
(
model
,
"deptPerson"
,
treeSelects
);
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
super
.
init
(
model
,
context
);
}
...
...
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