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
8a5b5b8f
Commit
8a5b5b8f
authored
Jul 15, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加照片海康下载
parent
4bdd7bcc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
8 deletions
+39
-8
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/AppealApiController.java
...ava/com/mortals/xhx/busiz/h5/web/AppealApiController.java
+11
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/InspectApiController.java
...va/com/mortals/xhx/busiz/h5/web/InspectApiController.java
+14
-3
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java
...va/com/mortals/xhx/busiz/h5/web/PerformApiController.java
+14
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/AppealApiController.java
View file @
8a5b5b8f
...
...
@@ -13,8 +13,7 @@ import com.mortals.framework.model.Result;
import
com.mortals.xhx.busiz.h5.req.AppealReq
;
import
com.mortals.xhx.busiz.h5.req.PerformReq
;
import
com.mortals.xhx.busiz.h5.rsp.AppealStatInfo
;
import
com.mortals.xhx.common.code.PerformTypeEnum
;
import
com.mortals.xhx.common.code.ProcessStatusEnum
;
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.*
;
...
...
@@ -66,6 +65,12 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
@Autowired
private
PerformAttendAppealService
appealService
;
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
this
.
addDict
(
model
,
"checkStatus"
,
CheckStatusEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subMethod"
,
SubMethodEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subAddType"
,
SubAddTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkType"
,
CheckTypeEnum
.
getEnumMap
());
}
/**
* 个人申诉绩效统计
...
...
@@ -131,7 +136,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
parsePageInfo
(
model
,
result
.
getPageInfo
());
rest
.
setData
(
model
);
this
.
init
(
model
,
context
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
}
catch
(
Exception
e
)
{
log
.
error
(
busiDesc
,
e
);
...
...
@@ -150,13 +155,15 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
log
.
info
(
"【{}】【请求体】--> {}"
,
busiDesc
,
JSONObject
.
toJSONString
(
appealReq
));
Rest
<
PerformAttendAppealEntity
>
rest
=
Rest
.
ok
(
busiDesc
+
" 【成功】"
);
Context
context
=
this
.
getContext
();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
try
{
if
(
ObjectUtils
.
isEmpty
(
appealReq
.
getId
()))
{
throw
new
AppException
(
"详细查询id不能为空!"
);
}
PerformAttendAppealEntity
performAttendAppealEntity
=
appealService
.
get
(
appealReq
.
getId
(),
context
);
rest
.
setData
(
performAttendAppealEntity
);
this
.
init
(
model
,
context
);
rest
.
setDict
(
model
.
get
(
"dict"
));
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
}
catch
(
Exception
e
)
{
log
.
error
(
busiDesc
,
e
);
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/InspectApiController.java
View file @
8a5b5b8f
...
...
@@ -13,9 +13,7 @@ import com.mortals.xhx.busiz.h5.req.PerformReq;
import
com.mortals.xhx.busiz.h5.rsp.InspectStatInfo
;
import
com.mortals.xhx.busiz.h5.rsp.PerformDetailInfo
;
import
com.mortals.xhx.busiz.h5.rsp.PerformInfo
;
import
com.mortals.xhx.common.code.PerformTypeEnum
;
import
com.mortals.xhx.common.code.SubAddTypeEnum
;
import
com.mortals.xhx.common.code.SubMethodEnum
;
import
com.mortals.xhx.common.code.*
;
import
com.mortals.xhx.common.utils.BeanUtil
;
import
com.mortals.xhx.module.check.dao.CheckAllRecordDao
;
import
com.mortals.xhx.module.check.model.*
;
...
...
@@ -91,6 +89,13 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
private
CheckAllRecordDao
checkAllRecordDao
;
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
this
.
addDict
(
model
,
"checkStatus"
,
CheckStatusEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subMethod"
,
SubMethodEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subAddType"
,
SubAddTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkType"
,
CheckTypeEnum
.
getEnumMap
());
}
/**
* 个人巡查效统计
*/
...
...
@@ -199,6 +204,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
parsePageInfo
(
model
,
result
.
getPageInfo
());
}
rest
.
setData
(
model
);
this
.
init
(
model
,
context
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
}
catch
(
Exception
e
)
{
log
.
error
(
busiDesc
,
e
);
...
...
@@ -453,6 +459,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
@PostMapping
(
value
=
"info"
)
public
Rest
<
PerformDetailInfo
>
performInfo
(
@RequestBody
PerformReq
performReq
)
{
Context
context
=
this
.
getContext
();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
String
busiDesc
=
"个人巡查详细"
;
log
.
info
(
"【{}】【请求体】--> {}"
,
busiDesc
,
JSONObject
.
toJSONString
(
performReq
));
Rest
<
PerformDetailInfo
>
rest
=
Rest
.
ok
(
busiDesc
+
" 【成功】"
);
...
...
@@ -489,6 +496,10 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
log
.
error
(
busiDesc
,
e
);
rest
=
Rest
.
fail
(
super
.
convertException
(
e
));
}
this
.
init
(
model
,
context
);
rest
.
setDict
(
model
.
get
(
"dict"
));
return
rest
;
}
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java
View file @
8a5b5b8f
...
...
@@ -83,6 +83,14 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
@Autowired
private
PerformRulesService
rulesService
;
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
this
.
addDict
(
model
,
"checkStatus"
,
CheckStatusEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subMethod"
,
SubMethodEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"subAddType"
,
SubAddTypeEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"checkType"
,
CheckTypeEnum
.
getEnumMap
());
}
/**
* 个人当天绩效统计
*/
...
...
@@ -343,6 +351,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
log
.
error
(
busiDesc
,
e
);
rest
=
Rest
.
fail
(
super
.
convertException
(
e
));
}
this
.
init
(
model
,
context
);
return
rest
;
}
...
...
@@ -369,6 +379,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
@PostMapping
(
value
=
"info"
)
public
Rest
<
PerformDetailInfo
>
performInfo
(
@RequestBody
PerformReq
performReq
)
{
Context
context
=
this
.
getContext
();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
String
busiDesc
=
"个人绩效增减详细"
;
log
.
info
(
"【{}】【请求体】--> {}"
,
busiDesc
,
JSONObject
.
toJSONString
(
performReq
));
Rest
<
PerformDetailInfo
>
rest
=
Rest
.
ok
(
busiDesc
+
" 【成功】"
);
...
...
@@ -419,10 +430,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performDetailInfo
.
setRuleDesc
(
rulesEntity
.
getContent
());
rest
.
setData
(
performDetailInfo
);
log
.
info
(
"rspperformDetailInfo:{}"
,
JSON
.
toJSONString
(
performDetailInfo
));
this
.
init
(
model
,
context
);
rest
.
setDict
(
model
.
get
(
"dict"
));
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
}
catch
(
Exception
e
)
{
log
.
error
(
busiDesc
,
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