From e214d98d161febeb885279e46fab307499fe5765 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 1 Mar 2022 14:24:34 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 15 ++++++++++++++- jero-web/src/common/lang/zh-cn.js | 14 ++++++++++++++ .../src/components/Standardselection/index.vue | 6 +++--- jero-web/src/components/addForm/index.vue | 2 +- .../src/components/dict/JDictSelectTag.vue | 4 ++-- .../src/components/dict/JMultiSelectTag.vue | 10 +++++----- .../src/components/libraryAddForm/index.vue | 4 ++-- jero-web/src/components/search/index.vue | 2 +- jero-web/src/components/tableDate/index.vue | 8 ++++---- jero-web/src/components/uploadFile/file.vue | 4 ++-- .../src/views/documentManage/library/index.vue | 18 +++++++++--------- .../documentManage/library/modules/addForm.vue | 4 ++-- 12 files changed, 59 insertions(+), 32 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 189827cb1..7b67fcac7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -361,5 +361,18 @@ 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 ? ', } \ 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..592e35521 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -365,4 +365,18 @@ module.exports = { BatchCancellation:'批量取消', enterMenuEnName:'请输入菜单英文名称', MenuEnName:'菜单英文名称', + clickUpload:'点击上传', + viewUploadedFiles:'查看已上传文件', + standardSelection:'标准选择', + Collection:'收藏', + CancelCollection:'取消收藏', + deleteLib:'删除', + subscribe:'订阅', + CancelSubscribe:'取消订阅', + ConfirmCollection:'确定收藏？', + cancelConfirmCollection:'确定取消收藏？', + ConfirmSubscribe:'确定订阅?', + cancelConfirmSubscribe:'确定取消订阅?', + ConfirmDelete:'确定删除?', + ConfirmBatchDeletion:'确定批量删除？', } \ 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..863e55918 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -9,11 +9,11 @@ - 标准选择 + {{this.$t('standardSelection')}} {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' || - formInline[item.db_field_name] == null) ? '点击上传' : '查看已上传文件' + formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue index 0c991d188..ebd996ede 100644 --- a/jero-web/src/components/dict/JDictSelectTag.vue +++ b/jero-web/src/components/dict/JDictSelectTag.vue @@ -69,10 +69,10 @@ methods: { initDictData() { //优先从缓存中读取字典配置 - if(getDictItemsFromCache(this.dictCode)){ +/* if(getDictItemsFromCache(this.dictCode)){ this.dictOptions = getDictItemsFromCache(this.dictCode); return - } + }*/ //根据字典Code, 初始化字典数组 ajaxGetDictItems(this.dictCode, null).then((res) => { diff --git a/jero-web/src/components/dict/JMultiSelectTag.vue b/jero-web/src/components/dict/JMultiSelectTag.vue index 66f9ba9dd..16d05aec8 100644 --- a/jero-web/src/components/dict/JMultiSelectTag.vue +++ b/jero-web/src/components/dict/JMultiSelectTag.vue @@ -88,11 +88,11 @@ this.dictOptions = [...this.options] }else{ //优先从缓存中读取字典配置 - let cacheOption = getDictItemsFromCache(this.dictCode) - if(cacheOption && cacheOption.length>0){ - this.dictOptions = cacheOption - return - } + // let cacheOption = getDictItemsFromCache(this.dictCode) + // if(cacheOption && cacheOption.length>0){ + // this.dictOptions = cacheOption + // return + // } //根据字典Code, 初始化字典数组 ajaxGetDictItems(this.dictCode, null).then((res) => { if (res.success) { diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 777c291e8..068d1bcd9 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -112,7 +112,7 @@ {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' || - formInline[item.db_field_name] == null) ? '点击上传' : '查看已上传文件' + formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -590,7 +590,7 @@ .button-text { height: 38px; - width: calc(100% - 120px); + width: calc(100% - 100px); line-height: 38px; background: #fff; border: 1px #00B3BE solid; diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 34a68b282..e9bcba633 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -53,7 +53,7 @@ - + {{$t('query')}} {{$t('reset')}} diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 75953d36a..293cd1f5e 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}} 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/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) From f013bc065e7a975bd7a7df7cd185ec6a7635b41c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 1 Mar 2022 14:25:55 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableDate/index.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 293cd1f5e..2dbc052af 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -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 { From 4f0f83e87ea8efdf81ecb7cc64b839084482ae16 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Tue, 1 Mar 2022 14:45:29 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysDictController.java | 31 +++++++------------ .../controller/SysDictItemController.java | 7 +++-- .../modules/system/entity/SysCategory.java | 2 +- 3 files changed, 16 insertions(+), 24 deletions(-) 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..5f0872c06 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) From f3dd356fc965830461a072cb8c81b6e3e06ccd1c Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Tue, 1 Mar 2022 15:17:31 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/system/entity/SysCategory.java | 2 +- .../src/main/java/com/jero/modules/system/entity/SysDict.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 5f0872c06..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 @@ -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; /** From ace2989e516a5910e5aabd1b9be0088e54359eb7 Mon Sep 17 00:00:00 2001 From: caoyang Date: Tue, 1 Mar 2022 15:47:04 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCategoryController.java | 2 +- .../documentManage/ocr/modules/docTable.vue | 109 ++++++++++++------ .../documentManage/tags/dialog/dicList.vue | 71 ++++++++---- 3 files changed, 123 insertions(+), 59 deletions(-) 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-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 @@ 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/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 6f6b61716..34a0e998f 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -38,13 +38,13 @@
- - - + + + - - - + + +
@@ -585,6 +585,7 @@ position: relative; padding: 26px 0 22px 0; box-sizing: border-box; + .search-text-title { padding: 0 0 22px 0; @@ -635,7 +636,7 @@ .search-text-list { ul { - padding:0 0 0 18px; + padding: 0 0 0 18px; margin: 0; li { @@ -695,9 +696,10 @@ box-sizing: border-box; margin-left: 38px; } - .text-right-right{ + + .text-right-right { border-left: 2px solid #E6E7EC; - padding: 24px 0 24px 24px!important; + padding: 24px 0 24px 24px !important; box-sizing: border-box; } \ No newline at end of file From 54494bb39958585da5a1edd95fa7f7f6a0adf7d0 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 1 Mar 2022 16:33:32 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/Standardselection/index.vue | 10 ++++------ jero-web/src/components/libraryAddForm/index.vue | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index 951eccf69..7daf147bf 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -60,7 +60,7 @@ components: { currencySearch }, - props: ['query', 'value', 'replace_standard_id'], + props: ['query', 'value', 'standard'], computed: { isDisabled() { if (this.query.db_field_name === 'replaced_standard') { @@ -110,7 +110,7 @@ standardClick() { this.visible = true this.queryParam = {} - this.replacePage(this.replace_standard_id) + this.replacePage() }, replacePage() { let query = { @@ -125,9 +125,7 @@ if (res.success) { this.dataList = res.result.records this.total = res.result.total - if (this.replace_standard_id) { - this.selectedRowKeys = this.replace_standard_id.split(',') - } + this.selectedRowKeys = this.standard[this.query.db_field_name + '_id'] ? this.standard[this.query.db_field_name + '_id'].split(',') : [] } else { this.dataList = [] } @@ -144,7 +142,7 @@ replace_standard_id.push(res.id) }) this.$emit('input', content.join(',')) - this.$emit('change', replace_standard_id.join(',')) + this.$emit('change',this.query.db_field_name,replace_standard_id.join(',')) this.visible = false }, indexclick(event) { diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 2e8393dc5..e5e50e971 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -158,7 +158,7 @@
@@ -486,8 +486,8 @@ this.type = 'add' this.getForm() }, - StandardselectionChange(id) { - this.formInline.replace_standard_id = id + StandardselectionChange(value, id) { + this.formInline[value + '_id'] = id } } } From 7416239a0781cbd1614f862e647e58466955110e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 1 Mar 2022 16:42:31 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=A1=A8=E5=8D=95=E4=B8=AD=E7=A7=BB=E5=87=BA=E8=A2=AB?= =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOController.java | 5 +++-- .../service/IBussDocumentLibraryEOService.java | 2 +- .../impl/BussDocumentLibraryEOServiceImpl.java | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) 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/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 6394e4b7d..d8e5a7e13 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 @@ -236,7 +236,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,7 +246,17 @@ 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) { @@ -1554,7 +1564,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<>();//单选字段 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 10/10] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=B8=AD=E5=AF=B9=E5=BA=94=E6=A0=87=E5=87=86=E5=A4=84?= =?UTF-8?q?=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; } }