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
fcd63326
Commit
fcd63326
authored
Jul 15, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加照片海康下载
parent
cec0ed3e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java
.../com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java
...m/mortals/xhx/module/feedback/web/FeedbackController.java
+11
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java
View file @
fcd63326
package
com.mortals.xhx.module.feedback.model.vo
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.feedback.model.FeedbackAnswerEntity
;
import
com.mortals.xhx.module.feedback.model.FeedbackEntity
;
import
java.util.ArrayList
;
import
java.util.List
;
import
com.mortals.xhx.module.feedback.model.FeedbackQuestionEntity
;
import
lombok.Data
;
import
com.mortals.framework.annotation.Excel
;
import
java.math.BigDecimal
;
...
...
@@ -25,4 +28,5 @@ public class FeedbackVo extends BaseEntityLong {
private
Integer
backStatus
;
private
List
<
FeedbackAnswerEntity
>
feedbackAnswerList
=
new
ArrayList
<>();;
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java
View file @
fcd63326
...
...
@@ -10,6 +10,7 @@ import com.mortals.xhx.module.feedback.model.*;
import
com.mortals.xhx.module.feedback.model.vo.FeedbackStaffInfoVo
;
import
com.mortals.xhx.module.feedback.model.vo.OptionSummaryVo
;
import
com.mortals.xhx.module.feedback.model.vo.QuestionAnswerVo
;
import
com.mortals.xhx.module.feedback.service.FeedbackAnswerService
;
import
com.mortals.xhx.module.feedback.service.FeedbackOptionService
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -48,6 +49,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
@Autowired
private
FeedbackOptionService
feedbackOptionService
;
@Autowired
private
FeedbackAnswerService
feedbackAnswerService
;
public
FeedbackController
(){
super
.
setModuleDesc
(
"绩效反馈记录信息"
);
}
...
...
@@ -71,6 +75,13 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
item
.
setFeedbackOptionList
(
optionEntities
);
}
}
List
<
FeedbackAnswerEntity
>
feedbackAnswerEntities
=
feedbackAnswerService
.
find
(
new
FeedbackAnswerQuery
().
feedbackId
(
entity
.
getFeedbackId
()));
if
(!
ObjectUtils
.
isEmpty
(
feedbackAnswerEntities
)){
entity
.
setFeedbackAnswerList
(
feedbackAnswerEntities
);
}
return
super
.
infoAfter
(
id
,
model
,
entity
,
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