diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index be01ad25..ccfe550b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.documenttool.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; @@ -9,9 +10,7 @@ import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; -import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; -import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; -import com.jero.modules.laws.documenttool.entity.SplitFileInfo; +import com.jero.modules.laws.documenttool.entity.*; import com.jero.modules.laws.documenttool.service.IDocumentSplitService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsValEO; @@ -486,4 +485,21 @@ public class DocumentSplitController { documentSplitService.disposeItemVal(isAsmsImport, serialNumber); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } + + + /** + * 标准拆分详情-通过标准编号获取最新拆分的条款内容不区分状态 + * @param + * @return + */ + @AutoLog(value = "标准拆分详情-通过条款号获取最新拆分的条款内容不区分状态") + @ApiOperation(value = "标准拆分详情-通过条款号获取最新拆分的条款内容不区分状态") + @GetMapping("/getPageByStandardNumber") + public Result> getPageByStandardNumber(LawsSplitByStandardNumber lawsSplitByStandardNumber, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage page = documentSplitService.getPageByNum(lawsSplitByStandardNumber,pageNo,pageSize,req); + return Result.OK(page); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsSplitByStandardNumber.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsSplitByStandardNumber.java new file mode 100644 index 00000000..29d4da1a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsSplitByStandardNumber.java @@ -0,0 +1,38 @@ +package com.jero.modules.laws.documenttool.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Author: yjz + * @Date: 2023/10/15/19:34 + * @Description: + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_document_split对象", description="文档拆分") +public class LawsSplitByStandardNumber extends BaseEntity { + // 条款号 + @ApiModelProperty("条款号") + private String itemNum; + // 条款名称 + @ApiModelProperty("条款名称") + private String itemTitle; + // 条款内容 + @ApiModelProperty("条款内容") + private String itemContent; + // 标准名称 + @ApiModelProperty("标准名称") + private String standardName; + // 标准编号 + @ApiModelProperty("标准编号") + private String standardNumber; + // 标准id + @ApiModelProperty("标准id") + private String standardIds; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java index 0c345c31..beb1a701 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java @@ -240,4 +240,8 @@ public interface DocumentSplitMapper extends BaseMapper { * @return */ List getSplitSelectIds(List countryList); + + List getInfoId(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage getPageByNum(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index b042d378..bde573a9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -326,4 +326,48 @@ CONCAT(',',l1.applicable_market,',') like CONCAT('%,',#{item},',%') + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java index 9b4940a2..21802143 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java @@ -2,9 +2,8 @@ package com.jero.modules.laws.documenttool.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; -import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; -import com.jero.modules.laws.documenttool.entity.SplitFileInfo; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.laws.documenttool.entity.*; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsValEO; import com.jero.modules.split.entity.SarFileSplitMenuEO; @@ -240,4 +239,14 @@ public interface IDocumentSplitService { * @param ids */ void updatePermissionsCheck(String ids); + + /** + * 通过标准编号获取最新拆分的条款内容不区分状态 + * @param lawsSplitByStandardNumber + * @param pageNo + * @param pageSize + * @param req + * @return + */ + IPage getPageByNum(LawsSplitByStandardNumber lawsSplitByStandardNumber, Integer pageNo, Integer pageSize, HttpServletRequest req); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 57410f95..0cdb1e12 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -35,6 +35,7 @@ import com.jero.modules.laws.documenttool.mapper.LawsDocumentSplitMapper; import com.jero.modules.laws.documenttool.service.IDocumentSplitService; import com.jero.modules.laws.labeldatabase.entity.LawsLabelDatabase; import com.jero.modules.laws.labeldatabase.service.ILawsLabelDatabaseService; +import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard; import com.jero.modules.laws.standard.entity.*; import com.jero.modules.laws.standard.service.*; import com.jero.modules.split.entity.SarFileSplitInfoEO; @@ -1679,6 +1680,29 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { } } + @Override + public IPage getPageByNum(LawsSplitByStandardNumber lawsSplitByStandardNumber, Integer pageNo, Integer pageSize, HttpServletRequest req) { + if(StringUtils.isEmpty(lawsSplitByStandardNumber.getStandardIds())){ + throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED); + } + QueryWrapper queryWrapperLawsDocumentSplit = new QueryWrapper<>(); + queryWrapperLawsDocumentSplit.in("o1.standard_id",Arrays.asList(lawsSplitByStandardNumber.getStandardIds().split(","))); + List ids = documentSplitMapper.getInfoId(queryWrapperLawsDocumentSplit); + if(CollectionUtils.isEmpty(ids)){ + ids.add("-1"); + } + Page page = new Page<>(pageNo, pageSize); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("s.del_flag","0"); + queryWrapper.in("s1.id",ids); + queryWrapper.eq(!StringUtils.isEmpty(lawsSplitByStandardNumber.getStandardNumber()),"l.standard_number",lawsSplitByStandardNumber.getStandardNumber()); + queryWrapper.eq(!StringUtils.isEmpty(lawsSplitByStandardNumber.getStandardName()),"l.standard_name",lawsSplitByStandardNumber.getStandardName()); + queryWrapper.eq(!StringUtils.isEmpty(lawsSplitByStandardNumber.getItemNum()),"item_num",lawsSplitByStandardNumber.getItemNum()); + queryWrapper.eq(!StringUtils.isEmpty(lawsSplitByStandardNumber.getItemTitle()),"item_title",lawsSplitByStandardNumber.getItemTitle()); + IPage res = documentSplitMapper.getPageByNum(page, queryWrapper); + return res; + } + private void manageData(Map resultMap, StringBuilder fieldsBuilder, List valuesList) { // 所有key(字段名) resultMap.forEach((k, v) -> {