Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java

@@ -6,10 +6,11 @@ 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.module.feedback.model.FeedbackAnswerEntity;
+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.FeedbackOptionService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -20,7 +21,6 @@ import com.mortals.framework.model.Context;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.feedback.model.FeedbackEntity;
 import com.mortals.xhx.module.feedback.service.FeedbackService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
@@ -45,6 +45,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private FeedbackOptionService feedbackOptionService;
+
     public FeedbackController(){
         super.setModuleDesc( "绩效反馈记录信息");
     }
@@ -60,6 +63,17 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
         super.init(model, context);
     }
 
+    @Override
+    protected int infoAfter(Long id, Map<String, Object> model, FeedbackEntity entity, Context context) throws AppException {
+        if(CollectionUtils.isNotEmpty(entity.getFeedbackQuestionList())){
+            for(FeedbackQuestionEntity item:entity.getFeedbackQuestionList()){
+                List<FeedbackOptionEntity> optionEntities = feedbackOptionService.find(new FeedbackOptionQuery().questionId(item.getId()));
+                item.setFeedbackOptionList(optionEntities);
+            }
+        }
+        return super.infoAfter(id, model, entity, context);
+    }
+
     /**
      * 查询问卷反馈人员列表
      * @param query
@@ -195,9 +209,4 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
         return ret;
     }
 
-
-    @Override
-    protected int infoAfter(Long id, Map<String, Object> model, FeedbackEntity entity, Context context) throws AppException {
-        return super.infoAfter(id, model, entity, context);
-    }
 }
\ No newline at end of file