From ca587332f1317ff9573c37dc026e9929274eb0da Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 13 Sep 2023 17:28:50 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=87=86=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E6=8A=BD=E5=B1=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/LawsCommonController.java | 14 ++++++++++++++ .../laws/common/mapper/xml/LawsCommonMapper.xml | 3 +++ .../laws/common/vo/ManyStandardSelectionBoxVO.java | 2 ++ 3 files changed, 19 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java b/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java index 3b420a4d..bc6dcf4a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; @@ -12,6 +14,7 @@ import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,6 +47,17 @@ public class LawsCommonController { return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize)); } + @ApiOperation(value="标准右侧抽屉", notes="标准右侧抽屉") + @GetMapping(value = "/getStandardRightBox") + public Result> getStandardRightBox(ManyStandardSelectionBoxVO selectionBoxVO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + if (StringUtils.isBlank(selectionBoxVO.getNodeCode())) { + throw new JeroBootException(ResultCommon.EMPTY_COMMON, "nodeCode"); + } + return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize)); + } + @AutoLog(value = "法规更新记录列表查询") @ApiOperation(value="法规更新记录列表查询", notes="法规更新记录列表查询") @GetMapping(value = "/getUpdateRecordList") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml index 91afcf44..be8650ee 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml @@ -43,6 +43,9 @@ AND (standard_number LIKE CONCAT('%', #{vo.standardNumberOrName}, '%') OR standard_name LIKE CONCAT('%', #{vo.standardNumberOrName}, '%')) + + AND id not in (select unique_relation_flag from laws_node_relation where node_code = #{vo.nodeCode}) + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java index c25b3017..3bd50524 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java @@ -20,4 +20,6 @@ public class ManyStandardSelectionBoxVO { private java.lang.String source; @ApiModelProperty(value = "标准号/标准名称") private java.lang.String standardNumberOrName; + @ApiModelProperty(value = "树节点编码") + private java.lang.String nodeCode; }