diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index d75163837..12e9c089c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -57,7 +57,7 @@ public class SysCategoryController { * @param req * @return */ - @RequiresPermissions("sys:category:list") +// @RequiresPermissions("sys:category:list") @GetMapping(value = "/rootList") public Result> queryPageList(SysCategory sysCategory, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 7f1704646..585aa4081 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -343,11 +343,7 @@ public class SysDictController { public Result add(@RequestBody SysDict sysDict) { Result result = new Result(); try { - Integer count=sysDictService.queryExitData(sysDict); - if (count > 0) { - sysDict.setDelFlag(0); - } else { - if(StringUtils.isEmpty(sysDict.getDictCode())){ + if(StringUtils.isEmpty(sysDict.getDictName())){ sysDict.setDictCode(sysDict.getDictName()); }else { sysDict.setCreateTime(new Date()); @@ -358,7 +354,7 @@ public class SysDictController { //添加成功后需要刷新缓存 sysDictService.refreshCache(); } - } + } catch (Exception e) { log.error(e.getMessage(),e); result.error500("操作失败"); @@ -381,22 +377,17 @@ public class SysDictController { result.error500("未找到对应实体"); }else { if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) { - /*if (sysDict.getIsReadOnly() == 1) { + if (sysDict.getIsReadOnly() == 1) { result.error500("固定字段,不可删除"); - }else{*/ - /*if(sysDict.getIsTagDict() == 1) { - sysDict.setDictEnName(sysDict.getDictCode().replace("_", " ")); + }else{ + sysDict.setUpdateTime(new Date()); + boolean ok = sysDictService.updateById(sysDict); + if (ok) { + result.success("编辑成功!"); + //编辑成功后需要刷新缓存 + sysDictService.refreshCache(); } - else {*/ - sysDict.setUpdateTime(new Date()); - boolean ok = sysDictService.updateById(sysDict); - if (ok) { - result.success("编辑成功!"); - //编辑成功后需要刷新缓存 - sysDictService.refreshCache(); - } - //} - // } + } } } return result; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 25513d70b..127cd74a8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.constant.CacheConstant; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.enums.FixedFieldEnum; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; import io.swagger.annotations.ApiOperation; @@ -97,7 +98,7 @@ public class SysDictItemController { result.error500("未找到对应实体"); } else { if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(sysDictItem.getIsReadOnly()))) { - if (sysDictItem.getIsReadOnly() == 1) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDictItem.getIsReadOnly())) { result.error500("固定字段,不可删除"); } else { sysDictItem.setUpdateTime(new Date()); @@ -128,7 +129,7 @@ public class SysDictItemController { result.error500("未找到对应实体"); }else { if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(joinSystem.getIsReadOnly()))) { - if (joinSystem.getIsReadOnly() == 1) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(joinSystem.getIsReadOnly())) { result.error500("固定字段,不可删除"); } else { @@ -159,7 +160,7 @@ public class SysDictItemController { } else { if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(sysDictItem.getIsReadOnly()))) { - if (sysDictItem.getIsReadOnly() == 1) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDictItem.getIsReadOnly())) { result.error500("固定字段,不可删除"); } else { this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java index d7b913b18..1b85303bb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java @@ -61,7 +61,7 @@ public class SysCategory implements Serializable,Comparable{ @Excel(name = "数据字典id", width = 15) @Dict(dictTable = "sys_dict", dicText = "id", dicCode = "id") @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") - private java.lang.Integer sysDictId; + private java.lang.String sysDictId; /**是否有子节点*/ @Excel(name = "是否有子节点(1:有)", width = 15) @@ -76,7 +76,7 @@ public class SysCategory implements Serializable,Comparable{ private java.lang.String description; /**是否为标签内容-数据字典（1是 0否）*/ - @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) + @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15, dicText = "is_tag_dict", dicCode = "is_tag_dict") @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict") @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") private java.lang.Integer isTagDict; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java index 7066fc941..914d8f508 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java @@ -91,7 +91,8 @@ public class SysDict implements Serializable { /** * 是否为标签内容-数据字典（1是 0否） */ - @Excel(name = "是否为标签内容", width = 15) + @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15, dicText = "is_tag_dict", dicCode = "is_tag_dict") + @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict") private java.lang.Integer isTagDict; /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index a86032ff2..77b53c2e6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -251,8 +251,9 @@ public class BussDocumentLibraryEOController extends JeroController>> getAddForm(@RequestParam(name="flag",required=true) String flag, - @RequestParam(name="cut",required=true) String cut) { - List> list = bussDocumentLibraryEOService.getAddForm(flag,cut); + @RequestParam(name="cut",required=true) String cut, + @RequestParam(name="type",required=true) String type) { + List> list = bussDocumentLibraryEOService.getAddForm(flag,cut,type); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java index ef68fc2f9..06ace19ea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java @@ -68,4 +68,14 @@ public interface BussDocumentLibraryEOMapper extends BaseMapper> getInfoListByReplaceStandard(@Param("replaceStandard") String replaceStandard); + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml index 2c1d2d55a..8ddc33411 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml @@ -59,5 +59,16 @@ select ${field} ${condition} + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index c2f13629b..66e283a15 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -68,7 +68,7 @@ public interface IBussDocumentLibraryEOService extends IService> getAddForm(String flag,String cut); + List> getAddForm(String flag,String cut,String type); /** * 编辑数据查询 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 63a63d7fd..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) { + public List> getAddForm(String flag, String cut, String type) { OnlCgformArea onlCgformArea = new OnlCgformArea(); onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //区域管理 @@ -246,14 +245,24 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl表单是否显示0否 1是) - fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); + 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 { + fieldList = fieldList.stream() + .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))) + .collect(Collectors.toList()); + } + } List> 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()); @@ -279,6 +288,48 @@ 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)) { + String serialNumber = (String) map.get("serial_number"); + replaceStandardNameList.add(serialNumber); + } + } + //对应标准中文 + 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)) { + LambdaQueryWrapper queryWrapperTemp = new LambdaQueryWrapper<>(); + queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(","))); + List> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp); + 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); + } + } return dataList; } @@ -290,6 +341,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getInfoById(String id, String cut) { + //处理被代替标准 + //根据代替标准查询被代替标准集合 + List> replaceStandardList = bussDocumentLibraryEOMapper.getInfoListByReplaceStandard(id); + List replaceStandardNameList = new ArrayList<>(); + for (Map map : replaceStandardList) { + String serialNumber = (String) map.get("serial_number"); + replaceStandardNameList.add(serialNumber); + } //区域管理 List areaList = onlCgformAreaServiceImpl.queryList(new OnlCgformArea()); //字段属性 @@ -369,7 +428,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl { if (onlCgformField.getDbFieldName().equals(entry.getKey())) { - map.put("value", entry.getValue()); + if (onlCgformField.getDbFieldName().equals("replaced_standard")) { + map.put("value", StringUtils.join(replaceStandardNameList, ",")); + } else { + map.put("value", entry.getValue()); + } } }); } @@ -407,9 +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("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()); //时间类型字段 @@ -475,8 +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("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()); //时间类型字段 @@ -548,7 +627,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : parameter.entrySet()) { String key = entry.getKey(); - String value = (String) entry.getValue(); - if (StringUtils.isNotBlank(value)) { - for (Map map : mapList) { - String fieldName = (String) map.get("db_field_name");//字段 - if (key.equals(fieldName)) { - //字段类型(判断是输入框还是下拉,等等) - String fieldType = (String) map.get("field_show_type");//字段类型 - if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldType)) { - //输入框 - conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')"); - } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType) - || FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)) { - StringBuilder valueSb = new StringBuilder(); - for (String valueTemp : value.split(",")) { - valueSb.append("'" + valueTemp + "',"); - } - String substring = valueSb.substring(0, valueSb.length() - 1); - //下拉单选或下拉多选 - conditionSb.append(" and " + key + " in(" + substring + ")"); + if (!"pageNo".equals(key) && !"pageSize".equals(key)) { + String value = (String) entry.getValue(); + if (StringUtils.isNotBlank(value)) { + for (Map map : mapList) { + String fieldName = (String) map.get("db_field_name");//字段 + if (key.equals(fieldName)) { + //字段类型(判断是输入框还是下拉,等等) + String fieldType = (String) map.get("field_show_type");//字段类型 + if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldType)) { + //输入框 + conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')"); + } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType) + || FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)) { + StringBuilder valueSb = new StringBuilder(); + for (String valueTemp : value.split(",")) { + valueSb.append("'" + valueTemp + "',"); + } + String substring = valueSb.substring(0, valueSb.length() - 1); + //下拉单选或下拉多选 + conditionSb.append(" and " + key + " in(" + substring + ")"); - } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldType)) { - //日期(区分单日期还时间范围) - if (value.contains(",")) { - conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'" - + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); - } else { - conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'"); + } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldType)) { + //日期(区分单日期还时间范围) + if (value.contains(",")) { + conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'" + + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); + } else { + conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'"); + } } } } } } + } //处理列表表头排序 if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) { @@ -1496,7 +1583,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl getWorkbookTitle(String cut) { - List> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut); + List> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut, "add"); StringBuilder sb = new StringBuilder(); List pullMoreList = new LinkedList<>();//多选字段 List pullSingleList = new LinkedList<>();//单选字段 @@ -1613,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; } } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 189827cb1..2f1865a5b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -361,5 +361,29 @@ module.exports = { BatchCancel:'Batch cancel collection', SubscriptionManagement:'Subscription domain management', BatchCancellation:'Batch cancellation', - + clickUpload:'Click upload', + viewUploadedFiles:'View uploaded files', + standardSelection:'Standard selection', + Collection:'Collection', + CancelCollection:'Cancel collection', + deleteLib:'delete', + subscribe:'Subscribe', + CancelSubscribe:'Cancel Subscribe', + ConfirmCollection:'Confirm collection ?', + cancelConfirmCollection:'Are you sure you want to cancel the collection', + ConfirmSubscribe:'Confirm Subscribe ?', + cancelConfirmSubscribe:'Are you sure you want to cancel the subscribe', + ConfirmDelete:'Confirm Delete ?', + ConfirmBatchDeletion:'Confirm Batch Deletion ? ', + download:'download', + UpdateLog:'update log', + DocumentSplitting:'Document splitting', + DocumentTranslation:'Document translation', + DocumentComparison:'Document comparison', + KnowledgeDatabase:'Knowledge Q & a database', + StandardDetails:'Standard details', + whole:'whole', + DocumentLibrary:'Document Library', + DocumentComparisonLibrary:'Document comparison Library', + weekly:'weekly', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 8922f5048..6d6ce92cf 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -365,4 +365,29 @@ module.exports = { BatchCancellation:'批量取消', enterMenuEnName:'请输入菜单英文名称', MenuEnName:'菜单英文名称', + clickUpload:'点击上传', + viewUploadedFiles:'查看已上传文件', + standardSelection:'标准选择', + Collection:'收藏', + CancelCollection:'取消收藏', + deleteLib:'删除', + subscribe:'订阅', + CancelSubscribe:'取消订阅', + ConfirmCollection:'确定收藏？', + cancelConfirmCollection:'确定取消收藏？', + ConfirmSubscribe:'确定订阅?', + cancelConfirmSubscribe:'确定取消订阅?', + ConfirmDelete:'确定删除?', + ConfirmBatchDeletion:'确定批量删除？', + download:'下载', + UpdateLog:'更新log', + DocumentSplitting:'文档拆分', + DocumentTranslation:'文档翻译', + DocumentComparison:'文档对比', + KnowledgeDatabase:'知识问答库', + StandardDetails:'标准详情', + whole:'全部', + DocumentLibrary:'文档库', + DocumentComparisonLibrary:'文档对比库', + weekly:'周报', } \ No newline at end of file diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index fbf24fdd7..7daf147bf 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -1,19 +1,15 @@ - + {{$t('query')}} {{$t('reset')}} diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 75953d36a..2dbc052af 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -15,11 +15,11 @@ - - {{!record.collectFlag || record.collectFlag == 0 ? '收藏' :'取消收藏'}} + + {{!record.collectFlag || record.collectFlag == 0 ? $t('Collection') :$t('CancelCollection')}} - - {{!record.subscribeFlag || record.subscribeFlag == 0 ? '订阅' :'取消订阅'}} + + {{!record.subscribeFlag || record.subscribeFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}} {{ol.text}} @@ -187,9 +187,6 @@ postAction(this.url.tableList, params).then((res) => { if (res.success) { this.dataSource = res.result.records - this.dataSource.forEach((val) => { - val.function_territory = val.function_territory + 'dsfsdfs 收到付款了山东黄搞定；分两个地方骨科大夫的咖啡馆里的法国金弗兰克是的积分流口水的房间的斯洛伐克第三方' - }) this.total = res.result.total this.loading = false } else { diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 5b0d8d09b..2e2f81ab2 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -14,7 +14,7 @@ :remove='remove' @change="handleChange">

-

点击上传

+

{{this.$t('clickUpload')}}

@@ -29,7 +29,7 @@ data(){ return{ visible:false, - title:'上传文件', + title:this.$t('clickUpload'), uploadAction:window._CONFIG['domianURL']+"/sys/common/upload", myuploadAction:window._CONFIG['domianURL']+this.thisFileUploadUrl, upDataList:[], diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 7e0d64fb3..b7aac6aa6 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -4,28 +4,28 @@
- {{this.$route.query.serial_number}} 《{{this.$route.query.title}}》 标准详情 + {{this.$route.query.serial_number}} 《{{this.$route.query.title}}》 {{$t('StandardDetails')}}
- 更新log + {{$t('UpdateLog')}}
- 文档拆分 + {{$t('DocumentSplitting')}}
- 文档翻译 + {{$t('DocumentTranslation')}}
- 文档对比 + {{$t('DocumentComparison')}}
- 知识问答库 + {{$t('KnowledgeDatabase')}}
@@ -34,13 +34,13 @@
{{val}}
-
+
{{ol.db_field_txt}} {{ol.value ? ol.value : '--'}}
-
+
{{ol.db_field_txt}} @@ -51,12 +51,12 @@ - 下载 + {{$t('download')}}
-
+
{{ol.db_field_txt}} @@ -347,7 +347,8 @@ font-weight: 400; text-align: center; } - .TextInformationContentcontentButton{ + + .TextInformationContentcontentButton { width: calc(100% - 268px); border-top: 1px #eff1f3 solid; border-left: 1px #eff1f3 solid; diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index 5cfa8d248..0f502c258 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -90,19 +90,19 @@ return { OperationList: [ { - text: '取消收藏', + text: this.$t('CancelCollection'), ClickEvent: 'Collection' }, { - text: '取消订阅', + text: this.$t('CancelSubscribe'), ClickEvent: 'subscribe' }, { - text: '编辑', + text: this.$t('edit'), ClickEvent: 'editTable' }, { - text: '删除', + text: this.$t('deleteLib'), ClickEvent: 'deleteTable' } ], @@ -146,7 +146,7 @@ let query = { ...this.$refs.searchRef.queryParam, id: this.idList.join(','), - flag:'file' + flag: 'file' } downloadFile('document/bussDocumentLibraryEO/exportZip', '文档库.zip', query, this.Deselect) }, @@ -163,7 +163,7 @@ if (this.idList.length > 0) { let _this = this this.$confirm({ - content: '确认删除？', + content: _this.$t('ConfirmBatchDeletion'), onOk() { deleteAction(_this.url.deleteBatch, { ids: _this.idList.join(',') }).then((res) => { if (res.success) { @@ -198,7 +198,7 @@ deleteTable(val) { let _this = this this.$confirm({ - content: '确认删除？', + content: _this.$t('ConfirmDelete'), onOk() { deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { if (res.success) { @@ -215,7 +215,7 @@ Collection(val) { let _this = this this.$confirm({ - content: val.collectFlag == 0 || !val.collectFlag ? '确认收藏？' : '确定取消收藏？', + content: val.collectFlag == 0 || !val.collectFlag ? _this.$t('ConfirmCollection') : _this.$t('cancelConfirmCollection'), onOk() { let url = '' if (val.collectFlag == 0 || !val.collectFlag) { @@ -238,7 +238,7 @@ subscribe(val) { let _this = this this.$confirm({ - content: val.subscribeFlag == 0 || !val.subscribeFlag ? '确认订阅？' : '确定取消订阅？', + content: val.subscribeFlag == 0 || !val.subscribeFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'), onOk() { let url = '' if (val.subscribeFlag == 0 || !val.subscribeFlag) { diff --git a/jero-web/src/views/documentManage/library/modules/addForm.vue b/jero-web/src/views/documentManage/library/modules/addForm.vue index 2dfafcea2..3e06a0394 100644 --- a/jero-web/src/views/documentManage/library/modules/addForm.vue +++ b/jero-web/src/views/documentManage/library/modules/addForm.vue @@ -59,14 +59,14 @@ this.visible = false }, add() { - this.title = '新增' + this.title = this.$t('add') this.visible = true this.$nextTick(() => { this.$refs.addFormDataRef.add() }) }, edit(item) { - this.title = '编辑' + this.title = this.$t('edit') this.visible = true this.$nextTick(() => { this.$refs.addFormDataRef.edit(item) diff --git a/jero-web/src/views/documentManage/ocr/modules/docTable.vue b/jero-web/src/views/documentManage/ocr/modules/docTable.vue index a372082c6..73178ff1c 100644 --- a/jero-web/src/views/documentManage/ocr/modules/docTable.vue +++ b/jero-web/src/views/documentManage/ocr/modules/docTable.vue @@ -4,7 +4,6 @@ class="doc-table-drawer" title="调取已入库文件" placement="right" - v-if="visible" :visible="visible" :after-visible-change="afterVisibleChange" @close="onClose" @@ -12,46 +11,54 @@ >
- - - - - - - - - - - - - - - {{$t('query')}} - 清空 - - - - + + + + + + + + + + + + + + + + + + + + +
- - - {{ (queryParams.pageNo-1)*queryParams.pageSize+Number(index)+1 }} - - -
- -
+
+ + + + + + + + + + + + + + + + +
导入 取消 @@ -62,8 +69,15 @@