From 1e541da4c1984159f7b03a6dac8a23444e1d80b3 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 1 Mar 2022 17:13:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=B8=AD=E5=AF=B9=E5=BA=94=E6=A0=87=E5=87=86=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 224 ++++++++++-------- 1 file changed, 122 insertions(+), 102 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index d8e5a7e13..fc4ad7d23 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -21,7 +21,6 @@ import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.log.entity.BussLogEO; import com.jero.modules.log.service.IBussLogEOService; -import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; @@ -236,7 +235,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getAddForm(String flag, String cut,String type) { + public List> getAddForm(String flag, String cut, String type) { OnlCgformArea onlCgformArea = new OnlCgformArea(); onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //区域管理 @@ -246,12 +245,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl表单是否显示0否 1是) - if("add".equals(type)){ + if ("add".equals(type)) { //新增时,被代替标准在表单中不显示 fieldList = fieldList.stream() .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) && !e.getDbFieldName().equals("replaced_standard")) .collect(Collectors.toList()); - }else{ + } else { fieldList = fieldList.stream() .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))) .collect(Collectors.toList()); @@ -261,9 +260,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> result = new ArrayList<>(); for (OnlCgformArea onlCgformAreaTemp : areaList) { String areaName = ""; - if(CutEnum.CN.getValue().equals(cut)){ + if (CutEnum.CN.getValue().equals(cut)) { areaName = onlCgformAreaTemp.getShowArea(); - }else{ + } else { areaName = onlCgformAreaTemp.getEnName(); } List fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); @@ -289,34 +288,46 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); - //处理被代替标准 //查询所有 List> mapList = bussDocumentLibraryEOMapper.selectMaps(null); + //对应标准id + String correspondingStandard = (String) dataList.get(0).get("corresponding_standard"); + //处理被代替标准和对应标准 List replaceStandardNameList = new ArrayList<>(); + List correspondingStandardNameList = new ArrayList<>(); for (Map map : mapList) { + //对应标准处理 + if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) { + correspondingStandardNameList.add((String) map.get("serial_number")); + } //代替标准 String replaceStandard = (String) map.get("replace_standard"); - if(StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)){ + if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) { String serialNumber = (String) map.get("serial_number"); replaceStandardNameList.add(serialNumber); } } - if(replaceStandardNameList.size() != 0){ - dataList.get(0).put("replaced_standard",StringUtils.join(replaceStandardNameList,",")); + //对应标准中文 + if (correspondingStandardNameList.size() != 0) { + dataList.get(0).put("corresponding_standard", StringUtils.join(correspondingStandardNameList, ",")); + dataList.get(0).put("corresponding_standard_id", correspondingStandard); + } + if (replaceStandardNameList.size() != 0) { + dataList.get(0).put("replaced_standard", StringUtils.join(replaceStandardNameList, ",")); } //代替标准中文 String replaceStandard = (String) dataList.get(0).get("replace_standard"); - if(StringUtils.isNotBlank(replaceStandard)){ + if (StringUtils.isNotBlank(replaceStandard)) { LambdaQueryWrapper queryWrapperTemp = new LambdaQueryWrapper<>(); queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(","))); List> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp); - if(dataListTemp.size()!= 0){ + if (dataListTemp.size() != 0) { List replaceStandardListNew = new ArrayList<>(); for (Map map : dataListTemp) { replaceStandardListNew.add((String) map.get("serial_number")); } - dataList.get(0).put("replace_standard",StringUtils.join(replaceStandardListNew,",")); - dataList.get(0).put("replace_standard_id",replaceStandard); + dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardListNew, ",")); + dataList.get(0).put("replace_standard_id", replaceStandard); } } return dataList; @@ -417,9 +428,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl { if (onlCgformField.getDbFieldName().equals(entry.getKey())) { - if(onlCgformField.getDbFieldName().equals("replaced_standard")){ - map.put("value", StringUtils.join(replaceStandardNameList,",")); - }else{ + if (onlCgformField.getDbFieldName().equals("replaced_standard")) { + map.put("value", StringUtils.join(replaceStandardNameList, ",")); + } else { map.put("value", entry.getValue()); } } @@ -459,14 +470,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map) { - if(ObjectUtils.isNotEmpty(map.get("replace_standard_id"))){ - map.put("replace_standard",map.get("replace_standard_id")); + if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) { + map.put("replace_standard", map.get("replace_standard_id")); + } + if (ObjectUtils.isNotEmpty(map.get("corresponding_standard"))) { + map.put("corresponding_standard", map.get("corresponding_standard_id")); } //代替标准不为空,需要向被替代标准的法规工程师发送站内通知和飞书信息，提醒内容："新标准编号"已实施，请注意更新“替代标准编号”状态 map.remove("cut"); map.remove("replace_standard_id"); + map.remove("corresponding_standard_id"); //字段属性 List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //时间类型字段 @@ -532,11 +547,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map) { - if(ObjectUtils.isNotEmpty(map.get("replace_standard_id"))){ - map.put("replace_standard",map.get("replace_standard_id")); + if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) { + map.put("replace_standard", map.get("replace_standard_id")); + } + if (ObjectUtils.isNotEmpty(map.get("corresponding_standard_id"))) { + map.put("corresponding_standard", map.get("corresponding_standard_id")); } map.remove("cut"); map.remove("replace_standard_id"); + map.remove("corresponding_standard_id"); //字段属性 List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //时间类型字段 @@ -609,9 +628,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : parameter.entrySet()) { String key = entry.getKey(); - if(!"pageNo".equals(key) && !"pageSize".equals(key)){ + if (!"pageNo".equals(key) && !"pageSize".equals(key)) { String value = (String) entry.getValue(); if (StringUtils.isNotBlank(value)) { for (Map map : mapList) { @@ -1564,7 +1583,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl getWorkbookTitle(String cut) { - List> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut,"add"); + List> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut, "add"); StringBuilder sb = new StringBuilder(); List pullMoreList = new LinkedList<>();//多选字段 List pullSingleList = new LinkedList<>();//单选字段 @@ -1681,6 +1700,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getHeaderOrConditionForOcr(String flag, String cut) { List> list = new ArrayList<>(); - Map map1 = new HashMap<>(); - Map map2 = new HashMap<>(); - Map map3 = new HashMap<>(); - Map map4 = new HashMap<>(); - Map map5 = new HashMap<>(); + Map map1 = new HashMap<>(); + Map map2 = new HashMap<>(); + Map map3 = new HashMap<>(); + Map map4 = new HashMap<>(); + Map map5 = new HashMap<>(); - if("header".equals(flag)) { - if (CutEnum.CN.getValue().equals(cut)) { - //编号 - map1.put("db_field_name", "serial_number");//字段 - map1.put("db_field_txt", "编号");//字段中文名 - list.add(map1); - //标题 - map2.put("db_field_name", "title");//字段 - map2.put("db_field_txt", "标题");//字段中文名 - list.add(map2); - //状态 - map3.put("db_field_name", "state");//字段 - map3.put("db_field_txt", "状态");//字段中文名 - list.add(map3); - //文件名称 - map4.put("db_field_name", "file_name");//字段 - map4.put("db_field_txt", "文件名称");//字段中文名 - list.add(map4); - //文件信息 - map5.put("db_field_name", "text_info");//字段 - map5.put("db_field_txt", "文件信息");//字段中文名 - list.add(map5); - } else { - //编号 - map1.put("db_field_name", "serial_number");//字段 - map1.put("db_field_txt", "serial number");//字段中文名 - list.add(map1); - //标题 - map2.put("db_field_name", "title");//字段 - map2.put("db_field_txt", "title");//字段中文名 - list.add(map2); - //状态 - map3.put("db_field_name", "state");//字段 - map3.put("db_field_txt", "state");//字段中文名 - list.add(map3); - //文件名称 - map4.put("db_field_name", "file_name");//字段 - map4.put("db_field_txt", "file name");//字段中文名 - list.add(map4); - //文件信息 - map5.put("db_field_name", "text_info");//字段 - map5.put("db_field_txt", "text info");//字段中文名 - list.add(map5); - } - }else if("condition".equals(flag)) { - if (CutEnum.CN.getValue().equals(cut)) { - //编号 - map1.put("db_field_name", "serial_number");//字段 - map1.put("db_field_txt", "编号");//字段中文名 - map1.put("dict_field", "");//数据字典 - map1.put("field_show_type", "1"); - list.add(map1); - //标题 - map2.put("db_field_name", "title");//字段 - map2.put("db_field_txt", "标题");//字段中文名 - map2.put("dict_field", "");//数据字典 - map2.put("field_show_type", "1"); - list.add(map2); - } else { - //编号 - map1.put("db_field_name", "serial_number");//字段 - map1.put("db_field_txt", "serial number");//字段中文名 - map1.put("dict_field", "");//数据字典 - map1.put("field_show_type", "1"); - list.add(map1); - //标题 - map2.put("db_field_name", "title");//字段 - map2.put("db_field_txt", "title");//字段中文名 - map2.put("dict_field", "");//数据字典 - map2.put("field_show_type", "1"); - list.add(map2); - } + if ("header".equals(flag)) { + if (CutEnum.CN.getValue().equals(cut)) { + //编号 + map1.put("db_field_name", "serial_number");//字段 + map1.put("db_field_txt", "编号");//字段中文名 + list.add(map1); + //标题 + map2.put("db_field_name", "title");//字段 + map2.put("db_field_txt", "标题");//字段中文名 + list.add(map2); + //状态 + map3.put("db_field_name", "state");//字段 + map3.put("db_field_txt", "状态");//字段中文名 + list.add(map3); + //文件名称 + map4.put("db_field_name", "file_name");//字段 + map4.put("db_field_txt", "文件名称");//字段中文名 + list.add(map4); + //文件信息 + map5.put("db_field_name", "text_info");//字段 + map5.put("db_field_txt", "文件信息");//字段中文名 + list.add(map5); + } else { + //编号 + map1.put("db_field_name", "serial_number");//字段 + map1.put("db_field_txt", "serial number");//字段中文名 + list.add(map1); + //标题 + map2.put("db_field_name", "title");//字段 + map2.put("db_field_txt", "title");//字段中文名 + list.add(map2); + //状态 + map3.put("db_field_name", "state");//字段 + map3.put("db_field_txt", "state");//字段中文名 + list.add(map3); + //文件名称 + map4.put("db_field_name", "file_name");//字段 + map4.put("db_field_txt", "file name");//字段中文名 + list.add(map4); + //文件信息 + map5.put("db_field_name", "text_info");//字段 + map5.put("db_field_txt", "text info");//字段中文名 + list.add(map5); } + } else if ("condition".equals(flag)) { + if (CutEnum.CN.getValue().equals(cut)) { + //编号 + map1.put("db_field_name", "serial_number");//字段 + map1.put("db_field_txt", "编号");//字段中文名 + map1.put("dict_field", "");//数据字典 + map1.put("field_show_type", "1"); + list.add(map1); + //标题 + map2.put("db_field_name", "title");//字段 + map2.put("db_field_txt", "标题");//字段中文名 + map2.put("dict_field", "");//数据字典 + map2.put("field_show_type", "1"); + list.add(map2); + } else { + //编号 + map1.put("db_field_name", "serial_number");//字段 + map1.put("db_field_txt", "serial number");//字段中文名 + map1.put("dict_field", "");//数据字典 + map1.put("field_show_type", "1"); + list.add(map1); + //标题 + map2.put("db_field_name", "title");//字段 + map2.put("db_field_txt", "title");//字段中文名 + map2.put("dict_field", "");//数据字典 + map2.put("field_show_type", "1"); + list.add(map2); + } + } return list; } }