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 ad1bd46e..93028374 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 @@ -79,20 +79,21 @@ ANY_VALUE(standard.new_auth_impl_date) as new_auth_impl_date, ANY_VALUE(standard.create_by) as create_by, ANY_VALUE(standard.responsible_user) as responsible_user, - ANY_VALUE(standard.release_date) as release_date + ANY_VALUE(standard.release_date) as release_date, + ANY_VALUE(standard.standard_class) as standard_class , ANY_VALUE(split.id) as split_info_id FROM (SELECT id, standard_number, standard_name, implementation_date, null as release_date, standard_state, '1' AS source, create_time, - new_product_impl_date, new_auth_impl_date, create_by, responsible_user + new_product_impl_date, new_auth_impl_date, create_by, responsible_user, standard_class FROM laws_domestic_standard WHERE del_flag = 0 UNION ALL SELECT id, standard_number, standard_name, null as implementation_date, release_date, standard_state as es_standard_state, '3' AS source, create_time, - null as new_product_impl_date, null as new_auth_impl_date, create_by, null as responsible_user + null as new_product_impl_date, null as new_auth_impl_date, create_by, null as responsible_user, standard_class FROM laws_enterprise_standard WHERE del_flag = 0) standard diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java index 8bd7cdd2..0902d09c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.common.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; @@ -64,6 +65,9 @@ public class ManyStandardSelectionBox { @ApiModelProperty(value = "责任人") @Dict(dictTable = "sys_user",dicText = "realname",dicCode = "id") private java.lang.String responsibleUser; + @ApiModelProperty(value = "标准类别") + @TableField(exist = false) + private String standardClass; public void setStandardState(String standardState) { this.standardState = standardState; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java index 9af50ed9..e081e969 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java @@ -99,4 +99,11 @@ public class DocumentSplitInfo extends BaseEntity { @TableField(exist = false) @Dict(dicCode = "split_standard_source") private String splitStandardSource; + + /** + * 标准类别 + */ + @ApiModelProperty(value = "标准类别") + @TableField(exist = false) + private String standardClass; } 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 048e4b63..8f6c69bc 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 @@ -234,6 +234,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { LawsDomesticStandard lawsDomesticStandard = domesticMap.get(standardId).get(0); documentSplitInfo.setSerialNumber(lawsDomesticStandard.getStandardNumber()); documentSplitInfo.setTitle(lawsDomesticStandard.getStandardName()); + documentSplitInfo.setStandardClass(lawsDomesticStandard.getStandardClass()); } documentSplitInfo.setSplitStandardSource("1"); }else if (enterpriseMap.containsKey(documentSplitInfo.getStandardId())){ diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index 30226e75..ad0aa7a5 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -121,8 +121,11 @@ public class FileSplitItemsEOController extends JeroController importSplitItems(@ApiParam("文件对象") MultipartFile file, @ApiParam("国际化") @RequestParam(value = "cut") String cut, @ApiParam("菜单id") @RequestParam(value = "menuId") String menuId, - @ApiParam("标准拆分id") @RequestParam(value = "infoId") String infoId) throws Exception { - return fileSplitItemsEOService.importSplitItems(file, cut, menuId, infoId); + @ApiParam("标准拆分id") @RequestParam(value = "infoId") String infoId, + @ApiParam("标准类别") @RequestParam(value = "standardClass") String standardClass) throws Exception { + SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO(); + sarFileSplitInfoEO.setStandardClass(standardClass); + return fileSplitItemsEOService.importSplitItems(file, cut, menuId, infoId, sarFileSplitInfoEO); } @ApiOperation(value = "标准拆分条款信息-导出") diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java index d6600671..7b9bd629 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java +++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java @@ -151,7 +151,7 @@ public class SarFileSplitInfoEO implements Serializable { @TableField(exist = false) private String ids; /** - * 标准类别 （数据字典 海外标准法规：standard_type_overseas 国内标准法规：standard_type） (全部传空) + * 标准类别 */ @ApiModelProperty(value = "标准类别") @TableField(exist = false) diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java b/laws-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java index c04a5226..c51859d0 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java @@ -52,9 +52,9 @@ public interface IFileSplitItemsEOService extends IService int batchSet(Map parameter); - Result importSplitItemsData(List> list, String menuId, String filepath, String infoId, String cut, List getSheetTableList); + Result importSplitItemsData(List> list, String menuId, String filepath, String infoId, String cut, List getSheetTableList, SarFileSplitInfoEO sarFileSplitInfoEO); - Result importSplitItems(MultipartFile file, String cut, String menuId, String infoId) throws IOException; + Result importSplitItems(MultipartFile file, String cut, String menuId, String infoId, SarFileSplitInfoEO sarFileSplitInfoEO) throws IOException; Result importSplitResult(String splitFileId, String cut, SarFileSplitInfoEO sarFileSplitInfoEO) throws IOException; diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index cdd3505c..0a5059ce 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -42,6 +42,7 @@ import com.jero.modules.split.dto.FileSplitValExportDto; import com.jero.modules.split.dto.FileSplitValImgExportDto; import com.jero.modules.split.entity.*; import com.jero.modules.split.enums.SplitEnum; +import com.jero.modules.split.enums.SplitFileTypeTypeEnum; import com.jero.modules.split.mapper.FileSplitItemsEOMapper; import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper; import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper; @@ -1373,7 +1374,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl getSheetTableList) { + List getSheetTableList, SarFileSplitInfoEO sarFileSplitInfoEO) { //此处需要做各种验证，数据库操作 try { // 查询全部字段列表 @@ -1702,9 +1703,13 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl menuAndItemMap = new HashMap<>(); // if(CollectionUtils.isNotEmpty(itemNumList)) { + List treeList = new ArrayList<>(); List> itemsEOList = new ArrayList<>(addItemsEOList); - List treeList = buildTree(itemsEOList, treeListDisplay, menuId); - + if (SplitFileTypeTypeEnum.UN.getValue().equals(sarFileSplitInfoEO.getStandardClass())){ + treeList = buildTree2(itemsEOList, treeListDisplay, menuId); + }else { + treeList = buildTree(itemsEOList, treeListDisplay, menuId); + } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = sysUser.getId(); for (SarFileSplitMenuTreeNode treeNode : treeList) { @@ -1778,7 +1783,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl importSplitItems(MultipartFile file, String cut, String menuId, String infoId) throws IOException { + public Result importSplitItems(MultipartFile file, String cut, String menuId, String infoId, SarFileSplitInfoEO sarFileSplitInfoEO) throws IOException { // 水平越权 documentSplitService.isHorizontalOverstep(infoId); @@ -1891,7 +1896,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl message = importSplitItemsData(datasUpdate,menuId,unzipfilepath,infoId,cut,getSheetTableList); + Result message = importSplitItemsData(datasUpdate,menuId,unzipfilepath,infoId,cut,getSheetTableList, sarFileSplitInfoEO); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); return message; @@ -2021,7 +2026,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl result = importSplitItems(mFile, cut, menuId, infoId); + Result result = importSplitItems(mFile, cut, menuId, infoId, sarFileSplitInfoEO); if(!result.isSuccess()){ sarFileSplitInfoService.deleteById(infoId);