工作任务问题排序

cloud-research-service/src/main/java/com/yizhi/research/application/service/impl/TrResearchQuestionServiceImpl.java

@@ -106,7 +106,7 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
                 }
                 }
             }
             }
         }
         }
-        
+
         //修改使用batchInsert插入时候keywords字段保存不了
         //修改使用batchInsert插入时候keywords字段保存不了
         int num = 0;
         int num = 0;
         for (TrResearchQuestion question : researchQuestions) {
         for (TrResearchQuestion question : researchQuestions) {
@@ -123,6 +123,19 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
     @Override
     @Override
     public int updateNo(QuestionJumpVo vo){
     public int updateNo(QuestionJumpVo vo){
         if(vo.getQuestionId()!=null){
         if(vo.getQuestionId()!=null){
+            TrResearchQuestion question = researchQuestionMapper.selectById(vo.getQuestionId());
+            if(question==null){
+                return 0;
+            }
+            List<TrResearchQuestion> questionList = researchQuestionMapper.listAllForJump(0,question.getResearchId());
+            if(CollectionUtils.isEmpty(questionList)){
+                return 0;
+            }
+            Optional<TrResearchQuestion>  optional = questionList.stream().filter(q->Objects.equals(q.getNo(),vo.getNo())).findFirst();
+            if(optional!=null&&optional.isPresent()){
+                TrResearchQuestion trResearchQuestion = optional.get();
+                 researchQuestionMapper.updateQNoById(trResearchQuestion.getId(),question.getNo());
+            }
             return researchQuestionMapper.updateQNoById(vo.getQuestionId(),vo.getNo());
             return researchQuestionMapper.updateQNoById(vo.getQuestionId(),vo.getNo());
         }
         }
         return 0;
         return 0;
@@ -331,11 +344,11 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
 
 
         if (!CollectionUtils.isEmpty(newQuestions) && !needChangeNo) {
         if (!CollectionUtils.isEmpty(newQuestions) && !needChangeNo) {
         	//result += researchQuestionMapper.batchInsert(newQuestions);
         	//result += researchQuestionMapper.batchInsert(newQuestions);
-            //修改使用batchInsert插入时候keywords字段保存不了 
+            //修改使用batchInsert插入时候keywords字段保存不了
             for (TrResearchQuestion question : newQuestions) {
             for (TrResearchQuestion question : newQuestions) {
             	result += researchQuestionMapper.insert(question);
             	result += researchQuestionMapper.insert(question);
             }
             }
-            
+
         }
         }
         if (!CollectionUtils.isEmpty(newOptions)) {
         if (!CollectionUtils.isEmpty(newOptions)) {
             researchQuestionOptionMapper.batchInsert(newOptions);
             researchQuestionOptionMapper.batchInsert(newOptions);
@@ -1060,7 +1073,7 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
 				item.setNo(no++);
 				item.setNo(no++);
 			}
 			}
 		}
 		}
-		
+
 		return result;
 		return result;
 	}
 	}
 }
 }