From f3b123ac8113564f38620b616617bb09e36d3cd8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 16 Aug 2022 13:57:47 +0800 Subject: [PATCH 01/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardRelease.vue | 4 +++- .../components/initiatingProcess.vue | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 9a0bd9f7f..335d28489 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -235,6 +235,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, + createBy: this.userInfo().username, ...queryParam } this.loading = true @@ -476,7 +477,8 @@ .text-operation { margin-right: 8px; } - ::v-deep .ant-select-dropdown{ + + ::v-deep .ant-select-dropdown { z-index: 100; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index cb0b66ab6..d851a0ecf 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -44,8 +44,10 @@ {{$t('selectedStandard')}}
- {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber+' - '+selectedRowKeysRecord[0].title:''}} + {{selectedRowKeysRecord[0] ? + selectedRowKeysRecord[0].serialNumber+'-'+selectedRowKeysRecord[0].title:''}}
@@ -323,7 +325,7 @@ this.formInline.lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId this.formInline.remark = this.$route.query.remark this.formInline.standId = this.$route.query.standId - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } this.getListOne() } eventBUs.$on('searchQuery', search => { @@ -697,6 +699,9 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-word; + padding: 0 14px; + box-sizing: border-box; } .title-text-right { @@ -710,6 +715,9 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-word; + padding: 0 14px; + box-sizing: border-box; color: #21c9cc; cursor: pointer; } From 6f4cdc8cb09cfc6034a899be589d47963fb0f8d0 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 16 Aug 2022 14:03:27 +0800 Subject: [PATCH 02/94] =?UTF-8?q?57251=E3=80=8157319=E3=80=8157314=20?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0-?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B-=E5=B8=A6=E5=85=A5?= =?UTF-8?q?=E6=8B=86=E8=A7=A3=E5=8D=95=20=E5=AF=BC=E5=85=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOController.java | 3 +- .../ILawsTechnologyEvaluationEOService.java | 2 +- ...LawsTechnologyEvaluationEOServiceImpl.java | 113 +++++++++++++++++- 3 files changed, 113 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index 7ab5d17ce..9ca5ddf32 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -208,8 +208,7 @@ public class LawsTechnologyEvaluationEOController extends JeroController importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception { - List> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); - return Result.OK(result); + return this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); } @ApiOperation(value="根据id查询明细数据", notes="根据id查询明细数据") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index a0b58fab0..bac8a0c3c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -85,7 +85,7 @@ public interface ILawsTechnologyEvaluationEOService extends IService> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; + Result importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; List> queryPageDummyById(Map parameter); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index b02e02d74..98d18c7dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -356,7 +356,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception { + public Result importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception { //校验文件格式 int pos = file.getOriginalFilename().lastIndexOf("."); String fileSuffixStr = file.getOriginalFilename().substring(pos+1).toLowerCase(); @@ -406,6 +406,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> dataList,String cut){ + //存放数据验证结果信息 + List stringMessage = new ArrayList<>(); + + int i = 0; + + for (Map map : dataList) { + i++; + + int countError = 0; //记录失败数据数量 + String errorMsg = ""; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg = "第" + i + "行："; + }else{ + errorMsg = i + " line："; + } + + String itemNum = (String) map.get("itemNum"); + String itemName = (String) map.get("itemName"); + String itemContent = (String) map.get("itemContent"); + + if(StringUtils.isEmpty(itemNum)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款号不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item num cannot be empty;"; + } + countError++; + }else if(itemNum.length() > 100){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款号长度不能超过100;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item num length of the cannot exceed 100;"; + } + countError++; + } + + if(StringUtils.isEmpty(itemName)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款名称不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item name cannot be empty;"; + } + countError++; + }else if(itemName.length() > 100){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款名称长度不能超过100;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item name length of the cannot exceed 100;"; + } + countError++; + } + + if(StringUtils.isEmpty(itemContent)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款内容不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item Contents cannot be empty;"; + } + countError++; + }else if(itemContent.length() > 400){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款内容长度不能超过400;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item Contents length of the cannot exceed 400;"; + } + countError++; + } + + if (countError > 0) { + stringMessage.add(errorMsg); + } + } + + Map result = new HashMap(); + + if(CollectionUtils.isEmpty(dataList)){ + result.put("result", false); + String message = ""; + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + message = "不能导入空的模板，请检查！"; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + message = "Cannot import empty template, please check!"; + } + result.put("message", message); + }else if (stringMessage.isEmpty()) { + result.put("result", true); + result.put("resultList", dataList); + result.put("message", ""); + } else { + result.put("result", false); + String html = ""; + for (String message : stringMessage) { + html += message + "
"; + } + result.put("message", html); + } + return result; + } } From 8f1230375c82c627a4270420de757d2f402fd8b5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 16 Aug 2022 14:10:29 +0800 Subject: [PATCH 03/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardView.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 4c91a6b97..e7ecf4f4c 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -186,7 +186,6 @@ }) } if (content && content.length > 0) { - console.log(content) content.forEach((res, index) => { this.contentList[index + 1] = { name: res.lableName } this.contentList[index + 1].list = [] @@ -228,7 +227,15 @@ } postAction(this.list, query).then((res) => { if (res.success) { - this.queryCountryList = res.result || [] + this.queryCountryList = [] + applyMarkets.split(',').forEach(val => { + res.result.forEach(ol => { + if (val == ol.applyMarket) { + this.queryCountryList.push(ol) + } + }) + }) + // this.queryCountryList = res.result || [] this.isTrue = false this.$nextTick(() => { this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' @@ -350,13 +357,13 @@ border-bottom: 1px #d9d9d9 solid; .content-box-box-img { - width: 70%; + width: 238px; height: 100%; } .content-box-box-text { display: inline-block; - width: 30%; + width: calc(100% - 238px); text-align: center; font-size: 18px; font-weight: 500; @@ -380,13 +387,13 @@ cursor: pointer; .content-box-box-img { - width: 70%; + width: 238px; height: 100%; } .content-box-box-text { display: inline-block; - width: 30%; + width: calc(100% - 238px); text-align: center; font-size: 18px; font-weight: 500; From cf8134d1a85dbeff1d91a44591c3354216033efc Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 16 Aug 2022 14:25:13 +0800 Subject: [PATCH 04/94] =?UTF-8?q?57325=20=E6=B3=95=E8=A7=84=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E8=AF=84?= =?UTF-8?q?=E4=BC=B0-=E5=AF=BC=E5=85=A5=E6=9D=A1=E6=AC=BE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=85=A5=E6=95=B0=E5=AD=97=E5=B8=A6=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=E7=82=B9=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...LawsTechnologyEvaluationEOServiceImpl.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 98d18c7dc..044b7ccfd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -410,9 +410,31 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl itemInfoMap = new HashMap<>(); String itemId = UUID.randomUUID().toString().replace("-", ""); itemInfoMap.put("itemId",itemId); From 2303c5936b8c495297108d8778620af680b2121a Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 16 Aug 2022 14:29:08 +0800 Subject: [PATCH 05/94] =?UTF-8?q?57240=20=E6=8F=90=E7=A4=BA=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E4=B8=8A=E4=BC=A0=E9=9D=99=E6=80=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=96=87=E4=BB=B6=E8=8B=B1=E6=96=87=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=EF=BC=8C=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/oss/service/impl/OSSFileServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 6c249ec1e..a602b714c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -146,7 +146,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); } } } @@ -265,7 +265,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); } } } @@ -357,7 +357,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); } } } From 664fe351da8ed974ce89989edd4bb607366e4114 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 16 Aug 2022 15:28:15 +0800 Subject: [PATCH 06/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/documentTools/searchCenter/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 870631efb..6e409f186 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -257,6 +257,10 @@ width: 608px; display: inline-block; } + + ::v-deep .input-group .ant-select-selection--single { + height: 40px!important; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue new file mode 100644 index 000000000..85b4932ba --- /dev/null +++ b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue @@ -0,0 +1,278 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue new file mode 100644 index 000000000..448483f82 --- /dev/null +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -0,0 +1,546 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 6e409f186..8d6826fc5 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -23,7 +23,8 @@ v-model="selectValueTwo" :maxLength="100" @keyup.enter.native="wholeOnSearch(selectValueTwo)" - v-else-if="active === $t('whole')" + v-else-if="active === $t('whole') || active === $t('problemKnowledgeBase') + || active === $t('monthlyReportRegulations')" class="inputSearch" :placeholder="$t('pleaseEnter')+$t('searchContent')" > @@ -33,18 +34,21 @@ >{{$t('query')}} {{$t('query')}} {{$t('searchInResults')}} {{$t('reset')}} @@ -61,14 +65,18 @@ - - - + + + +
+ + @@ -78,13 +86,17 @@ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index bdaa64268..8ed494f25 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -20,7 +20,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 320px)'}" :data-source="dataSource" :columns="columns" > diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 2b3175a5f..ec476304d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -26,15 +26,15 @@
-
+
{{$t('classificationMaintenance')}}
-
+
{{$t('managePublishing')}}
-
+
{{$t('newlyAdded')}}
From c7350ea5094375ceb1d72f27ea907ed028cef8d6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 17 Aug 2022 16:31:40 +0800 Subject: [PATCH 34/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/search/index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 5a3608ddb..cf5a34acc 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -189,6 +189,14 @@ }, methods: { searchQuery() { + if (this.isDefault) { + let startTime = moment(new Date()).format('YYYY-MM-DD') + let endTime = this.haflYear() + if (this.queryParam['WarnTime'].length == 0) { + this.queryParam['WarnTime'] = [startTime, endTime] + } + this.queryParam = { ...this.queryParam } + } eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam))) }, searchReset() { From 6e84880174f50eaaec41f5b32259796f3166cb5b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Aug 2022 17:00:11 +0800 Subject: [PATCH 35/94] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6--6?= =?UTF-8?q?=E4=B8=AA=E6=9C=88=E5=92=8C12=E4=B8=AA=E6=9C=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=A2=9C=E8=89=B2=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/warn/service/LawsWarnService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 87662c695..9c43e54a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -144,10 +144,10 @@ public class LawsWarnService { String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if(newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)){ + if((newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)) || newCarTime.equals(beforeTimeSix)){ record.put("new_colour","red"); } - if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + if((newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)) || newCarTime.equals(beforeTimeTwelve)){ record.put("new_colour","yellow"); } } @@ -158,16 +158,16 @@ public class LawsWarnService { if(StringUtils.isNotBlank(implementTime) && !"null".equals(implementTime)){ try { if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 1){ - Date newCarTimeDate = sdf.parse(implementTime); + Date implementTimeDate = sdf.parse(implementTime); //当前时间的前6个月 String beforeTimeSix = beforeTime(6,new Date()); String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if(newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)){ + if((implementTimeDate.after(new Date()) && implementTimeDate.before(parseSix)) || implementTime.equals(beforeTimeSix)){ record.put("implement_colour","red"); } - if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + if((implementTimeDate.after(parseSix) && implementTimeDate.before(parseTwelve)) || implementTime.equals(beforeTimeTwelve)){ record.put("implement_colour","yellow"); } } From 7b1c3fc491a3398cb728e664c58df24f7e090fdc Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 17 Aug 2022 17:05:56 +0800 Subject: [PATCH 36/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 5 +++++ .../processCenter/components/evaluatorFeedbackList.vue | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 47b816081..b058c8943 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -587,7 +587,12 @@ ::v-deep .itemModel-explain .ant-form-explain { margin-top: 60px } + ::v-deep .ql-tooltip { z-index: 10 !important; } + + ::v-deep .ql-snow .ql-picker { + height: 36px; + } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 2f49be832..ae801d9a7 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -275,6 +275,12 @@ mounted() { if (this.evaluatorFeedbackList && this.evaluatorFeedbackList.length > 0) { this.dataSource = this.evaluatorFeedbackList + if (this.dataSource && this.dataSource.length == 1 && this.$route.query.taskDefinitionKey == 'pgrqr') { + this.$nextTick(() => { + let antTableBody = document.getElementsByClassName('ant-table-body') + antTableBody[0].style = 'position:auto' + }) + } if (this.$route.query.taskDefinitionKey != 'pgrqr') { this.dataSource.forEach(res => { res.sponsorFeedback = '' From 2ac56da6e96fe05eb45ea9061c3a55081dc05cbc Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 17 Aug 2022 17:27:30 +0800 Subject: [PATCH 37/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulationsKanban/components/addModel.vue | 83 ++++++++++++++----- 1 file changed, 63 insertions(+), 20 deletions(-) diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index f780a80e4..24ebea27a 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -11,28 +11,44 @@ > - - - - {{element.text}} - - - - - - - +
+
+ {{$t('areaOfResponsibility')}} +
+ + + + + {{element.text}} + + + + + + + +
+ - - - - {{element.projectName}} - - - +
+
+ {{$t('RelatedItems')}} +
+ + + + + {{element.projectName}} + + + +
+ {{ $t('query') }} @@ -321,6 +337,33 @@ export default { \ No newline at end of file From a72b7dafd4d8b37cbd99b19380c27ee8f122a4e9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 18 Aug 2022 10:25:33 +0800 Subject: [PATCH 43/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 2 +- .../src/views/regulationsKanban/components/addModel.vue | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index ab260fc29..d3f70cdd8 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -1085,7 +1085,7 @@ export default { /deep/.ant-table td{ white-space: nowrap; } -.ant-calendar-range-picker-input{ +/deep/.ant-calendar-range-picker-input{ width: 46% !important; } .title-text { diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 24ebea27a..a77965814 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -70,8 +70,7 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll='{x: 600}' - + :scroll="{x: '100%',y:370}" @change='handleTableChange'> {{ text }} @@ -282,6 +281,8 @@ export default { dutyTerritory:this.formData.dutyTerritory?this.formData.dutyTerritory:'', projectName:this.formData.projectName?this.formData.projectName:'', projectNameId:this.formData.projectNameId?this.formData.projectNameId:'', + // pageNo: this.pageNo, + // pageSize: this.pageSize, } this.loading = true getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => { @@ -289,6 +290,7 @@ export default { this.areaTable = res.result.complianceResultList this.opinionGather = res.result.opinionGather this.technologyEvaluation = res.result.technologyEvaluation + // this.total = res.result.total this.loading = false }else{ this.loading = false @@ -304,10 +306,12 @@ export default { downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.item.serialNumber +'.xls', query, this.Deselect) }, searchQuery() { + this.pageNo = 1 this.loadData() }, searchReset() { this.formData = {} + this.pageNo = 1 this.loadData() }, handleCancel() { From 7335445c40f8bb594c5dc80857cd8c2173de6ab5 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 18 Aug 2022 10:52:16 +0800 Subject: [PATCH 44/94] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/document/enums/SearchEnum.java | 2 + .../LawsMonthlyReportManageEOServiceImpl.java | 151 +++++++++- .../LawsMonthlyReportSearchController.java | 37 +++ .../ILawsMonthlyReportSearchService.java | 19 ++ .../LawsMonthlyReportSearchServiceImpl.java | 261 ++++++++++++++++++ 5 files changed, 468 insertions(+), 2 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java index 3b1ea5267..b9f2359e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java @@ -8,6 +8,8 @@ package com.jero.modules.document.enums; public enum SearchEnum { INDEX_NAME_DOCUMENT("文档库索引名称","documentLibrary"), TYPE_NAME_DOCUMENT("文档库类型","document"), + INDEX_NAME_LAWS_MONTHLY_REPORT("法规月报索引名称","lawsMonthlyReportManage"), + TYPE_NAME_LAWS_MONTHLY_REPORT("法规月报类型名称","lawsMonthlyReport"), FULL_TEXT_SEARCH("全部中文","fulltextsearchcn"), FULL_TEXT_SEARCH_CN("全部中文","fulltextsearchcn"), FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 339832758..2665e9642 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -1,20 +1,32 @@ package com.jero.modules.report.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.es.JeroElasticsearchTemplate; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.document.enums.SearchEnum; +import com.jero.modules.document.utils.ReadPdfUtil; +import com.jero.modules.document.utils.ReadWordUtil; import com.jero.modules.dummy.enums.InventoryStateEnum; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.report.entity.LawsMonthlyReportManageEO; import com.jero.modules.report.mapper.LawsMonthlyReportManageEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportManageEOService; +import com.jero.modules.system.service.ISysDictItemService; +import com.jero.modules.system.util.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @Description: 法规月报管理 @@ -25,6 +37,21 @@ import java.util.List; @Service public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportManageEOService { + @Autowired + private ISysDictItemService sysDictItemService; + + @Autowired + private JeroElasticsearchTemplate jeroElasticsearchTemplate; + + @Autowired + private IOSSFileService iOSSFileService; + + @Value(value = "${jero.path.upload}") + private String uploadpath; + + public static final String SEARCH_FLAG = "魑";//标识(es数据带此标识的代表全文和段落的数据,不带此标识的代表列表数据) + + /** * 保存 * @@ -110,6 +137,126 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl stringMapCn = new HashMap<>(); + Map stringMapEn = new HashMap<>(); + Map stringMapCnForSearch = new HashMap<>(); + Map stringMapEnForSearch = new HashMap<>(); + List> mapListTempCn = new ArrayList<>(); + List> mapListTempEn = new ArrayList<>(); + //文件相关封装中文的全文内容(es) 非搜索条件下的：flag---SEARCH_FLAG + putMap(id, "法规月报", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCn, SEARCH_FLAG); + //文件相关封装英文的全文内容(es) 搜索条件下的: flag---null + putMap(id, "monthly report", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEn, SEARCH_FLAG); + + //文件相关封装中文的全文内容(es) + putMap(id + monthlyReportManageEO.getFileId(), "法规月报", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCnForSearch, null); + //文件相关封装英文的全文内容(es) + putMap(id + monthlyReportManageEO.getFileId(), "monthly report", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEnForSearch, null); + + mapListTempCn.add(stringMapCn); + mapListTempCn.add(stringMapCnForSearch); + mapListTempEn.add(stringMapEn); + mapListTempEn.add(stringMapEnForSearch); + + //添加es + JSONObject jsonObjectCn = JSON.parseObject(JSON.toJSONString(stringMapCn)); + JSONObject jsonObjectEn = JSON.parseObject(JSON.toJSONString(stringMapEn)); + JSONArray arrayCn = JSONArray.parseArray(JSON.toJSONString(mapListTempCn)); + JSONArray arrayEn = JSONArray.parseArray(JSON.toJSONString(mapListTempEn)); + + try { + // 法规月报 + jeroElasticsearchTemplate.saveOrUpdate(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue(), SearchEnum.TYPE_NAME_LAWS_MONTHLY_REPORT.getValue(), id, jsonObjectCn); + //全部 + jeroElasticsearchTemplate.saveBatch(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), arrayCn); + jeroElasticsearchTemplate.saveBatch(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), arrayEn); + } catch (Exception e) { + log.error("文档库添加es失败"); + } + + } else if ("2".equals(issueStatus)) { // 待发布---撤回操作 + // 删除es中的月报 + try { + jeroElasticsearchTemplate.delete(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue(), SearchEnum.TYPE_NAME_LAWS_MONTHLY_REPORT.getValue(), id); + //删除全部中文的 + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH.getValue(), SearchEnum.FULL_TEXT_SEARCH.getValue(), id); + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), id); + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), id + monthlyReportManageEO.getFileId()); + //删除全部英文的 + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), id); + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), id + monthlyReportManageEO.getFileId()); + + } catch (Exception e) { + e.printStackTrace(); + log.error("文档库删除es失败"); + } + } + + } + + private void putMap(String id, String moduleType, + String content, String title , String fileText, + String fileName, String fileId, Date issueTime, String cut, + Map stringMap, + String flag){ + stringMap.put("id", id); + stringMap.put("module_type", moduleType); + stringMap.put("content", content); + stringMap.put("title", title); + stringMap.put("file_text", fileText); + stringMap.put("file_name", fileName); + stringMap.put("file_id", fileId); + stringMap.put("issue_time", issueTime); + stringMap.put("cut",cut); + stringMap.put("flag",flag); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java new file mode 100644 index 000000000..eaff9a3aa --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java @@ -0,0 +1,37 @@ +package com.jero.modules.searchcenter.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.modules.searchcenter.service.ILawsMonthlyReportSearchService; +import com.jero.modules.searchcenter.vo.SearchVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description 搜索中心-法规月报 控制层 + * @date 2022/8/17 15:03 + * @auth liyawei + */ +@Api(tags="搜索中心") +@RestController +@RequestMapping("/search/lawsMonthlyReport") +@Slf4j +public class LawsMonthlyReportSearchController { + + @Autowired + private ILawsMonthlyReportSearchService lawsMonthlyReportSearchService; + + @ApiOperation(value="全部查询", notes="全部查询") + @PostMapping(value = "/page") +// @RequiresPermissions("lawsMonthlyReport:page") + public Result queryPageInfo(@RequestBody SearchVO searchVO) { + IPage pageInfo = lawsMonthlyReportSearchService.pageInfo(searchVO); + return Result.OK(pageInfo); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java new file mode 100644 index 000000000..a09e13032 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java @@ -0,0 +1,19 @@ +package com.jero.modules.searchcenter.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.searchcenter.vo.SearchVO; + +/** + * @description 搜索中心-法规月报 接口 + * @date 2022/8/17 15:03 + * @auth liyawei + */ +public interface ILawsMonthlyReportSearchService { + + /** + * 分页查询 + * @param searchVO + * @return + */ + IPage pageInfo(SearchVO searchVO); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java new file mode 100644 index 000000000..55375d65b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java @@ -0,0 +1,261 @@ +package com.jero.modules.searchcenter.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.es.JeroElasticsearchTemplate; +import com.jero.modules.document.enums.SearchEnum; +import com.jero.modules.searchcenter.service.ILawsMonthlyReportSearchService; +import com.jero.modules.searchcenter.vo.SearchVO; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @description 搜索中心-法规月报 服务层 + * @date 2022/8/17 15:03 + * @auth liyawei + */ +@Component +public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSearchService { + + @Autowired + private JeroElasticsearchTemplate jeroElasticsearchTemplate; + public static final String SEARCH_FLAG = "魑";//标识(es数据带此标识的代表全文和段落的数据,不带此标识的代表列表数据) + + /** + * 全文 + * @param searchVO + * @return + */ + @Override + public IPage pageInfo(SearchVO searchVO) { + JSONArray queryJsonMustNot = new JSONArray(); +// if(StringUtils.isNotBlank(searchVO.getSelectValue())){ +// Map map = new HashMap<>(); +// Map map1 = new HashMap<>(); +// Map map2 = new HashMap<>(); +// map.put("query",SEARCH_FLAG); +// map1.put("flag",map); +// map2.put("match",map1); +// queryJsonMustNot.add(map2); +// } + if(StringUtils.isBlank(searchVO.getSelectValue())){ + searchVO.setSelectValue(SEARCH_FLAG); + } + + //判断索引是否存在 + boolean flagTemp = true; + flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue()); + if (!flagTemp) { + return new Page(searchVO.getPageNo(), searchVO.getPageSize()); + } + + String selectValue = searchVO.getSelectValue(); + String selectValueTwo = searchVO.getSelectValueTwo(); + //1. 需要查询的字段 + List fieldList = new ArrayList<>(); + fieldList.add("title");//权重5 + fieldList.add("file_text");//权重4 + fieldList.add("content");//权重3 + fieldList.add("file_name"); //权重2 + fieldList.add("module_type"); + fieldList.add("id"); + fieldList.add("flag"); + + JSONArray queryMapJson = new JSONArray(); + JSONArray queryMapJsonTwo = new JSONArray(); + JSONArray queryMapJsonThree = new JSONArray(); + JSONArray queryMapJsonAll = new JSONArray(); + + Map mapHighlight = new HashMap<>(); + Map mapHighlight1 = new HashMap<>(); + //封装首次的条件 + if (StringUtils.isNotBlank(selectValue)) { + for (String field : fieldList) { + Map map2 = new HashMap<>(); + Map map3 = new HashMap<>(); + Map map4 = new HashMap<>(); + if("title".equals(field)){ + map3.put("boost",1); + }else if("file_text".equals(field)){ + map3.put("boost",0.01); + }else if("content".equals(field)){ + map3.put("boost",0.01); + }else if("file_name".equals(field)){ + map3.put("boost",1); + } + + map3.put("query",selectValue); + map2.put(field, map3); + map4.put("match",map2); + queryMapJson.add(map4); + + //高亮 + if(!"flag".equals(field)){ + highlight(mapHighlight, field); + } + } + mapHighlight1.put("fields",mapHighlight); + } + if(CollectionUtils.isNotEmpty(queryMapJson)){ + JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJson); + queryMapJsonAll.add(jsonObject); + } + //封装二次的条件 + if (StringUtils.isNotBlank(selectValueTwo)) { + for (String field : fieldList) { + Map queryMap = new HashMap<>(); + Map map2 = new HashMap<>(); + Map map3 = new HashMap<>(); + if("title".equals(field)){ + map3.put("boost",1); + }else if("file_text".equals(field)){ + map3.put("boost",0.01); + }else if("content".equals(field)){ + map3.put("boost",0.01); + }else if("file_name".equals(field)){ + map3.put("boost",1); + } + + //特殊处理编号字段 + map3.put("query",selectValueTwo); +// map3.put("minimum_should_match",2); + map2.put(field, map3); + queryMap.put("match", map2); + + queryMapJsonTwo.add(queryMap); + //高亮 + if(!"flag".equals(field)){ + highlight(mapHighlight, field); + } + } + mapHighlight1.put("fields",mapHighlight); + } + if(CollectionUtils.isNotEmpty(queryMapJsonTwo)){ + JSONObject jsonObjectTwo = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonTwo); + queryMapJsonAll.add(jsonObjectTwo); + } + //ids进行三次封装 + if (StringUtils.isNotBlank(searchVO.getIds())) { + for (String s : searchVO.getIds().split(",")) { + Map queryMap = new HashMap<>(); + Map queryMapTemp = new HashMap<>(); + queryMapTemp.put("id", s); + queryMap.put("match_phrase", queryMapTemp); + queryMapJsonThree.add(queryMap); + } + } + if(CollectionUtils.isNotEmpty(queryMapJsonThree)){ + JSONObject jsonObjectThree = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree); + queryMapJsonAll.add(jsonObjectThree); + } + JSONObject sort = new JSONObject(); + Map issueTime = new HashMap<>(); + Map issueTime1 = new HashMap<>(); + issueTime.put("order","desc"); + issueTime1.put("issue_time",issueTime); + sort.putAll(issueTime1); + +// Map mapSort = new HashMap<>(); +// Map mapSortTemp = new HashMap<>(); +// mapSort.put("order","asc"); +// mapSortTemp.put("file_sort.keyword",mapSort); +// sort.putAll(mapSortTemp); + + Integer pageNo = searchVO.getPageNo(); + Integer pageSize = searchVO.getPageSize(); + IPage page = getiPage(selectValue, selectValueTwo, queryMapJsonAll, mapHighlight1,null, + pageNo, pageSize, null,searchVO.getCut(),sort,queryJsonMustNot); + return page; + } + + @NotNull + private IPage getiPage(String selectValue, String selectValueTwo, JSONArray queryMapJson,Map highlightMap, + JSONArray should, Integer pageNo, Integer pageSize, String paragraphFlag, + String cut,JSONObject querySort,JSONArray queryMustNot) { + JSONObject jsonObject = new JSONObject(); + //基础添加封装 + if ("paragraphFlag".equals(paragraphFlag)) { + jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null); + } else { + jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null); + } + JSONArray jsonArraySort = new JSONArray(); + jsonArraySort.add(querySort); + + //1. 条件,分页 + JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(null, + jsonObject, + highlightMap, + jsonArraySort, + pageNo-1, + pageSize); + //2. 数据查询 + JSONObject search = new JSONObject(); + search = jeroElasticsearchTemplate.search(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue(), + SearchEnum.TYPE_NAME_LAWS_MONTHLY_REPORT.getValue(), + queryObject); + + List> list = (List>) (((Map) search.get("hits")).get("hits")); + List> mapList = new ArrayList<>(); + for (Map map : list) { + Map mapSource = (Map) map.get("_source"); + Map mapHighlight = (Map) map.get("highlight"); + if(ObjectUtils.isNotEmpty(mapHighlight)){ + for (Map.Entry entry : mapHighlight.entrySet()) { + String key = entry.getKey(); + List value = (List) entry.getValue(); + String fieldConyent= ""; + for (String s : value) { + fieldConyent += s; + } + mapSource.put(key,fieldConyent); + } + //如果这一条数据中有高亮字段值,但是file_text中没有高亮值, 则赋空值,否则列表中会展示所有的文件内容, 赋空后,则展示基础数据 + String fileText = (String) mapSource.get("file_text"); + if(StringUtils.isNotBlank(fileText) && !fileText.contains("")){ + mapSource.put("file_text",""); + } + } + mapList.add(mapSource); + } + + //处理分页 + IPage page = new Page(pageNo, pageSize); + if (StringUtils.isNotBlank(selectValueTwo)) { + //二次搜索的结果 + page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total")))); + page.setRecords(mapList); + } else { + //首次搜索的结果 + page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total")))); + page.setRecords(mapList); + } + return page; + } + + private void highlight(Map mapHighlight, String key) { + Map mapTemp = new HashMap<>(); + List list = new ArrayList<>(); + list.add(""); + List list1 = new ArrayList<>(); + list1.add(""); + mapTemp.put("pre_tags", list); + mapTemp.put("post_tags", list1); + mapTemp.put("fragment_size", 200);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 + mapTemp.put("type", "plain"); + mapHighlight.put(key, mapTemp); + } + +} From 82f2ff886ad49c3f5f5ecfd837d27fffbeba207f Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 18 Aug 2022 10:59:48 +0800 Subject: [PATCH 45/94] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsMonthlyReportSearchController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java index eaff9a3aa..230c6e1fa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java @@ -7,6 +7,7 @@ import com.jero.modules.searchcenter.vo.SearchVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -27,9 +28,9 @@ public class LawsMonthlyReportSearchController { @Autowired private ILawsMonthlyReportSearchService lawsMonthlyReportSearchService; - @ApiOperation(value="全部查询", notes="全部查询") + @ApiOperation(value="法规月报查询", notes="法规月报查询") @PostMapping(value = "/page") -// @RequiresPermissions("lawsMonthlyReport:page") + @RequiresPermissions("document:search") public Result queryPageInfo(@RequestBody SearchVO searchVO) { IPage pageInfo = lawsMonthlyReportSearchService.pageInfo(searchVO); return Result.OK(pageInfo); From 93f19bf51a98f983e737167f39b788cdff7d86ad Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 12:31:29 +0800 Subject: [PATCH 46/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/AdjustareaSofrespon/index.vue | 10 +- jero-web/src/components/AssignedBy/index.vue | 10 +- .../SynchronousSubmissionLibrary/index.vue | 10 +- .../src/components/TaskCutOffTime/index.vue | 10 +- .../components/TaskCutOffTime/indexonekey.vue | 10 +- .../components/modules/fillTable.vue | 2 +- .../technologyAssessment/index.vue | 2 +- .../views/system/modules/RoleAssignment.vue | 11 +- .../system/modules/departmentAllocation.vue | 403 +++++++++--------- 9 files changed, 236 insertions(+), 232 deletions(-) diff --git a/jero-web/src/components/AdjustareaSofrespon/index.vue b/jero-web/src/components/AdjustareaSofrespon/index.vue index f88517b41..0ca263894 100644 --- a/jero-web/src/components/AdjustareaSofrespon/index.vue +++ b/jero-web/src/components/AdjustareaSofrespon/index.vue @@ -279,6 +279,11 @@ export default { /deep/.add-input{ min-height: 135px!important; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 8a81c237e..0346fa84c 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -240,6 +240,11 @@ export default { display: flex; justify-content: center; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue index a3f002ce2..31895648b 100644 --- a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue +++ b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue @@ -150,6 +150,11 @@ export default { display: flex; justify-content: center; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index 691d36603..953e9aaa2 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -348,6 +348,11 @@ export default { border: 1px #00B3BE solid; color: #00B3BE; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/TaskCutOffTime/indexonekey.vue b/jero-web/src/components/TaskCutOffTime/indexonekey.vue index 1da4a4c82..51541571b 100644 --- a/jero-web/src/components/TaskCutOffTime/indexonekey.vue +++ b/jero-web/src/components/TaskCutOffTime/indexonekey.vue @@ -348,6 +348,11 @@ export default { border: 1px #00B3BE solid; color: #00B3BE; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index cd49be66e..57e4d207a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -37,7 +37,7 @@
\ No newline at end of file diff --git a/jero-web/src/views/system/modules/departmentAllocation.vue b/jero-web/src/views/system/modules/departmentAllocation.vue index cab173a3d..42f018b0d 100644 --- a/jero-web/src/views/system/modules/departmentAllocation.vue +++ b/jero-web/src/views/system/modules/departmentAllocation.vue @@ -41,236 +41,239 @@ \ No newline at end of file From ef520c42e1dff8c4c92fcb65d7ca7ce0dfbbf257 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 13:54:20 +0800 Subject: [PATCH 47/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 2 +- jero-web/src/components/tableCollection/index1.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 14e5ad760..de9942367 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -7,7 +7,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 230px)'}" + :scroll="{x: '100%',y:'calc(100vh - 330px)'}" :data-source="dataSource" :loading="loading" sticky diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 930ec0431..091f5af65 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -7,7 +7,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 230px)'}" + :scroll="{x: '100%',y:'calc(100vh - 330px)'}" :data-source="dataSource" :loading="loading" sticky From 831ade21619834e18d42b8daf47722a727ab895f Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 18 Aug 2022 13:56:15 +0800 Subject: [PATCH 48/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/parameter/escalationlibrary/index.vue | 6 +++--- .../src/views/parameter/parameterexport/index.vue | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index e514ad0be..eb17a1c78 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -36,7 +36,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 130px)'}" + :scroll="{x: '100%',y:'calc(100vh - 158px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -44,7 +44,7 @@ > - {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }} + {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }} @@ -113,7 +113,7 @@ { title: this.$t('entryName'), align: 'center', - width: '13%', + width: '17%', dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 2570f1117..6fbef4e94 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -37,14 +37,14 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 140px)'}" + :scroll="{x: '100%',y:'calc(100vh - 160px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - {{ text && text.length > 40 ? text.slice(0, 39) + '...' : text }} + {{ text && text.length > 25 ? text.slice(0, 24) + '...' : text }} {{ text && text.length > 25 ? text.slice(0, 21) + '...' : text }} @@ -150,30 +150,32 @@ export default { title: this.$t('templateName'), align: 'center', dataIndex: 'templateName', + width: 300, scopedSlots: { customRender: 'templateName' } }, { title: this.$t('contentDescription'), align: 'center', dataIndex: 'description', + width: 300, scopedSlots: { customRender: 'projectName' } }, { title: this.$t('status'), align: 'center', - width: '5%', + width: 100, dataIndex: 'state_dictText' }, { title: this.$t('creater'), align: 'center', - width: '10%', + width: 100, dataIndex: 'createBy' }, { title: this.$t('Latestupdatetime'), align: 'center', - width: '10%', + width: 180, dataIndex: 'updateTime' }, { From 5a48f697067d6292e84e1641c18d4fe0bf6bc5f8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 13:56:50 +0800 Subject: [PATCH 49/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/processForm/evaluationProcess/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index bf371d414..7f95d69be 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -107,7 +107,8 @@ }, { title: this.$t('processBackground'), - value: 'processBackground' + value: 'processBackground', + type: 4 } ], evaluatorFeedback: [ From 4a46b58e58b5304e4c2387fe4af06a1b89233cac Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 18 Aug 2022 14:25:42 +0800 Subject: [PATCH 50/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/managementdetails/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 5306d884b..aa785af22 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -48,12 +48,12 @@ {{$t('dre')}}
+ v-model="formInline.dreName"/>
@@ -67,7 +67,7 @@ class="box-input" :personneQuery="formInline" @change="PersonnelSelectionChange" - v-model="formInline.sdt"/> + v-model="formInline.sdtName"/>
From 34fadc1ddf887fc772f62b46476e752b624ea06c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 18 Aug 2022 14:36:18 +0800 Subject: [PATCH 51/94] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AF=BC=E5=87=BA--=E8=B5=84=E8=AE=AF=E8=A1=8C=E4=B8=9A?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/report/entity/LawsMonthlyReportWriteEO.java | 3 ++- .../report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml | 3 ++- .../main/java/com/jero/modules/report/util/WordUtil.java | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index 03a7c2498..b76f1b294 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -196,7 +196,8 @@ public class LawsMonthlyReportWriteEO implements Serializable { //新添字段 private String relatedAreasCn;//相关领域中文 private String relatedAreasEn;//相关领域英文 - private String source;//来源 + private String sourceCn;//来源中文 + private String sourceEn;//来源英文 private String time;//日期 } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml index 6b2ef20e5..699e217ff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml @@ -31,7 +31,8 @@ - + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 6cb4f2bcf..6ecc9ce43 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -519,7 +519,8 @@ public class WordUtil { String cut) { String relatedAreasCn = lawsMonthlyReportWriteEO.getRelatedAreasCn();//相关领域中文 String relatedAreasEn = lawsMonthlyReportWriteEO.getRelatedAreasEn();//相关领域英文 - String source = lawsMonthlyReportWriteEO.getSource();//来源 + String sourceCn = lawsMonthlyReportWriteEO.getSourceCn();//来源 + String sourceEn = lawsMonthlyReportWriteEO.getSourceEn(); String time = lawsMonthlyReportWriteEO.getTime();//日期 String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文 String contentEn = lawsMonthlyReportWriteEO.getContentEn();//主要内容英文 @@ -545,7 +546,7 @@ public class WordUtil { //第1行 setCell(table, 0, "相关领域",relatedAreasCn); //第2行 - setCell(table,1, "来源",source); + setCell(table,1, "来源",sourceCn); //第3行 setCell(table,2, "日期",time); //第4行 @@ -556,7 +557,7 @@ public class WordUtil { //第1行 setCell(table,0, "Related Areas",relatedAreasEn); //第2行 - setCell(table,1,"source",source); + setCell(table,1,"Source",sourceEn); //第3行 setCell(table,2,"Date",time); //第4行 From d479f580ddb1e47f3de37c672f55e009f7d1a445 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 14:54:59 +0800 Subject: [PATCH 52/94] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/DocumentLibrary.vue | 35 ++++++++++---- .../components/monthlyReportRegulations.vue | 48 +++++++++++++++---- .../components/problemKnowledgeBase.vue | 2 +- .../searchCenter/components/whole.vue | 46 +++++++++++++++--- .../documentTools/searchCenter/index.vue | 6 +++ 5 files changed, 109 insertions(+), 28 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index e4abc53ed..db047cf8f 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -133,33 +133,34 @@ @click="checkedClick(item)" :class="{ 'null-input':item.checked }">
- + - + - + - +
- + @@ -167,21 +168,21 @@ >
-
-
- + @@ -684,7 +685,7 @@ let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) } else if (fileSuffix == '.docx') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') @@ -720,6 +721,10 @@ height: 18px !important; line-height: 18px !important; } + + .tooltip-index { + max-width: calc(100% - 300px) !important; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue index 85b4932ba..a1e8e6ef0 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue @@ -10,7 +10,7 @@
-
+