From bac23ae67dd4be6afb9213131a223a54c95e47cf Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 16 Nov 2023 11:42:00 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=87=86=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsCommonController.java | 9 ++++++ .../common/service/ILawsCommonService.java | 8 ++++++ .../service/impl/LawsCommonServiceImpl.java | 28 +++++++++++++++++++ 3 files changed, 45 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 50806cf1..980ebb49 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,7 @@ import cn.hutool.core.io.FileUtil; 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.DictPoint; import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; import com.jero.common.util.MinioUtil; @@ -15,6 +16,7 @@ import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; import com.jero.modules.laws.enterprise.util.WaterMarkUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.split.entity.SarFileSplitInfoEO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -77,6 +79,13 @@ public class LawsCommonController { return Result.OK(lawsCommonService.getBiddingCommittee()); } + @ApiOperation(value="标准文本弹框", notes="标准文本弹框") + @GetMapping(value = "/getSplitsByStandardNumber") + @DictPoint + public Result> getSplitsByStandardNumber(@RequestParam("standardNumber") String standardNumber) { + return Result.OK(lawsCommonService.getSplitsByStandardNumber(standardNumber)); + } + /** * 下载带水印的PDF文件 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java index b7a2aaa9..0da2f539 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java @@ -5,6 +5,7 @@ import com.jero.modules.laws.common.vo.LawsDictModel; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.tag.entity.LawsTag; import org.springframework.web.multipart.MultipartFile; @@ -191,4 +192,11 @@ public interface ILawsCommonService { * @Description: 分标委下拉列表 **/ List getBiddingCommittee(); + + /** + * @Author: liao + * @Date: 2023/11/16 11:36 + * @Description: 标准文本弹框 + **/ + List getSplitsByStandardNumber(String standardNumber); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index cd1a6a77..6671cb69 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -2138,6 +2138,34 @@ public class LawsCommonServiceImpl implements ILawsCommonService { return lawsDictModelList; } + /** + * @Author: liao + * @Date: 2023/11/16 11:36 + * @Description: 标准文本弹框 + **/ + @Override + public List getSplitsByStandardNumber(String standardNumber) { + if (StringUtils.isBlank(standardNumber)) { + throw new JeroBootException(ResultCommon.EMPTY_COMMON, "standardNumber"); + } + + ManyStandardSelectionBox singleStandard = getSingleStandard(standardNumber, null); + if (singleStandard == null) { + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + } + + // 查询标准拆分表 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 标准id + queryWrapper.eq(SarFileSplitInfoEO::getStandardId, singleStandard.getId()); + // 拆分表发布标识 + queryWrapper.isNotNull(SarFileSplitInfoEO::getPublishBeforeId); + // 文件字段标识 + queryWrapper.isNotNull(SarFileSplitInfoEO::getFileType); + List sarFileSplitInfoEOList = sarFileSplitInfoService.list(queryWrapper); + return sarFileSplitInfoEOList; + } + /** * 创建企标导入模板的Workbook *