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
c40aa14d
Commit
c40aa14d
authored
May 08, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改H5绩效申诉详情显示测试bug
parent
a55f8d07
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
2 deletions
+16
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformErrorMessageController.java
...xhx/module/perform/web/PerformErrorMessageController.java
+16
-2
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformErrorMessageController.java
View file @
c40aa14d
package
com.mortals.xhx.module.perform.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.model.Context
;
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.*
;
...
...
@@ -12,12 +16,15 @@ import com.mortals.xhx.module.perform.model.PerformAttendAppealQuery;
import
com.mortals.xhx.module.perform.model.PerformErrorMessageEntity
;
import
com.mortals.xhx.module.perform.service.PerformAttendAppealService
;
import
com.mortals.xhx.module.perform.service.PerformErrorMessageService
;
import
org.apache.commons.collections4.CollectionUtils
;
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.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.time.LocalDateTime
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
...
...
@@ -168,8 +175,15 @@ public class PerformErrorMessageController extends BaseCRUDJsonBodyMappingContro
PerformAttendAppealQuery
appealQuery
=
new
PerformAttendAppealQuery
();
appealQuery
.
setCheckRecordId
(
entity
.
getCheckRecordId
());
appealQuery
.
setPerformType
(
entity
.
getPerformType
());
PerformAttendAppealEntity
appealEntity
=
performAttendAppealService
.
selectOne
(
appealQuery
);
ret
.
put
(
"appealData"
,
appealEntity
);
appealQuery
.
setOrderColList
(
Arrays
.
asList
(
new
OrderCol
(
"appealTime"
,
OrderCol
.
DESCENDING
)));
LocalDateTime
currentDate
=
LocalDateTime
.
now
();
LocalDateTime
firstDayOfMonth
=
currentDate
.
withDayOfMonth
(
1
);
appealQuery
.
setAppealTimeStart
(
DateUtil
.
format
(
firstDayOfMonth
,
"yyyy-MM-dd"
));
PageInfo
pageInfo
=
new
PageInfo
(-
1
);
Result
<
PerformAttendAppealEntity
>
result
=
performAttendAppealService
.
getDao
().
getListExt
(
appealQuery
,
pageInfo
);
if
(
CollectionUtils
.
isNotEmpty
(
result
.
getList
()))
{
ret
.
put
(
"appealData"
,
result
.
getList
().
get
(
0
));
}
}
}
catch
(
Exception
var8
)
{
this
.
doException
(
this
.
request
,
busiDesc
,
model
,
var8
);
...
...
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