解决报错

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentPlanQuestion.java

@@ -34,7 +34,6 @@ public class AssessmentPlanQuestion implements Serializable {
     * 
     */
     @ApiModelProperty("")
-    @TableId
     private Long id;
     /**
     * 

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.assessment.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -39,7 +40,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 
 /**
@@ -76,9 +79,14 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
             .eq(AssessmentQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
             .eq(AssessmentQuestion::getAssessmentTemplateId, dto.getAssessmentTemplateId())
         );
+        Map<Long, Long> parentMap = new HashMap<>();
+        for (AssessmentQuestion assessmentQuestion : questionList) {
+            parentMap.put(assessmentQuestion.getId(), IdUtil.getSnowflakeNextId());
+        }
         for (AssessmentQuestion assessmentQuestion : questionList) {
             AssessmentPlanQuestion planQuestion = BeanUtil.toBean(assessmentQuestion, AssessmentPlanQuestion.class);
-            planQuestion.setId(null);
+            planQuestion.setId(parentMap.get(assessmentQuestion.getId()));
+            planQuestion.setParentId(parentMap.get(assessmentQuestion.getParentId()));
             planQuestion.setAssessmentTemplatePlanId(assessmentTemplatePlan.getId());
             planQuestionMapper.insert(planQuestion);
         }
@@ -142,10 +150,16 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
             new QueryWrapper<AssessmentQuestion>().lambda()
             .eq(AssessmentQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
             .eq(AssessmentQuestion::getAssessmentTemplateId, dto.getAssessmentTemplateId())
+            .orderByAsc(AssessmentQuestion::getCategory)
         );
+        Map<Long, Long> parentMap = new HashMap<>();
+        for (AssessmentQuestion assessmentQuestion : questionList) {
+            parentMap.put(assessmentQuestion.getId(), IdUtil.getSnowflakeNextId());
+        }
         for (AssessmentQuestion assessmentQuestion : questionList) {
             AssessmentPlanQuestion planQuestion = BeanUtil.toBean(assessmentQuestion, AssessmentPlanQuestion.class);
-            planQuestion.setId(null);
+            planQuestion.setId(parentMap.get(assessmentQuestion.getId()));
+            planQuestion.setParentId(parentMap.get(assessmentQuestion.getParentId()));
             planQuestion.setAssessmentTemplatePlanId(assessmentTemplatePlan.getId());
             planQuestionMapper.insert(planQuestion);
         }
@@ -238,8 +252,8 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
 
     @Override
     public AssessmentTemplateQuestionVo getQuestionsById(Long id) {
-        AssessmentTemplate assessmentTemplate = assessmentTemplateMapper.selectById(id);
-        AssessmentTemplateQuestionVo vo = BeanUtil.toBean(assessmentTemplate, AssessmentTemplateQuestionVo.class);
+        AssessmentTemplatePlan templatePlan = templatePlanMapper.selectById(id);
+        AssessmentTemplateQuestionVo vo = BeanUtil.toBean(templatePlan, AssessmentTemplateQuestionVo.class);
         List<AssessmentPlanQuestion> questionList = planQuestionMapper.selectList(
             new QueryWrapper<AssessmentPlanQuestion>().lambda()
             .eq(AssessmentPlanQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())