From 62b6d99c2337ccaa7571dd54ec0fabba81b58685 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 6 Mar 2024 15:44:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../questioninfo/QuestionInfoController.java | 4 ++-- .../questionsubject/QuestionSubject.java | 4 ++-- .../QuestionSubjectOptionMapper.java | 2 +- .../impl/QuestionInfoServiceImpl.java | 20 +++++++++---------- .../QuestionSubjectOptionVO.java | 4 +++- .../questionsubject/QuestionSubjectMapper.xml | 2 +- .../QuestionSubjectOptionMapper.xml | 13 ++++++++---- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java index 11175699..cd82a292 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java @@ -70,7 +70,7 @@ public class QuestionInfoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:question:add')") @Log(title = "问卷基本信息", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") public AjaxResult add(@RequestBody QuestionVO questionInfo) { if (Objects.isNull(questionInfo) || StringUtils.isBlank(questionInfo.getQuestionnaireName())) { return AjaxResult.error("请添加问卷信息！"); @@ -83,7 +83,7 @@ public class QuestionInfoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:question:edit')") @Log(title = "问卷基本信息", businessType = BusinessType.UPDATE) - @PutMapping + @PostMapping("/edit") public AjaxResult edit(@RequestBody QuestionVO question) { return questionInfoService.updateQuestionInfo(question); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubject/QuestionSubject.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubject/QuestionSubject.java index c6b72674..12841c09 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubject/QuestionSubject.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubject/QuestionSubject.java @@ -44,7 +44,7 @@ public class QuestionSubject extends BaseEntity { */ @ApiModelProperty(value = "题目序号") @Excel(name = "题目序号") - private Integer questionNumber; + private BigDecimal questionNumber; /** * 题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS， @@ -95,7 +95,7 @@ public class QuestionSubject extends BaseEntity { */ @ApiModelProperty(value = "是否计分，0：否，1：是") @Excel(name = "是否计分，0：否，1：是") - private Integer whetherScore; + private Boolean whetherScore; /** * 计分方式，每个选项都有对应分值：NOT_UNIQUE_ANSWER，全部答对才得分：UNIQUE_ANSWER diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questionsubjectoption/QuestionSubjectOptionMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questionsubjectoption/QuestionSubjectOptionMapper.java index 8235df48..1cd52f69 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questionsubjectoption/QuestionSubjectOptionMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questionsubjectoption/QuestionSubjectOptionMapper.java @@ -84,5 +84,5 @@ public interface QuestionSubjectOptionMapper { * @param questionSubjectIds 题目表id * @return int */ - int deleteOptionByQuestionSubjectIds(List questionSubjectIds); + int deleteOptionByQuestionSubjectIds(@Param("questionSubjectIds") List questionSubjectIds); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java index f7362dab..062e325e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java @@ -102,8 +102,8 @@ public class QuestionInfoServiceImpl implements IQuestionInfoService { List questionSubjectList = question.getQuestionSubjectList(); List questionSubjects = new ArrayList<>(); List questionSubjectOptions = new ArrayList<>(); - QuestionSubject saveQuestionSubject = new QuestionSubject(); for (QuestionSubjectVO questionSubject : questionSubjectList) { + QuestionSubject saveQuestionSubject = new QuestionSubject(); BeanUtils.copyBeanProp(saveQuestionSubject, questionSubject); saveQuestionSubject.setQuestionInfoId(questionInfo.getId()); saveQuestionSubject.setCreateTime(DateUtils.getNowDate()); @@ -118,14 +118,14 @@ public class QuestionInfoServiceImpl implements IQuestionInfoService { } //新增选项表 List saveQuestionSubjectOptions = new ArrayList<>(); - QuestionSubjectOption saveQuestionSubjectOption = new QuestionSubjectOption(); for (QuestionSubjectOptionVO questionSubjectOption : questionSubjectOptions) { + QuestionSubjectOption saveQuestionSubjectOption = new QuestionSubjectOption(); BeanUtils.copyBeanProp(saveQuestionSubjectOption, questionSubjectOption); - QuestionSubject questionSubject = questionSubjects.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getQuestionNumber()) && questionSubjectOption.getQuestionNumber().equals(item.getQuestionNumber())).findFirst().orElse(new QuestionSubject()); - questionSubjectOption.setQuestionnaireSubjectId(questionSubject.getId()); + QuestionSubject questionSubject = questionSubjects.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getQuestionNumber()) && questionSubjectOption.getQuestionNumber().compareTo(item.getQuestionNumber()) == 0).findFirst().orElse(new QuestionSubject()); + saveQuestionSubjectOption.setQuestionnaireSubjectId(questionSubject.getId()); saveQuestionSubjectOption.setCreateTime(DateUtils.getNowDate()); saveQuestionSubjectOption.setCreateBy(SecurityUtils.getUsername()); - saveQuestionSubjectOptions.add(questionSubjectOption); + saveQuestionSubjectOptions.add(saveQuestionSubjectOption); } int subjectOptionCount = questionSubjectOptionMapper.insertQuestionSubjectOptionList(saveQuestionSubjectOptions); if (subjectOptionCount <= 0) { @@ -173,8 +173,8 @@ public class QuestionInfoServiceImpl implements IQuestionInfoService { List questionSubjectList = question.getQuestionSubjectList(); List questionSubjects = new ArrayList<>(); List questionSubjectOptions = new ArrayList<>(); - QuestionSubject saveQuestionSubject = new QuestionSubject(); for (QuestionSubjectVO questionSubject : questionSubjectList) { + QuestionSubject saveQuestionSubject = new QuestionSubject(); BeanUtils.copyBeanProp(saveQuestionSubject, questionSubject); saveQuestionSubject.setQuestionInfoId(questionInfo.getId()); saveQuestionSubject.setCreateTime(DateUtils.getNowDate()); @@ -188,14 +188,14 @@ public class QuestionInfoServiceImpl implements IQuestionInfoService { throw new SecurityException("修改问卷失败!请联系管理员！"); } List saveQuestionSubjectOptions = new ArrayList<>(); - QuestionSubjectOption saveQuestionSubjectOption = new QuestionSubjectOption(); for (QuestionSubjectOptionVO questionSubjectOption : questionSubjectOptions) { + QuestionSubjectOption saveQuestionSubjectOption = new QuestionSubjectOption(); BeanUtils.copyBeanProp(saveQuestionSubjectOption, questionSubjectOption); - QuestionSubject questionSubject = questionSubjects.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getQuestionNumber()) && questionSubjectOption.getQuestionNumber().equals(item.getQuestionNumber())).findFirst().orElse(new QuestionSubject()); - questionSubjectOption.setQuestionnaireSubjectId(questionSubject.getId()); + QuestionSubject questionSubject = questionSubjects.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getQuestionNumber()) && questionSubjectOption.getQuestionNumber().compareTo(item.getQuestionNumber()) == 0).findFirst().orElse(new QuestionSubject()); + saveQuestionSubjectOption.setQuestionnaireSubjectId(questionSubject.getId()); saveQuestionSubjectOption.setCreateTime(DateUtils.getNowDate()); saveQuestionSubjectOption.setCreateBy(SecurityUtils.getUsername()); - saveQuestionSubjectOptions.add(questionSubjectOption); + saveQuestionSubjectOptions.add(saveQuestionSubjectOption); } int subjectOptionCount = questionSubjectOptionMapper.insertQuestionSubjectOptionList(saveQuestionSubjectOptions); if (subjectOptionCount <= 0) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubjectoption/QuestionSubjectOptionVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubjectoption/QuestionSubjectOptionVO.java index c55f462d..c168b622 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubjectoption/QuestionSubjectOptionVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubjectoption/QuestionSubjectOptionVO.java @@ -4,6 +4,8 @@ import com.xinelu.manage.domain.questionsubjectoption.QuestionSubjectOption; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + /** * 问卷题目选项答案对象 question_subject_option * @@ -17,5 +19,5 @@ public class QuestionSubjectOptionVO extends QuestionSubjectOption { /** * 题号 */ - private Integer questionNumber; + private BigDecimal questionNumber; } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/questionsubject/QuestionSubjectMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/questionsubject/QuestionSubjectMapper.xml index e62b1b37..c991875d 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/questionsubject/QuestionSubjectMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/questionsubject/QuestionSubjectMapper.xml @@ -345,7 +345,7 @@ - and question_info_id = #{id} + question_info_id = #{id} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml index 6e90eaf1..44b74bd7 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml @@ -228,9 +228,14 @@ - delete from question_subject_option where questionnaire_subject_id in - - #{questionSubjectIds} - + delete from question_subject_option + + + questionnaire_subject_id in + + #{questionSubjectIds} + + + \ No newline at end of file