From def329ac7a0215b6650d3aeccc7ca7d2fca62e5a Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 09:44:38 +0800
Subject: [PATCH] 配置

---
 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java
index 8d08a34..54dcde0 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java
@@ -6,9 +6,7 @@
 import com.project.enforce.domain.EnforceEvaluateQuestion;
 import com.project.enforce.domain.bo.editBo.EnforceEvaluateBo;
 import com.project.enforce.domain.vo.EnforceEvaluateVo;
-import com.project.enforce.service.IEnforceEvaluateAnswerService;
-import com.project.enforce.service.IEnforceEvaluateQuestionService;
-import com.project.enforce.service.IEnforceEvaluateService;
+import com.project.enforce.service.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,15 +28,18 @@
 
     private final IEnforceEvaluateQuestionService questionService;
     private final IEnforceEvaluateAnswerService answerService;
+    private final IEnforceOrderService orderService;
+    private final IEnforceEvaluateLogService evaluateLogService;
 
 
     @Override//淇濆瓨
     @Transactional
     public Boolean save(EnforceEvaluateBo bo)
     {
+        questionService.clearQuestionAndAnswer();
         List<EnforceEvaluateQuestion> questionList = bo.getQuestionList();
         if (StringUtils.isEmpty(questionList)){
-            throw new BaseException("棰樼洰涓嶅彲涓虹┖锛�");
+            throw new BaseException("璇勪环椤逛笉鍙负绌猴紒");
         }
         for (EnforceEvaluateQuestion question : bo.getQuestionList()) {
             if (question.getQuestionType()==1 && StringUtils.isEmpty(question.getAnswerList())){
@@ -48,16 +49,8 @@
                 int count = questionService.count(questionService.lq()
                         .eq(EnforceEvaluateQuestion::getQuestionName, question.getQuestionId()));
                 if (count>0) {
-                    throw new BaseException(StringUtils.format("{}锛岄鐩噸澶嶏紝璇烽噸璇曪紒", question.getQuestionName()));
+                    throw new BaseException(StringUtils.format("{}锛岄噸澶嶏紝璇烽噸璇曪紒", question.getQuestionName()));
                 }
-                if (StringUtils.isNotEmpty(question.getAnswerList())){
-                    EnforceEvaluateQuestion one = questionService.getOne(questionService.lq().eq(EnforceEvaluateQuestion::getQuestionName, question.getQuestionName()));
-                    question.getAnswerList().forEach(enforceEvaluateAnswer -> {
-                        enforceEvaluateAnswer.setQuestionId(one.getQuestionId());
-                        enforceEvaluateAnswer.setQuestionName(one.getQuestionName());
-                    });
-                }
-
             } else {
                 int count = questionService.count(questionService.lq().
                         eq(EnforceEvaluateQuestion::getQuestionName, question.getQuestionId())
@@ -68,11 +61,15 @@
             }
             questionService.saveOrUpdate(question);
             if (StringUtils.isNotEmpty(question.getAnswerList())){
+                EnforceEvaluateQuestion one = questionService.getOne(questionService.lq().eq(EnforceEvaluateQuestion::getQuestionName, question.getQuestionName()));
+                question.getAnswerList().forEach(enforceEvaluateAnswer -> {
+                    enforceEvaluateAnswer.setQuestionId(one.getQuestionId());
+                    enforceEvaluateAnswer.setQuestionName(one.getQuestionName());
+                });
                 answerService.saveOrUpdateBatch(question.getAnswerList());
             }
         }
-
-        return null;
+        return true;
     }
 
     @Override//璇勪环璁剧疆璇︽儏
@@ -89,4 +86,6 @@
         vo.setQuestionList(questionList);
         return vo;
     }
+
+
 }

--
Gitblit v1.9.1