Commit fcd63326 authored by 赵啸非's avatar 赵啸非

添加照片海康下载

parent cec0ed3e
package com.mortals.xhx.module.feedback.model.vo; package com.mortals.xhx.module.feedback.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.feedback.model.FeedbackAnswerEntity;
import com.mortals.xhx.module.feedback.model.FeedbackEntity; import com.mortals.xhx.module.feedback.model.FeedbackEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.feedback.model.FeedbackQuestionEntity;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -25,4 +28,5 @@ public class FeedbackVo extends BaseEntityLong { ...@@ -25,4 +28,5 @@ public class FeedbackVo extends BaseEntityLong {
private Integer backStatus; private Integer backStatus;
private List<FeedbackAnswerEntity> feedbackAnswerList=new ArrayList<>();;
} }
\ No newline at end of file
...@@ -10,6 +10,7 @@ import com.mortals.xhx.module.feedback.model.*; ...@@ -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.FeedbackStaffInfoVo;
import com.mortals.xhx.module.feedback.model.vo.OptionSummaryVo; import com.mortals.xhx.module.feedback.model.vo.OptionSummaryVo;
import com.mortals.xhx.module.feedback.model.vo.QuestionAnswerVo; 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 com.mortals.xhx.module.feedback.service.FeedbackOptionService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -48,6 +49,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba ...@@ -48,6 +49,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
@Autowired @Autowired
private FeedbackOptionService feedbackOptionService; private FeedbackOptionService feedbackOptionService;
@Autowired
private FeedbackAnswerService feedbackAnswerService;
public FeedbackController(){ public FeedbackController(){
super.setModuleDesc( "绩效反馈记录信息"); super.setModuleDesc( "绩效反馈记录信息");
} }
...@@ -71,6 +75,13 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba ...@@ -71,6 +75,13 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
item.setFeedbackOptionList(optionEntities); 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); return super.infoAfter(id, model, entity, context);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment