"投稿管理/信箱管理/留言管理/投票管理--修改页面的问题列表" 新增删除功能

cloud-research-api/src/main/java/com/yizhi/research/application/feign/ResearchQuestionClient.java

@@ -106,4 +106,12 @@ public interface ResearchQuestionClient {
      */
     @GetMapping("/researchQuestion/getVoteTop")
     VoteRankingVo getVoteTop(@RequestParam("researchId") Long researchId);
+
+    /**
+     * 刪除投票中的問題
+     * @param id
+     * @param researchId
+     */
+    @GetMapping("/researchQuestion/deleteByResearchIdAndQueId")
+    int deleteByResearchIdAndQueId(@RequestParam("id") Long id, @RequestParam("researchId") Long researchId);
 }

cloud-research-service/src/main/java/com/yizhi/research/application/controller/TrResearchQuestionController.java

@@ -193,5 +193,10 @@ public class TrResearchQuestionController {
     VoteRankingVo getVoteTop(@RequestParam("researchId") Long researchId) {
     	return researchQuestionService.getVoteTop(researchId);
     }
+
+    @GetMapping("/deleteByResearchIdAndQueId")
+    public int deleteByResearchIdAndQueId(@RequestParam("id") Long id, @RequestParam("researchId") Long researchId) {
+       return researchQuestionService.deleteByResearchIdAndQueId(id, researchId);
+    }
 }
 

cloud-research-service/src/main/java/com/yizhi/research/application/mapper/TrResearchQuestionMapper.java

@@ -104,5 +104,11 @@ public interface TrResearchQuestionMapper extends BaseMapper<TrResearchQuestion>
      */
 	VoteRankingVo getVoteResult(@Param("companyId") Long companyId, @Param("siteId") Long siteId, @Param("researchId") Long researchId, @Param("accountId") Long accountId, @Param("isTop") boolean isTop);
 
-
+    /**
+     * 刪除投票中的指定問題
+     * @param id
+     * @param researchId
+     * @return
+     */
+    int deleteByResearchIdAndQueId(@Param("id") Long id, @Param("researchId") Long researchId);
 }

cloud-research-service/src/main/java/com/yizhi/research/application/mapper/TrResearchQuestionMapper.xml

@@ -119,6 +119,10 @@
         </where>
     </update>
 
+    <update id="deleteByResearchIdAndQueId">
+        update tr_research_question set deleted = 1, update_time = now() where id = #{id} and research_id = #{researchId}
+    </update>
+
     <!-- 批量删除（根据调研id） -->
     <update id="batchDeleteById">
         update tr_research_question set

cloud-research-service/src/main/java/com/yizhi/research/application/mapper/TrResearchQuestionOptionMapper.java

@@ -52,4 +52,11 @@ public interface TrResearchQuestionOptionMapper extends BaseMapper<TrResearchQue
 
     void updateJumpNum(@Param("ids") List<Long> ids);
 
+    /**
+     * 刪除投票中的指定選項
+     * @param queId
+     * @param researchId
+     * @return
+     */
+    int deleteByResearchIdAndQueId(@Param("queId") Long queId, @Param("researchId") Long researchId);
 }

cloud-research-service/src/main/java/com/yizhi/research/application/mapper/TrResearchQuestionOptionMapper.xml

@@ -118,4 +118,8 @@
 
     </update>
 
+    <update id="deleteByResearchIdAndQueId">
+        update tr_research_question_option set deleted = 1, update_time = now() where question_id = #{queId} and research_id = #{researchId}
+    </update>
+
 </mapper>

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

@@ -92,4 +92,11 @@ public interface ITrResearchQuestionService extends IService<TrResearchQuestion>
      * @return
      */
 	VoteRankingVo getVoteTop(Long researchId);
+
+    /**
+     * 刪除投票中的問題
+     * @param queId
+     * @param researchId
+     */
+    int deleteByResearchIdAndQueId(Long queId, Long researchId);
 }

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

@@ -1163,4 +1163,10 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
 
 		return result;
 	}
+
+    @Override
+    public int deleteByResearchIdAndQueId(Long queId, Long researchId) {
+        researchQuestionMapper.deleteByResearchIdAndQueId(queId, researchId);
+       return researchQuestionOptionMapper.deleteByResearchIdAndQueId(queId, researchId);
+    }
 }