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
a21dc9fa
Commit
a21dc9fa
authored
Jul 13, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加申诉统计业务
parent
8de405f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
119 additions
and
4 deletions
+119
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/InspectStatInfo.java
.../main/java/com/mortals/xhx/busiz/rsp/InspectStatInfo.java
+21
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/InspectApiController.java
.../java/com/mortals/xhx/busiz/web/InspectApiController.java
+98
-4
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/InspectStatInfo.java
0 → 100644
View file @
a21dc9fa
package
com.mortals.xhx.busiz.rsp
;
import
lombok.Data
;
import
java.math.BigDecimal
;
@Data
public
class
InspectStatInfo
{
/**
* 累计次数
*/
private
Integer
totalTimes
;
/**
* 今日次数
*/
private
Integer
todayTimes
;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/InspectApiController.java
View file @
a21dc9fa
...
@@ -9,10 +9,14 @@ import com.mortals.framework.model.PageInfo;
...
@@ -9,10 +9,14 @@ import com.mortals.framework.model.PageInfo;
import
com.mortals.framework.model.Result
;
import
com.mortals.framework.model.Result
;
import
com.mortals.xhx.busiz.req.*
;
import
com.mortals.xhx.busiz.req.*
;
import
com.mortals.xhx.busiz.rsp.AppealStatInfo
;
import
com.mortals.xhx.busiz.rsp.AppealStatInfo
;
import
com.mortals.xhx.busiz.rsp.InspectStatInfo
;
import
com.mortals.xhx.busiz.rsp.PerformInfo
;
import
com.mortals.xhx.busiz.rsp.PerformStatInfo
;
import
com.mortals.xhx.common.code.PerformTypeEnum
;
import
com.mortals.xhx.common.code.PerformTypeEnum
;
import
com.mortals.xhx.common.code.ProcessStatusEnum
;
import
com.mortals.xhx.common.code.ProcessStatusEnum
;
import
com.mortals.xhx.common.utils.BeanUtil
;
import
com.mortals.xhx.common.utils.BeanUtil
;
import
com.mortals.xhx.module.check.model.*
;
import
com.mortals.xhx.module.check.model.*
;
import
com.mortals.xhx.module.check.model.vo.CheckAllRecordVo
;
import
com.mortals.xhx.module.check.service.*
;
import
com.mortals.xhx.module.check.service.*
;
import
com.mortals.xhx.module.perform.model.*
;
import
com.mortals.xhx.module.perform.model.*
;
import
com.mortals.xhx.module.perform.service.*
;
import
com.mortals.xhx.module.perform.service.*
;
...
@@ -31,7 +35,9 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -31,7 +35,9 @@ import org.springframework.web.bind.annotation.RestController;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
static
com
.
mortals
.
framework
.
ap
.
SysConstains
.*;
import
static
com
.
mortals
.
framework
.
ap
.
SysConstains
.*;
import
static
com
.
mortals
.
xhx
.
common
.
key
.
ErrorCode
.
ERROR_TOKEN_EXPIRED
;
import
static
com
.
mortals
.
xhx
.
common
.
key
.
ErrorCode
.
ERROR_TOKEN_EXPIRED
;
...
@@ -48,9 +54,6 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
...
@@ -48,9 +54,6 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
@RequestMapping
(
"/api/v1/inspect"
)
@RequestMapping
(
"/api/v1/inspect"
)
public
class
InspectApiController
extends
AbstractBaseController
<
PerformReq
>
{
public
class
InspectApiController
extends
AbstractBaseController
<
PerformReq
>
{
@Autowired
@Autowired
private
PerformAttendRecordService
attendRecordService
;
private
PerformAttendRecordService
attendRecordService
;
@Autowired
@Autowired
...
@@ -68,6 +71,98 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
...
@@ -68,6 +71,98 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
@Autowired
@Autowired
private
StaffService
staffService
;
private
StaffService
staffService
;
@Autowired
private
CheckAllRecordService
checkAllRecordService
;
/**
* 个人巡查效统计
*/
@PostMapping
(
value
=
"stat"
)
public
Rest
<
InspectStatInfo
>
inspectStat
()
{
String
busiDesc
=
"H5 个人巡查统计"
;
Rest
<
InspectStatInfo
>
rest
=
Rest
.
ok
(
busiDesc
+
" 【成功】"
);
Context
context
=
this
.
getContext
();
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
throw
new
AppException
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
}
log
.
info
(
"【{}】【请求体】--> 用户:{}"
,
busiDesc
,
context
.
getUser
().
getRealName
());
try
{
//todo
InspectStatInfo
performStatInfo
=
new
InspectStatInfo
();
performStatInfo
.
setTotalTimes
(
12
);
performStatInfo
.
setTodayTimes
(
4
);
rest
.
setData
(
performStatInfo
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
}
catch
(
Exception
e
)
{
log
.
error
(
busiDesc
,
e
);
rest
=
Rest
.
fail
(
super
.
convertException
(
e
));
}
return
rest
;
}
/**
* 个人巡查列表
*/
@PostMapping
(
value
=
"list"
)
public
Rest
<
Object
>
performList
(
@RequestBody
PerformReq
performReq
)
{
String
busiDesc
=
"个人巡查列表"
;
log
.
info
(
"【{}】【请求体】--> {}"
,
busiDesc
,
JSONObject
.
toJSONString
(
performReq
));
Rest
<
Object
>
rest
=
Rest
.
ok
();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Context
context
=
this
.
getContext
();
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
throw
new
AppException
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
}
try
{
if
(
ObjectUtils
.
isEmpty
(
performReq
.
getPerformStartDate
()))
{
//未设置时间的情况,默认为当月
performReq
.
setPerformStartDate
(
DateUtil
.
beginOfMonth
(
new
Date
()).
toDateStr
());
performReq
.
setPerformEndDate
(
DateUtil
.
today
());
}
else
{
performReq
.
setPerformStartDate
(
DateUtil
.
beginOfMonth
(
DateUtil
.
parse
(
performReq
.
getPerformStartDate
()).
toJdkDate
()).
toDateStr
());
performReq
.
setPerformEndDate
(
DateUtil
.
endOfMonth
(
DateUtil
.
parse
(
performReq
.
getPerformStartDate
()).
toJdkDate
()).
toDateStr
());
}
if
(
PerformTypeEnum
.
全部
.
getValue
().
equals
(
performReq
.
getPerformType
()))
{
CheckAllRecordQuery
query
=
new
CheckAllRecordQuery
();
query
.
setCheckTimeStart
(
performReq
.
getPerformStartDate
());
query
.
setCheckTimeEnd
(
performReq
.
getPerformEndDate
());
query
.
setCreateUserId
(
context
.
getUser
().
getId
());
List
<
CheckAllRecordVo
>
allCheckRecord
=
checkAllRecordService
.
getAllCheckRecord
(
query
);
List
<
PerformInfo
>
collect
=
allCheckRecord
.
stream
().
map
(
item
->
{
PerformInfo
performInfo
=
new
PerformInfo
();
BeanUtils
.
copyProperties
(
item
,
performInfo
,
BeanUtil
.
getNullPropertyNames
(
item
));
return
performInfo
;
}).
collect
(
Collectors
.
toList
());
model
.
put
(
KEY_RESULT_DATA
,
collect
);
PageInfo
pageAllInfo
=
new
PageInfo
();
pageAllInfo
.
setTotalResult
(
collect
.
size
());
pageAllInfo
.
setCurrPage
(
1
);
pageAllInfo
.
setPrePageResult
(-
1
);
model
.
put
(
PAGEINFO_KEY
,
pageAllInfo
);
parsePageInfo
(
model
,
pageAllInfo
);
}
// model.put(KEY_RESULT_DATA, result.getList());
// model.put(PAGEINFO_KEY, result.getPageInfo());
// parsePageInfo(model, result.getPageInfo());
rest
.
setData
(
model
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
}
catch
(
Exception
e
)
{
log
.
error
(
busiDesc
,
e
);
rest
=
Rest
.
fail
(
super
.
convertException
(
e
));
}
return
rest
;
}
/**
/**
* 巡查新增
* 巡查新增
...
@@ -290,7 +385,6 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
...
@@ -290,7 +385,6 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
}
}
protected
void
parsePageInfo
(
Map
<
String
,
Object
>
model
,
PageInfo
pageInfo
)
{
protected
void
parsePageInfo
(
Map
<
String
,
Object
>
model
,
PageInfo
pageInfo
)
{
model
.
put
(
TOTAL
,
pageInfo
.
getTotalResult
());
model
.
put
(
TOTAL
,
pageInfo
.
getTotalResult
());
model
.
put
(
PER_PAGE
,
pageInfo
.
getPrePageResult
());
model
.
put
(
PER_PAGE
,
pageInfo
.
getPrePageResult
());
...
...
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