From f5d4eb612b02a504fcbff5247f64502090430460 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Wed, 24 Jul 2024 17:57:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=88=E4=BE=8B=E9=A2=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E4=B8=89=E7=BA=A7=E7=9B=AE=E5=BD=95=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CaseController.java | 25 +++++++++++-------- .../controller/api/CaseApi.java | 2 +- .../mapper/SysCaseQuestionMapper.java | 12 ++++++--- .../mapper/SysCaseQuestionMapper.xml | 15 +++++++++++ 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/sztzjy/resource_center/controller/CaseController.java b/src/main/java/com/sztzjy/resource_center/controller/CaseController.java index 0d96dcb..1138e73 100644 --- a/src/main/java/com/sztzjy/resource_center/controller/CaseController.java +++ b/src/main/java/com/sztzjy/resource_center/controller/CaseController.java @@ -95,9 +95,11 @@ public class CaseController { public ResultEntity> selectCaseByConditions(@RequestParam Integer index, @RequestParam Integer size, @RequestParam(required = false) String title, - @RequestParam(required = false) String oneId) { + @RequestParam(required = false) String oneId, + @RequestParam(required = false) String twoId, + @RequestParam(required = false) String threeId) { PageHelper.startPage(index, size); - List list = caseQuestionMapper.selectCaseByConditions(title, oneId, null); + List list = caseQuestionMapper.selectCaseByConditions(title, oneId, null, twoId, threeId); PageInfo pageInfo = new PageInfo(list); return new ResultEntity>(pageInfo); } @@ -105,11 +107,14 @@ public class CaseController { @AnonymousAccess @ApiOperation("案例题页面查询/有重复") @PostMapping("selectCaseByConditionsByBind") - public ResultEntity> selectCaseByConditions(@RequestParam Integer index, - @RequestParam Integer size, - @RequestParam(required = false) String title) { + public ResultEntity> selectCaseByConditionsByBind(@RequestParam Integer index, + @RequestParam Integer size, + @RequestParam(required = false) String title, + @RequestParam(required = false) String oneId, + @RequestParam(required = false) String twoId, + @RequestParam(required = false) String threeId) { PageHelper.startPage(index, size); - List list = caseQuestionMapper.selectCaseByConditionsByBind(title); + List list = caseQuestionMapper.selectCaseByConditionsByBind(title, oneId, twoId, threeId); PageInfo pageInfo = new PageInfo(list); return new ResultEntity>(pageInfo); } @@ -132,7 +137,7 @@ public class CaseController { sysCaseQuestion.setTwoId(sysTopicAndCourse.getTwoId()); sysCaseQuestion.setTwoName(sysTopicAndCourse.getTwoName()); } - if (StringUtils.isNotBlank(sysCaseQuestion.getThreeId())) { + if (StringUtils.isNotBlank(sysTopicAndCourse.getThreeId())) { sysCaseQuestion.setThreeName(sysTopicAndCourse.getThreeName()); sysCaseQuestion.setThreeId(sysTopicAndCourse.getThreeId()); } @@ -231,13 +236,13 @@ public class CaseController { @AnonymousAccess @ApiOperation("批量绑定案例题") @PostMapping("batchBindCase") - public ResultEntity batchBindCase(@ApiParam("传全部参数")@RequestBody List sysTopicAndCourse) { + public ResultEntity batchBindCase(@ApiParam("传全部参数") @RequestBody List sysTopicAndCourse) { try { topicAndCourseMapper.batchInsert(sysTopicAndCourse); } catch (Exception e) { e.printStackTrace(); - return new ResultEntity<>(HttpStatus.INTERNAL_SERVER_ERROR,"绑定失败，请联系管理员"); + return new ResultEntity<>(HttpStatus.INTERNAL_SERVER_ERROR, "绑定失败，请联系管理员"); } - return new ResultEntity<>(HttpStatus.OK,"绑定成功！"); + return new ResultEntity<>(HttpStatus.OK, "绑定成功！"); } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java b/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java index 43571b3..9b2c28d 100644 --- a/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java +++ b/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java @@ -104,7 +104,7 @@ public class CaseApi { @RequestParam(required = false) String schoolId) { SysOneCatalog sysOneCatalogs = getSysOneCatalogs(systemOwner); String oneId = sysOneCatalogs.getOneId(); - List list = caseQuestionMapper.selectCaseByConditions(keyword, oneId, schoolId); + List list = caseQuestionMapper.selectCaseByConditions(keyword, oneId, schoolId,null,null); PageInfo pageInfo1 = PageUtil.pageHelper(list, index, size); return pageInfo1; } diff --git a/src/main/java/com/sztzjy/resource_center/mapper/SysCaseQuestionMapper.java b/src/main/java/com/sztzjy/resource_center/mapper/SysCaseQuestionMapper.java index e6c6046..0210081 100644 --- a/src/main/java/com/sztzjy/resource_center/mapper/SysCaseQuestionMapper.java +++ b/src/main/java/com/sztzjy/resource_center/mapper/SysCaseQuestionMapper.java @@ -6,7 +6,6 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; @Mapper public interface SysCaseQuestionMapper { @@ -40,7 +39,12 @@ public interface SysCaseQuestionMapper { List selectCaseByConditions(@Param("title") String title, @Param("oneId") String oneId, - @Param("source") String source); - - List selectCaseByConditionsByBind(@Param("title") String title); + @Param("source") String source, + @Param("twoId") String twoId, + @Param("threeId") String threeId); + + List selectCaseByConditionsByBind(@Param("title") String title, + @Param("oneId") String oneId, + @Param("twoId") String twoId, + @Param("threeId") String threeId); } \ No newline at end of file diff --git a/src/main/resources/mapper/SysCaseQuestionMapper.xml b/src/main/resources/mapper/SysCaseQuestionMapper.xml index 8dbd9f7..8d07e56 100644 --- a/src/main/resources/mapper/SysCaseQuestionMapper.xml +++ b/src/main/resources/mapper/SysCaseQuestionMapper.xml @@ -444,6 +444,12 @@ st.one_id = #{oneId} + + and st.two_id = #{twoId} + + + and st.three_id = #{threeId} + and s.title LIKE CONCAT('%', #{title}, '%') @@ -467,6 +473,15 @@ and s.title LIKE CONCAT('%', #{title}, '%') + + and st.one_id = #{oneId} + + + and st.two_id = #{twoId} + + + and st.three_id = #{threeId} + and s.unmount_status is false order by s.create_time