Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java

@@ -7,21 +7,13 @@ import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
-import com.mortals.framework.model.Result;
-import com.mortals.framework.web.BaseJsonBodyController;
-import com.mortals.xhx.busiz.req.AppealReq;
 import com.mortals.xhx.busiz.req.FeedbackReq;
 import com.mortals.xhx.busiz.req.FeedbackSaveReq;
-import com.mortals.xhx.busiz.req.PerformReq;
-import com.mortals.xhx.busiz.rsp.AppealStatInfo;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.module.check.service.*;
 import com.mortals.xhx.module.feedback.model.*;
 import com.mortals.xhx.module.feedback.service.FeedbackAnswerService;
 import com.mortals.xhx.module.feedback.service.FeedbackService;
 import com.mortals.xhx.module.feedback.service.FeedbackStaffService;
-import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
-import com.mortals.xhx.module.perform.model.PerformAttendAppealQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -56,7 +48,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
     @Autowired
     private FeedbackStaffService feedbackStaffService;
     @Autowired
-    private FeedbackAnswerService anseerService;
+    private FeedbackAnswerService answerService;
 
     /**
      * 反馈列表
@@ -88,7 +80,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
             if (YesNoEnum.YES.getValue() == feedbackReq.getFeedbackStatus()) {
                 //已反馈
                 //查询我已经回答过的
-                List<Long> feedbackIdList = anseerService.find(new FeedbackAnswerQuery().staffId(context.getUser().getCustomerId())).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
+                List<Long> feedbackIdList = answerService.find(new FeedbackAnswerQuery().staffId(context.getUser().getCustomerId())).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
                 FeedbackQuery feedbackQuery = new FeedbackQuery();
                 feedbackQuery.setIdList(feedbackIdList);
                 List<FeedbackEntity> feedbackEntities = feedbackService.find(feedbackQuery);
@@ -97,7 +89,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
             } else {
                 //未反馈
                 //查询我的反馈 但是还未回答的
-                List<Long> feedbackIdList = anseerService.find(new FeedbackAnswerQuery().staffId(context.getUser().getCustomerId())).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
+                List<Long> feedbackIdList = answerService.find(new FeedbackAnswerQuery().staffId(context.getUser().getCustomerId())).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
 
                 FeedbackStaffQuery feedbackStaffQuery = new FeedbackStaffQuery();
                 feedbackStaffQuery.setFeedbackIdNotList(feedbackIdList);
@@ -129,8 +121,6 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
         Context context = this.getContext();
         String busiDesc = "反馈回答";
         Rest<FeedbackEntity> rest = Rest.ok(busiDesc + " 【成功】");
-
-
         try {
             if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
                 throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
@@ -139,15 +129,28 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
 
             //如果时间已经结束 则不能再提交
             FeedbackEntity feedbackEntity = feedbackService.get(req.getFeedbackId(), context);
-
-            if (DateUtil.compare(feedbackEntity.getFeedbackTimeEnd(), new Date()) < 0)
+            if (DateUtil.compare(new Date(), feedbackEntity.getFeedbackTimeStart()) < 0)
+                throw new AppException("当前反馈问卷信息还未开始！");
+            if (DateUtil.compare(new Date(), feedbackEntity.getFeedbackTimeEnd()) > 0)
                 throw new AppException("当前反馈问卷信息已经过了截止日期！");
 
+            //判断是否已经回答过，已经回答了的 不重复提交
+            int count = answerService.count(new FeedbackAnswerQuery().feedbackId(req.getFeedbackId()).staffId(context.getUser().getCustomerId()), context);
+            if (count > 0) throw new AppException("该问卷反馈已经提交过，不能重复提交！");
 
+            //添加问答
             List<FeedbackAnswerEntity> feedbackAnswerList = req.getFeedbackAnswerList();
+            for (FeedbackAnswerEntity feedbackAnswerEntity : feedbackAnswerList) {
+                feedbackAnswerEntity.setCreateUserId(context.getUser().getId());
+                feedbackAnswerEntity.setCreateTime(new Date());
+                List<FeedbackAnswerOptionEntity> feedbackAnswerOptionList = feedbackAnswerEntity.getFeedbackAnswerOptionList();
+                for (FeedbackAnswerOptionEntity feedbackAnswerOptionEntity : feedbackAnswerOptionList) {
+                    feedbackAnswerOptionEntity.setCreateUserId(context.getUser().getId());
+                    feedbackAnswerOptionEntity.setCreateTime(new Date());
+                }
+            }
+            answerService.save(feedbackAnswerList, context);
 
-
-           // rest.setData(saveEntity);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
             log.error(busiDesc, e);