From 56a88d1c74d9278d85dc0d86d935c4833e81f640 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 10 Aug 2022 08:21:39 +0800 Subject: [PATCH 001/118] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA--=E8=AE=BE=E7=BD=AE=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=84=9A=E6=9C=AC=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/modules/report/util/WordUtil.java | 4 ++++ 1 file changed, 4 insertions(+) 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 160fafee6..5234a90d6 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 @@ -251,6 +251,10 @@ public class WordUtil { paragraph.setAlignment(ParagraphAlignment.CENTER); XWPFRun run = paragraph.createRun(); run.setText("NIO Internal"); + run.setFontSize(18); + run.setFontFamily("Blue Sky Standard Regular"); +// run.setFontFamily("Blue Sky Noto Regular"); + run.setBold(true); CTSectPr sectPr = document.getDocument().getBody().getSectPr(); From 845e295e9c26fe396e12dde35cf01ab9a2955bd7 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 10 Aug 2022 09:20:07 +0800 Subject: [PATCH 002/118] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardReleaseAdd.vue | 2 +- .../components/problemKnowledgeBaseList.vue | 2 +- .../problemKnowledgeBaseRelease.vue | 39 +++++++++++-------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index a2ed72151..301721aff 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -234,7 +234,7 @@ url = this.url.edit this.dataList.forEach(res => { content.push({ - countryCardTempId: res.id, + countryCardTempId: res.countryCardTempId, description: res.description, content: res.content, id: res.id diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 8c2c3ff7c..6f960d974 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -57,7 +57,7 @@
- 暂无数据 + {{$t('noData')}}
- + {{$t('managePublishing')}} @@ -46,26 +46,26 @@
-
- 暂无数据 -
-
- -
+
+ {{$t('noData')}} +
+
+
- {{$t('dataLoading')}} + {{$t('dataLoading')}} + - + \ No newline at end of file diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 4156aceda..034ad00dc 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -29,7 +29,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 180px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" From 9d1d429977efd8c4d418f9a8d42212263152b8df Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 10 Aug 2022 15:00:42 +0800 Subject: [PATCH 015/118] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E6=88=AA=E6=AD=A2=E5=BD=93?= =?UTF-8?q?=E5=A4=A9-=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/project/job/InventoryAffirmJob.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index e1c8e8369..f99726b03 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -172,22 +172,22 @@ public class InventoryAffirmJob implements Job { sendMessageMap.put("contentInfo",contentInfo); //发送消息 - projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){ currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList()); /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务今天即将结束,请及时查看处理*/ - String msgContentEN = "The regulation list confirmation for " + String msgContentEN = "The regulation task confirmation for " + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + " will expire today. Please check and address it in a timely manner."; String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName()+ " " + projectLibraryBase.getTargetMarket() - + ": You have a regulation list confirmation task to complete"; + + ": You have a regulation task confirmation to complete"; FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); feishuMsgVo.setContent("Hello! The task will expire today. Please check and address it in a timely manner."); - feishuMsgVo.setTaskType("Regulation List Confirmation"); + feishuMsgVo.setTaskType("Regulation Task Confirmation"); feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()); //飞书跳转链接 @@ -210,7 +210,7 @@ public class InventoryAffirmJob implements Job { sendMessageMap.put("hrefFeishu",hrefFeishu); sendMessageMap.put("contentInfo",contentInfo); //发送消息 - projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } } } From 688cac5c106dd0753219c757b41186274f00ddb9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 10 Aug 2022 15:31:01 +0800 Subject: [PATCH 016/118] =?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 --- .../documentTranslation/components/RetrieveFilesList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue index 37b0c040b..7f6d3b096 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -91,7 +91,7 @@
- {{$t('cancel')}} + {{$t('cancel')}} {{$t('submit')}}
From 13d16a097498150933331d954f2b2b1d0da76999 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 10 Aug 2022 16:26:41 +0800 Subject: [PATCH 017/118] =?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/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 591446f6f..9c36fbf2f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1252,7 +1252,7 @@ module.exports = { optionDropDownBox:'Option drop - down box', attachmentUpload:'file', textInput:'Text Input', - deleteNode:'If any file information exists, it will be deleted', + deleteNode:'If there is any file information, the file will be deleted. Are you sure to delete this data?', HaveReleased:'Have released', forward:'Forward', } \ 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 6cdb9acde..459a1e4b5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1355,7 +1355,7 @@ module.exports = { Paraname: '参数名称', Parabatch: '参数批次', freeze:'请选择冻结配置', - deleteNode:'若有文件信息将同步删除', + deleteNode:'若有文件信息将同步删除，确认删除该条数据？', HaveReleased:'已发布', forward:'转发', } \ No newline at end of file From 4fd5d9a85afdbe21b52168b50ced081432585962 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 10 Aug 2022 16:28:13 +0800 Subject: [PATCH 018/118] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=BE=85=E5=8A=9Eid?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/project/enums/JumpLinkEnum.java | 3 +++ .../modules/wkflow/controller/workFlowController.java | 7 +++++++ .../modules/wkflow/feginClient/WorkFlowFeignClient.java | 8 ++++++++ .../wkflow/feginClient/impl/WorkFlowFeignClientImpl.java | 9 +++++++++ 4 files changed, 27 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java index 54aa3225b..85f2b4d9f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java @@ -19,6 +19,9 @@ public enum JumpLinkEnum { DESIGN_AFFIRM_LINK("设计符合性确认链接","4","/ProjectDetails?id=","&type=103"), TASK_AFFIRM_LINK("任务确认链接","2","/ProcessCenter",""), COMPLIANCE_PROCESS_DETAIL_LINK("符合性流程明细页路由","2","/taskListProcess",""), + + PROBLEM_KNOWLEDGE_BASE_DETAIL("问题知识库，详情页","","/problemKnowledgeBaseView",""), + PROBLEM_KNOWLEDGE_BASE("问题知识库，列表页","","/problemknowledgeBase",""), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index f3abd5757..a8b8f4fa9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -214,4 +214,11 @@ public class workFlowController { public Result startTaskToConfirmProcess(@RequestBody JSONObject jsonObject){ return workFlowFeignClient.startTaskToConfirmProcess(jsonObject); } + + @AutoLog(value = "根据taskId删除流程") + @ApiOperation(value="根据taskId删除流程", notes="根据taskId删除流程") + @GetMapping("/deleteProcessInstanceByTaskId") + public Result deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){ + return workFlowFeignClient.deleteProcessInstance(taskId); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 401da0f62..aa9bdd61b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -156,4 +156,12 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET) Result completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds); + + /** + * 根据待办id删除流程 + * @param taskId + * @return + */ + @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByTaskId",method = RequestMethod.GET) + Result deleteProcessInstanceByTaskId(@RequestParam("taskId") String taskId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index 707089e60..ae1940c04 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -177,4 +177,13 @@ public class WorkFlowFeignClientImpl{ Result stringWrapper = workFlowFeignClient.startTaskToConfirmProcess(jsonObject.toString()); return Result.OK(stringWrapper.getResult()); } + + /** + * 根据待办id删除流程 + * @param taskId + * @return + */ + public Result deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){ + return workFlowFeignClient.deleteProcessInstance(taskId); + } } From 24961940febb397f10a01f2cf9dd9ca1c4a16f0d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 10 Aug 2022 16:35:09 +0800 Subject: [PATCH 019/118] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardList.vue | 9 +- .../components/countryCardView.vue | 184 ++++++++++++++++-- .../components/countryCardViewAdd.vue | 23 ++- .../components/displayInformationModel.vue | 31 ++- 4 files changed, 194 insertions(+), 53 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index e9280d893..61e974e72 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -38,7 +38,7 @@
- + {{item.applyMarket_dictText}} @@ -144,7 +144,7 @@ path: '/countryCardView', query: { applyMarket: row.applyMarket, - id: row.id, + id: row.id } }) window.open(newUrl.href, '_blank') @@ -216,14 +216,14 @@ } .content-box-box-img { - width: 70%; + width: 238px; height: 100%; border-right: 1px #d9d9d9 solid; } .content-box-box-text { + width: calc(100% - 238px); display: inline-block; - width: 30%; text-align: center; font-size: 18px; font-weight: 500; @@ -234,6 +234,7 @@ width: 100%; text-align: right; margin-top: 20px; + margin-bottom: 20px; } .operator-text { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 6c194fd8a..e73433631 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -23,22 +23,37 @@
-
-
+
+
- + - 中国 + {{item2.applyMarket_dictText}}
- - - 中国 - + + {{$t('viewFile')}} + + + {{item2.lableName}} + + + + + +
@@ -47,8 +62,11 @@
- + + {{$t('dataLoading')}} +
@@ -56,49 +74,155 @@ import { getAction, postAction, downloadFile } from '@/api/manage' import displayInformationModel from './displayInformationModel' import countryCardViewAdd from './countryCardViewAdd' + import viewFileModel from '@/components/viewFileModel/index' export default { name: 'countryCardView', components: { displayInformationModel, - countryCardViewAdd + countryCardViewAdd, + viewFileModel }, data() { return { clientWidth: '', isTrue: false, + loading: false, dataList: [], + contentList: [], + displayList: [], + queryCountryList: [], + countryCardViewList:[], + applyMarkets: '', + url: { + list: '/problemKnowledgeBase/countryCardTempEO/list', + deleteOne: '' + }, list: '/problemKnowledgeBase/countryCardManageReleaseEO/queryCountryCardManageReleaseByApplyMarkets' } }, mounted() { - this.isTrue = false - this.$nextTick(() => { - this.clientWidth = 340 * 14 + 'px' - this.isTrue = true + this.queryCountry(() => { + this.replacePage() }) - this.queryCountry() }, methods: { displayInformationClick() { - this.$refs.displayInformationModelRef.getData() + this.$refs.displayInformationModelRef.getData(JSON.parse(JSON.stringify(this.displayList))) + }, + displayInformationModelForm(data) { + this.displayList = data + this.displayList = [...this.displayList] + this.consolidateData() }, newlyAddedClick() { - this.$refs.countryCardViewAddRef.add() + this.$refs.countryCardViewAddRef.add(this.countryCardViewList) }, countryCardViewAddForm(val) { - + this.countryCardViewList = JSON.parse(JSON.stringify(val)) + let content = [] + if (val && val.length > 0) { + val.forEach(res => { + if (res.applyMarket) { + content.push(res.applyMarket) + } + }) + } + this.applyMarkets = content.join(',') + this.queryCountry() }, - queryCountry() { + replacePage() { + getAction(this.url.list, {}).then((res) => { + if (res.success) { + this.displayList = res.result || [] + this.displayList.forEach(val => { + val.showOrNot = true + }) + this.consolidateData() + this.loading = false + } else { + this.displayList = [] + this.loading = false + } + }) + }, + consolidateData() { + let content = [] + this.contentList = [] + this.contentList.push({}) + if (this.displayList && this.displayList.length > 0) { + this.displayList.forEach(res => { + if (res.showOrNot) { + content.push(res) + } + }) + } + if (this.queryCountryList && this.queryCountryList.length > 0) { + this.contentList[0].list = [] + this.contentList[0].list.push({}) + this.queryCountryList.forEach(val => { + this.contentList[0].name = 'tou' + this.contentList[0].list.push({ + applyMarket_dictText: val.applyMarket_dictText, + img: val.countryNationalFlag + }) + }) + } + if (content && content.length > 0) { + content.forEach((res, index) => { + this.contentList[index + 1] = { name: res.lableName } + this.contentList[index + 1].list = [] + this.contentList[index + 1].list.push({ + lableName: res.lableName, + lableType: res.lableType + }) + }) + } + this.queryCountryList.forEach((res, index) => { + res.countryCardManageReleaseDetailEOList.forEach((val, index1) => { + this.contentList.forEach(res1 => { + if (res1.name == val.lableName) { + res1.list.push({ + lableName: val.content, + lableType: val.lableType + }) + } + }) + }) + }) + console.log(this.contentList) + }, + queryCountry(callback) { + this.loading = true let applyMarkets = this.$route.query.applyMarket + if (this.applyMarkets) { + applyMarkets = applyMarkets + ',' + this.applyMarkets + } let query = { applyMarkets: applyMarkets } postAction(this.list, query).then((res) => { if (res.success) { - + this.queryCountryList = res.result || [] + this.isTrue = false + this.$nextTick(() => { + this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' + this.isTrue = true + }) + callback && callback() + if (!callback) { + this.consolidateData() + this.loading = false + } + } else { + callback && callback() + this.contentList = [] + this.loading = false } }) + }, + viewFileClick(item) { + this.$refs.viewFileModelRef.clickButtonToUpload(item) } } } @@ -218,6 +342,8 @@ width: 340px; display: inline-block; height: 80px; + line-height: 80px; + text-align: center; background: #fff; border-right: 1px #d9d9d9 solid; border-bottom: 1px #d9d9d9 solid; @@ -249,10 +375,28 @@ background: #fff; } + .content-box-top { + height: 80px; + } + .content-box-top:first-child { position: sticky; top: 0; + height: 160px; z-index: 111; background: #fff; } + + .content-box-box-text-index { + width: 100% !important; + padding: 0 12px; + box-sizing: border-box; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .content-box-box-text-admin { + height: 80px !important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue index 2c1767b7a..39181fe65 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue @@ -31,7 +31,6 @@
- * {{$t('comparisonMarket')+(index+1)}}
@@ -111,14 +110,19 @@ mounted() { }, methods: { - add() { + add(data) { this.visible = true + console.log(data) this.$nextTick(() => { this.formInline = {} this.formInline.applyMarket = this.$route.query.applyMarket - this.formInline.dataList = [{ - relatedSection: '' - }] + if (data && data.length > 0) { + this.formInline.dataList = JSON.parse(JSON.stringify(data)) + } else { + this.formInline.dataList = [{ + applyMarket: '' + }] + } this.getList() this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate() @@ -129,11 +133,8 @@ this.formInline = { ...this.formInline } }, handleOk() { - this.$refs.ruleForm.validate(valid => { - if (valid) { - - } - }) + this.$emit('countryCardViewAddForm', JSON.parse(JSON.stringify(this.formInline.dataList))) + this.visible = false }, handleCancel() { this.visible = false @@ -185,8 +186,6 @@ for (let j = 0; j < this.formInline.dataList[i].applyMarketList.length; j++) { if (contentIndex.includes(this.formInline.dataList[i].applyMarketList[j].applyMarket) && this.formInline.dataList[i].applyMarket != this.formInline.dataList[i].applyMarketList[j].applyMarket) { - console.log(111) - console.log(j) this.formInline.dataList[i].applyMarketList.splice(j, 1) j-- } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue index a6f01a5c3..724dc4f46 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -11,13 +11,15 @@ style="height: 100%;overflow: auto;padding-bottom: 53px;">
- - + +
@@ -65,28 +67,23 @@ mounted() { }, methods: { - getData() { + getData(data) { this.visible = true - this.replacePage() + this.$nextTick(() => { + this.dataList = data + this.dataList = [...this.dataList] + }) }, handleCancel() { this.visible = false }, handleSubmit() { - - }, - replacePage() { - this.loading = true - getAction(this.url.list, {}).then((res) => { - if (res.success) { - this.dataList = res.result || [] - this.loading = false - } else { - this.dataList = [] - this.loading = false - } - }) + this.$emit('displayInformationModelForm', this.dataList) + this.visible = false }, + onCheckAllChange(index) { + this.dataList[index].showOrNot = !this.dataList[index].showOrNot + } } } From 1ea54e3924870b960430593903478eb9e3e0d4dd Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 10 Aug 2022 16:42:03 +0800 Subject: [PATCH 020/118] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=94=B6=E5=88=B0=E8=AE=BE=E8=AE=A1=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?,Pre-Homo,=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLawsInventoryEOServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 91fbcc37e..023bd336c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1350,7 +1350,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 10 Aug 2022 16:50:51 +0800 Subject: [PATCH 021/118] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseList.vue | 56 +++++++++++++++---- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 2ca45b0f6..e723872d4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -13,13 +13,15 @@
- {{$t('recentHotSpots')}} - {{$t('disseminationMaterials')}} - {{$t('informationSafety')}} - {{$t('blueBook')}} - {{$t('invoiceCollection')}} - {{$t('productHighlights')}} - {{$t('financialReimbursement')}} +
@@ -91,9 +93,12 @@ searchContent: '', checkboxText: [], conList: [], + searchStr: '', total: 0, + selectedTags: [], loading: false, pageSize: 10, + tagList: [], downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, url: { @@ -103,12 +108,29 @@ }, mounted() { this.getList() + this.replacePage() }, methods: { + replacePage() { + getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { + if (res.success) { + this.tagList = res.result + } else { + this.tagList = [] + } + }) + }, onSearch() { this.pageNo = 1 this.getList() }, + handleChange(tag, checked) { + const { selectedTags } = this + const nextSelectedTags = checked + ? [...selectedTags, tag] + : selectedTags.filter(t => t !== tag) + this.selectedTags = nextSelectedTags + }, ResetSearch() { this.searchStr = '' this.pageNo = 1 @@ -128,11 +150,6 @@ this.$router.push({ path: '/problemKnowledgeBaseAdd' }) - // let newUrl = this.$router.resolve({ - // path: '/problemKnowledgeBaseAdd', - // query: {} - // }) - // window.open(newUrl.href, '_blank') }, pageOnChange(page, pageSize) { this.pageNo = page @@ -323,4 +340,19 @@ text-align: center; line-height: 10; } + + \ No newline at end of file From 0f3bcd0b9629e80b0b91ad745bf8851e296ab42f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 10 Aug 2022 17:19:11 +0800 Subject: [PATCH 022/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 17 +++++++++++-- .../components/initiatingProcess.vue | 6 +++++ .../processForm/evaluationProcess/index.vue | 9 ++++++- .../processForm/handshakeProcess/index.vue | 25 ++++++++++++++++--- .../processForm/regulatoryProcess/index.vue | 9 ++++++- .../processForm/taskListProcess/index.vue | 6 +++++ .../components/listOfRegulations.vue | 6 +++++ 7 files changed, 71 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 8201e8ed5..c2042a3c1 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -350,13 +350,23 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTask(value, res.result) + this.completeTask(value, res.result, true) } else { this.JLoading = false } }) }, - completeTask(value, taskId) { + deleteProcessInstanceByTask(taskId) { + getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => { + }) + }, + completeTask(value, taskId, isTrue) { + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: taskId, @@ -375,6 +385,9 @@ } else { this.JLoading = false this.$message.warning(this.$t('operationFailed')) + if (isTrue) { + this.deleteProcessInstanceByTask(taskId) + } } }) } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 8cdb5103a..1ef583d29 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -564,6 +564,12 @@ }) }, completeTask(value, taskId) { + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: taskId, diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 59f0fa530..ac1f757f6 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -307,11 +307,18 @@ } }, completeTask() { + let value = JSON.parse(JSON.stringify(this.queryProject)) + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: this.$route.query.taskIds, flag: this.queryProject.flag, - json: JSON.stringify(this.queryProject).replace(/\"/g, '\'') + json: JSON.stringify(value).replace(/\"/g, '\'') } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index c5390aa79..533a748a9 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -186,6 +186,12 @@ completeTask(value, handlingTime) { let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value) let data = JSON.stringify(json).replace(/\"/g, '\'') + Object.keys(data).forEach(res => { + if (data[res] && data[res] instanceof String) { + data[res] = data[res].replace(/\"/g, '“') + data[res] = data[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: this.$route.query.taskId || this.$route.query.taskIds, @@ -248,15 +254,24 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTaskDesign(value, res.result) + this.completeTaskDesign(value, res.result,true) } }) }, - - completeTaskDesign(value, taskId) { + deleteProcessInstanceByTask(taskId) { + getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => { + }) + }, + completeTaskDesign(value, taskId,isTrue) { value.reviewResult = 'launch' let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.operatorTime = operatorTime + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: taskId, @@ -272,6 +287,10 @@ // this.$router.push({ // path: '/ProcessCenter' // }) + }else{ + if (isTrue) { + this.deleteProcessInstanceByTask(taskId) + } } }) }, diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 503b8409d..604e429ce 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -171,10 +171,17 @@ // this.insertBatch(dataList, 2) }, completeTask() { + let value = JSON.parse(JSON.stringify(this.queryProject)) + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: this.$route.query.taskIds, - json: JSON.stringify(this.queryProject).replace(/\"/g, '\'') + json: JSON.stringify(value).replace(/\"/g, '\'') } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 20412f416..efb58fae4 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -342,6 +342,12 @@ completeTask(value) { let json = Object.assign(this.queryBy, value) let data = JSON.stringify(json).replace(/\"/g, '\'') + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: this.$route.query.taskId || this.$route.query.taskIds, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index dbf4800e9..e289457ce 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1697,6 +1697,12 @@ completeTask(value, taskId, index) { let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: taskId, From 90affdb471bee3d577c87e9d5a56adf2e1867518 Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 10 Aug 2022 17:21:13 +0800 Subject: [PATCH 023/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B6=85=E8=BF=87100m=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/exception/JeroBootExceptionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java index f8ac4228e..9408df97a 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java @@ -88,7 +88,7 @@ public class JeroBootExceptionHandler { @ExceptionHandler(MaxUploadSizeExceededException.class) public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { log.error(e.getMessage(), e); - return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); + return Result.error("文件大小超出100MB限制, 请压缩或降低文件质量! "); } @ExceptionHandler(DataIntegrityViolationException.class) From 552ab024008c620ad6398e12da2d28b31e6fe0fa Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 10 Aug 2022 17:35:32 +0800 Subject: [PATCH 024/118] =?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 --- jero-web/src/views/externalReports/index.vue | 3 ++- jero-web/src/views/parameter/parameterexport/index.vue | 2 +- .../projectManagement/components/ParameterCollectionEchart.vue | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 8886cdf38..b714d81cd 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -84,8 +84,9 @@
- + {{ d.label }} From 3a3d846e939ece4f082ed0c3f5aa7a14533f3e22 Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 10 Aug 2022 17:41:09 +0800 Subject: [PATCH 025/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B6=85=E8=BF=87100m=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/JeroBootExceptionHandler.java | 10 ++-- .../oss/service/impl/OSSFileServiceImpl.java | 54 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java index 9408df97a..42b84225e 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java @@ -85,11 +85,11 @@ public class JeroBootExceptionHandler { /** * spring默认上传大小100MB 超出大小捕获异常MaxUploadSizeExceededException */ - @ExceptionHandler(MaxUploadSizeExceededException.class) - public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { - log.error(e.getMessage(), e); - return Result.error("文件大小超出100MB限制, 请压缩或降低文件质量! "); - } +// @ExceptionHandler(MaxUploadSizeExceededException.class) +// public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { +// log.error(e.getMessage(), e); +// return Result.error("文件大小超出100MB限制, 请压缩或降低文件质量! "); +// } @ExceptionHandler(DataIntegrityViolationException.class) public Result handleDataIntegrityViolationException(DataIntegrityViolationException e) { 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 df73c3ae6..a14d95991 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 @@ -72,15 +72,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocal(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); try { @@ -191,15 +191,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocalOfCos(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); String ctxPath = uploadCospath; @@ -296,15 +296,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocalForSplit(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); String ctxPath = uploadCospath; From c0c5b905f23e9d82f2d8c6a88cec97c1485ba709 Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 10 Aug 2022 17:42:06 +0800 Subject: [PATCH 026/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=B3=A8=E5=85=A5%=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/extRepo/controller/ExtRepoDataController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 8b3d7e4b0..9349c0bb8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -74,11 +74,13 @@ public class ExtRepoDataController extends JeroController Date: Wed, 10 Aug 2022 17:53:20 +0800 Subject: [PATCH 027/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/extRepo/controller/ExtRepoDataController.java | 2 +- .../modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 9349c0bb8..8d06ee3b3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -187,7 +187,7 @@ public class ExtRepoDataController extends JeroController Date: Wed, 10 Aug 2022 17:54:51 +0800 Subject: [PATCH 028/118] =?UTF-8?q?country=20Card=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83-=E5=AF=B9=E6=AF=94=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CountryCardManageReleaseDetailEO.java | 4 ++++ ...CountryCardManageReleaseDetailEOServiceImpl.java | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java index 9f53f8850..9aba556d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java @@ -84,6 +84,10 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @ApiModelProperty(value = "内容") private java.lang.String content; + /**如果是下拉选的话，把翻译后的值放到此字段中。*/ + @TableField(exist = false) + private java.lang.String contentDropDownValue; + @TableField(exist = false) private String cut; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java index 54fe486fd..84929756b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java @@ -148,6 +148,19 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl { + boolean flag = false; + if (StringUtils.equals(data.getContent(), countryCardTempItemEO.getId())) { + flag = true; + } + return flag; + }).map(CountryCardTempItemEO::getItemText).collect(Collectors.joining(",")); + + //设置下拉框的value + data.setContentDropDownValue(contentDropDownValue); + } } }); From 46c7cc49b11e8a8e2c75ff3aef96f2f14df66b2e Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 10 Aug 2022 18:09:00 +0800 Subject: [PATCH 029/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/countryCardView.vue | 1 - .../components/problemKnowledgeBaseAdd.vue | 26 +++++++++++++------ .../components/problemKnowledgeBaseList.vue | 18 +++++++++++-- .../problemKnowledgeBaseRelease.vue | 22 +++++++++++----- .../components/problemKnowledgeBaseView.vue | 21 +++++++++++++-- 7 files changed, 71 insertions(+), 19 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9c36fbf2f..7596c76db 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1255,4 +1255,5 @@ module.exports = { deleteNode:'If there is any file information, the file will be deleted. Are you sure to delete this data?', HaveReleased:'Have released', forward:'Forward', + issuedBy:'Issued by', } \ 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 459a1e4b5..413c5702b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1358,4 +1358,5 @@ module.exports = { deleteNode:'若有文件信息将同步删除，确认删除该条数据？', HaveReleased:'已发布', forward:'转发', + issuedBy:'发布人', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index e73433631..ace355e4f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -190,7 +190,6 @@ }) }) }) - console.log(this.contentList) }, queryCountry(callback) { this.loading = true diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 8b17b5343..4b5d678f1 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -92,12 +92,11 @@ {{$t('market')}}
- +
@@ -110,6 +109,7 @@
@@ -133,11 +133,12 @@
{{$t('content')}}
- + @@ -239,6 +240,13 @@ message: this.$t('market') + this.$t('cannotEmpty'), trigger: 'change' } + ], + content: [ + { + max: 5000, + message: this.$t('content') + this.$t('cannotExceed') + 5000 + this.$t('Characters'), + trigger: 'change' + } ] }, url: { @@ -276,6 +284,9 @@ } }, methods: { + quilleditorBlur() { + this.$refs.ruleForm.validateField('content') + }, getBase() { getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { if (res.success) { @@ -340,7 +351,6 @@ } , onEditorChange({ quill, html, text }) { - console.log('editor change!', quill, html, text) this.formInline.content = html } , diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index e723872d4..9b6df4de4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -53,7 +53,7 @@
- {{item.content}} + {{item.contentOne}}
@@ -130,6 +130,7 @@ ? [...selectedTags, tag] : selectedTags.filter(t => t !== tag) this.selectedTags = nextSelectedTags + this.getList() }, ResetSearch() { this.searchStr = '' @@ -160,16 +161,29 @@ this.pageSize = pageSize this.getList() }, + getText(str) { + let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签 + return words.replace(/\s/g, '') //这里是去除空格 + }, getList() { + let selectedTags = JSON.parse(JSON.stringify(this.selectedTags)) let query = { pageNo: this.pageNo, pageSize: this.pageSize, - searchStr: this.searchStr + searchStr: this.searchStr, + problemTypes: selectedTags.join(',') } this.loading = true getAction(this.url.getInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records + if (this.conList && this.conList.length > 0) { + this.conList.forEach(val => { + if (val.content) { + val.contentOne = this.getText(val.content) + } + }) + } this.total = res.result.total this.loading = false } else { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 4e824890c..cda30770c 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -22,7 +22,7 @@ {{$t('reset')}} -
+
@@ -36,7 +36,8 @@
-
+
+ {{item.contentOne}}
{{$t('edit')}} @@ -113,6 +114,10 @@ this.pageNo = 1 this.getList() }, + getText(str) { + let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签 + return words.replace(/\s/g, '') //这里是去除空格 + }, getList() { let query = { pageNo: this.pageNo, @@ -124,6 +129,13 @@ getAction(this.url.getInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records + if (this.conList && this.conList.length > 0) { + this.conList.forEach(val => { + if (val.content) { + val.contentOne = this.getText(val.content) + } + }) + } this.total = res.result.total this.loading = false } else { @@ -139,11 +151,9 @@ }, titleClick(item) { let newUrl = this.$router.resolve({ - path: '/docManage/library/detail', + path: '/problemKnowledgeBaseView', query: { - id: item.id.slice(0, 32), - title: item.title, - serial_number: item.serial_number + id: item.id } }) window.open(newUrl.href, '_blank') diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 232ad441e..b651cfbe3 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -17,6 +17,14 @@
+
+ + {{$t('issuedBy')}}:{{this.queryForm.createBy}} + + + {{$t('releaseDate')}}:{{this.queryForm.createTime}} + +
{{item.title}} @@ -104,11 +112,11 @@ standardContentList: [ { title: this.$t('problemClassification'), - value: 'problemType' + value: 'problemTypeName' }, { title: this.$t('market'), - value: 'targetMarket' + value: 'targetMarket_dicText' }, { title: this.$t('standardNo'), @@ -493,4 +501,13 @@ overflow: hidden; text-align: right; } + + .content-text-top { + width: 100%; + text-align: right; + color: #040B29; + font-weight: 400; + font-size: 16px; + margin-bottom: 20px; + } \ No newline at end of file From fddb07f51879f628acaa6cb50397a3aa5bef6337 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 10 Aug 2022 18:18:31 +0800 Subject: [PATCH 030/118] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93=E8=81=94=E8=B0=83=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProblemKnowledgeBaseEO.java | 11 ++++- .../ProblemKnowledgeBaseEOServiceImpl.java | 47 +++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java index 7287306a9..7d63858bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java @@ -72,12 +72,19 @@ public class ProblemKnowledgeBaseEO implements Serializable { /**问题分类展示名称*/ @TableField(exist = false) private java.lang.String problemTypeName; + /**问题分类查询条件字段 多个*/ + @TableField(exist = false) + private java.lang.String problemTypes; - /**市场*/ - @Dict(dicCode = "region") + + /**市场*/ + //@Dict(dicCode = "region") @Excel(name = "市场", width = 15) @ApiModelProperty(value = "市场") private java.lang.String targetMarket; + /**市场展示字段**/ + @TableField(exist = false) + private java.lang.String targetMarket_dicText; /**文档库id*/ @Excel(name = "文档库id", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index 0455d852a..cad2b60e5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -1,7 +1,9 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.problemKnowledgeBase.entity.*; import com.jero.modules.problemKnowledgeBase.enums.CollectStatusEnum; @@ -9,6 +11,8 @@ import com.jero.modules.problemKnowledgeBase.enums.PraiseStatusEnum; import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum; import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper; import com.jero.modules.problemKnowledgeBase.service.*; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; @@ -44,6 +48,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); List finalProblemKnowledgeBaseClassifyEOList = problemKnowledgeBaseClassifyEOList; datas.forEach(data -> { @@ -298,6 +305,30 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl { + boolean flag = false; + if (StringUtils.equals(targetMarket, region.getValue())) { + flag = true; + } + return flag; + }).map(DictModel::getText).collect(Collectors.joining(",")); + }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ + targetMarket_dicText = regionList.stream().filter(region -> { + boolean flag = false; + if (StringUtils.equals(targetMarket, region.getValue())) { + flag = true; + } + return flag; + }).map(DictModel::getTextEn).collect(Collectors.joining(",")); + } + + data.setTargetMarket_dicText(targetMarket_dicText); + } }); } } @@ -335,5 +366,21 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl problemTypeList = Arrays.asList(problemTypes.split(",")); + queryWrapper.and(query -> { + query.lambda().like(ProblemKnowledgeBaseEO::getProblemType,problemTypes); + if(CollectionUtils.isNotEmpty(problemTypeList)){ + problemTypeList.forEach(type -> { + query.or(q -> { + q.lambda().like(ProblemKnowledgeBaseEO::getProblemType,type); + }); + }); + } + }); + } } } From 4e570ea217f3ec9fb9324eb618126b447fb77c72 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 10 Aug 2022 22:49:49 +0800 Subject: [PATCH 031/118] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8E=E9=A3=9E?= =?UTF-8?q?=E4=B9=A6=E6=95=B0=E6=8D=AE=E4=BA=A4=E4=BA=92=EF=BC=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FeishuServiceImpl.java | 189 ++++++++++++------ 1 file changed, 126 insertions(+), 63 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 55e6e2429..b1d6f2b43 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -1,15 +1,29 @@ package com.jero.modules.feishu.service.impl; import cn.hutool.core.util.StrUtil; -import com.alibaba.druid.support.json.JSONUtils; 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.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsgVo; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; +import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService; +import com.jero.modules.project.enums.JumpLinkEnum; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.HttpRequestUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -18,6 +32,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Author: liyawei @@ -42,6 +57,17 @@ public class FeishuServiceImpl implements IFeishuService { @Value("${Feishu.translateTextUrl}") private String translateTextUrl; + @Value(value = "${jero.backUrl}") + private String backUrl; + @Autowired + private IProblemKnowledgeBaseClassifyEOService problemKnowledgeBaseClassifyEOService; + @Autowired + private IProblemKnowledgeBaseEOService problemKnowledgeBaseEOService; + @Autowired + private IProblemKnowledgeBaseUserEOService problemKnowledgeBaseUserEOService; + @Autowired + private ISysUserService sysUserService; + /** * 获取token * @return @@ -333,7 +359,8 @@ public class FeishuServiceImpl implements IFeishuService { " \"title\": {\n" + " \"tag\": \"plain_text\",\n" + " \"content\": \"点击下方的分类查看常见问题\"\n" + - " }\n" + + " },\n" + + " \"template\": \"green\"\n" + " }\n" + "}"; JSONObject jsonObject = JSONObject.parseObject(sendJson); @@ -342,56 +369,28 @@ public class FeishuServiceImpl implements IFeishuService { element.put("tag","action"); element.put("layout","bisected"); - JSONArray actions = new JSONArray(); - //组装推送过去的点击按钮 - for (int i=0; i<5; i++){ + //获取分类 + List problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(); + JSONArray actions = new JSONArray(); + + //组装推送过去的点击按钮 + for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) { JSONObject buttonObject = new JSONObject(); JSONObject text = new JSONObject(); JSONObject value = new JSONObject(); buttonObject.put("tag","button"); - if(i==0){ - text.put("tag","plain_text"); - text.put("content","content1"); + text.put("tag","plain_text"); + text.put("content",problemKnowledgeBaseClassifyEO.getProblemLabel()); + value.put("chosen",problemKnowledgeBaseClassifyEO.getId()); - value.put("chosen","chosen1"); - } - if(i==1){ - text.put("tag","plain_text"); - text.put("content","content2"); - - value.put("chosen","chosen2"); - } - if(i==2){ - text.put("tag","plain_text"); - text.put("content","content3"); - - value.put("chosen","chosen3"); - } - if(i==3){ - text.put("tag","plain_text"); - text.put("content","content4"); - - value.put("chosen","chosen4"); - } - if(i==4){ - text.put("tag","plain_text"); - text.put("content","content5"); - - value.put("chosen","chosen5"); - } - if(i==5){ - text.put("tag","plain_text"); - text.put("content","content6"); - - value.put("chosen","chosen6"); - } buttonObject.put("text",text); buttonObject.put("type","primary"); buttonObject.put("value",value); actions.add(buttonObject); } + element.put("actions",actions); @@ -423,12 +422,94 @@ public class FeishuServiceImpl implements IFeishuService { String clickStr = JSONObject.toJSONString(JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("action"))).get("value")); log.info("用户点击的数据: " + clickStr); - String sendJson = " "; + String sendJsonStr = "{\n" + + " \"config\": {\n" + + " \"wide_screen_mode\": true\n" + + " },\n" + + " \"header\": {\n" + + " \"title\": {\n" + + " \"tag\": \"plain_text\",\n" + + " \"content\": \"问题知识库信息，点击下方标题即可跳转至详情页查看\"\n" + + " },\n" + + " \"template\": \"green\"\n" + + " }\n" + + "}"; + + JSONObject sendJson = JSONObject.parseObject(sendJsonStr); + JSONArray elements = new JSONArray(); + + //分隔行对象。 + JSONObject dividingLineJson = new JSONObject(); + dividingLineJson.put("tag","hr"); JSONObject clickJson = JSONObject.parseObject(clickStr); if(StringUtils.isNotEmpty(clickJson.getString("chosen"))){ - sendJson = clickJson.getString("chosen"); + String problemTypeId = clickJson.getString("chosen"); + String thirdId = userIds[0]; + SysUser currentOperatorUser = this.sysUserService.getBaseMapper().selectOne( + new QueryWrapper().lambda().eq(SysUser::getThirdId, thirdId) + ); + if(ObjectUtils.isNotEmpty(currentOperatorUser)){ + QueryWrapper userPermissionQueryWrapper = new QueryWrapper<>(); + userPermissionQueryWrapper.lambda().eq(ProblemKnowledgeBaseUserEO::getUserId,currentOperatorUser.getId()); + List problemKnowledgeBaseUserEOList = this.problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper); + + List problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); + + QueryWrapper problemKnowledgeBaseEOQueryWrapper = new QueryWrapper<>(); + + problemKnowledgeBaseEOQueryWrapper.lambda().eq(ProblemKnowledgeBaseEO::getProblemType,problemTypeId); + problemKnowledgeBaseEOQueryWrapper.lambda().and(query -> { + query.eq(ProblemKnowledgeBaseEO::getShowPermissions, ShowPermissionsEnum.OPEN.getValue()). + or(o -> { + o.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.PRIVACY.getValue()); + o.in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList); + }); + }); + + //根据发布日期倒序 查询出（公开、私密且自己是权限用户）最新的五条数据 + problemKnowledgeBaseEOQueryWrapper.orderByDesc("release_time"); + Integer pageNo = 1; + Integer pageSize = 5; + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseEOService.page(page, problemKnowledgeBaseEOQueryWrapper); + List records = pageList.getRecords(); + + JSONObject element = new JSONObject(); + JSONArray actions = new JSONArray(); + + for (ProblemKnowledgeBaseEO record : records) { + String url = backUrl + JumpLinkEnum.PROBLEM_KNOWLEDGE_BASE_DETAIL.getLink() + "?id=" + record.getId(); + + JSONObject action = new JSONObject(); + JSONObject text = new JSONObject(); + action.put("tag","button"); + + text.put("tag","plain_text"); + text.put("content",record.getTitle()); + action.put("text",text); + action.put("type","primary"); + action.put("url",url); + actions.add(action); + } + + element.put("tag","action"); + element.put("actions",actions); + elements.add(element); + //添加一个分隔线。 + elements.add(dividingLineJson); + } } + JSONObject textFinally = new JSONObject(); + textFinally.put("tag","lark_md"); + textFinally.put("content","[以上都不是>>]("+backUrl + JumpLinkEnum.PROBLEM_KNOWLEDGE_BASE.getLink()+")"); + + JSONObject elementFinally = new JSONObject(); + elementFinally.put("tag","div"); + elementFinally.put("text",textFinally); + elements.add(elementFinally); + + sendJson.put("elements",elements); String token = null; try { @@ -440,30 +521,13 @@ public class FeishuServiceImpl implements IFeishuService { Map headerMap = new HashMap<>(); headerMap.put("Authorization", "Bearer " + token); headerMap.put("Content-Type", "application/json; charset=utf-8"); - // 设置消息标题 - JSONObject zh_cn = new JSONObject(); - zh_cn.put("title", "title"); - // 设置消息内容 - // 第一行 - JSONObject contentOne = new JSONObject(); - contentOne.put("tag", "text"); - contentOne.put("text", sendJson); - List contentList = new ArrayList<>(); - contentList.add(contentOne); - List> list = new ArrayList<>(); - list.add(contentList); - zh_cn.put("content", list); - - JSONObject post = new JSONObject(); - post.put("zh_cn", zh_cn); - JSONObject contentObj = new JSONObject(); - contentObj.put("post", post); // 设置请求参数 JSONObject paramsMap = new JSONObject(); paramsMap.put("user_ids", userIds); - paramsMap.put("msg_type", "post"); - paramsMap.put("content", contentObj); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", sendJson); + // 发送请求给飞书 String response = null; try { @@ -471,7 +535,6 @@ public class FeishuServiceImpl implements IFeishuService { } catch (IOException e) { e.printStackTrace(); } - // 返回结果样例：{"code":0,"data":{"invalid_department_ids":[],"invalid_open_ids":[],"invalid_union_ids":[],"invalid_user_ids":[],"message_id":"bm-d595567e4f448fafe397bc916f0be646"},"msg":"ok"} // 获取返回结果 JSONObject tokenJson = JSONObject.parseObject(response); if(!tokenJson.get("code").toString().equals("0")) { From 862120ce1b3b73329665c9170cb3eb1254d5e7c1 Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 10 Aug 2022 23:32:06 +0800 Subject: [PATCH 032/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E4=BF=AE=E6=94=B9=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=B8=80=E7=BA=A7=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=88=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtRepoDataController.java | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 8d06ee3b3..c459fcc97 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -9,12 +9,11 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oss.CosBootUtil; -import com.jero.generater.modules.online.auth.entity.OnlAuthData; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.extRepo.entity.ExtRepoDataPage; +import com.jero.modules.extRepo.entity.ExtRepoFolder; import com.jero.modules.extRepo.service.IExtRepoDataService; import com.jero.modules.extRepo.service.IExtRepoFolderService; -import com.jero.modules.split.entity.SarFileSplitInfoEO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -74,13 +73,13 @@ public class ExtRepoDataController extends JeroController result = new Result(); ExtRepoData erd = extRepoDataService.queryById(id); if (null != erd) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (sysUser.getUsername().equals(erd.getCreateBy())) { - extRepoDataService.deleteById(id); - CosBootUtil.delete(erd.getFileKey()); + int count = getRootFolderCount(); + if (erd.getSupFolder().equals("root") && count <= 1) { if (CutEnum.CN.getValue().equals(cut)) { - result.success("删除成功!"); + result.error500("此文件夹不可删除！"); } else { - result.success("Data deletion successfully!"); + result.error500("This folder cannot be deleted!"); } } else { - if (CutEnum.CN.getValue().equals(cut)) { - result.error500("没有权限！"); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (sysUser.getUsername().equals(erd.getCreateBy())) { + extRepoDataService.deleteById(id); + CosBootUtil.delete(erd.getFileKey()); + if (CutEnum.CN.getValue().equals(cut)) { + result.success("删除成功!"); + } else { + result.success("Data deletion successfully!"); + } } else { - result.error500("You do not have permission!"); + if (CutEnum.CN.getValue().equals(cut)) { + result.error500("没有权限！"); + } else { + result.error500("You do not have permission!"); + } } } } else { @@ -212,6 +220,12 @@ public class ExtRepoDataController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExtRepoFolder::getSupFolder, "root"); + return extRepoFolderService.count(queryWrapper); + } + /** * 批量删除 * From 9cb0b88fcda6e8f1d286cc57366072a1cd2b1d2a Mon Sep 17 00:00:00 2001 From: gaosong Date: Thu, 11 Aug 2022 00:22:11 +0800 Subject: [PATCH 033/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E6=9D=83=E9=99=90=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtRepoFolderController.java | 10 +- .../modules/extRepo/entity/ERFTreeData.java | 15 --- .../modules/extRepo/entity/ERFTreeDataVO.java | 27 +++++ .../impl/ExtRepoFolderServiceImpl.java | 105 ++++++------------ 4 files changed, 66 insertions(+), 91 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java index abb0c0d96..37be9b9e1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java @@ -4,7 +4,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.extRepo.entity.ERFTreeData; +import com.jero.modules.extRepo.entity.ERFTreeDataVO; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.extRepo.entity.ExtRepoFolder; import com.jero.modules.extRepo.service.IExtRepoDataService; @@ -44,9 +44,11 @@ public class ExtRepoFolderController extends JeroController> queryList() { - List list = extRepoFolderService.queryTreeList(); - return Result.OK(list); + public Result queryList() { + ERFTreeDataVO dataVO = new ERFTreeDataVO(); + dataVO.setManager(extRepoFolderService.isManager()); + dataVO.setList(extRepoFolderService.queryTreeList()); + return Result.OK(dataVO); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java index d9d65aecd..0b0152705 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java @@ -36,13 +36,6 @@ public class ERFTreeData implements Comparable { */ private int orderId; - - /** - * 是否显示 - */ - private boolean display = false; - - /** * 查看权限人员 */ @@ -119,14 +112,6 @@ public class ERFTreeData implements Comparable { this.orderId = orderId; } - public boolean isDisplay() { - return display; - } - - public void setDisplay(boolean display) { - this.display = display; - } - public String getFolderName() { return folderName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java new file mode 100644 index 000000000..ba073d51e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java @@ -0,0 +1,27 @@ +package com.jero.modules.extRepo.entity; + +import java.util.List; + +public class ERFTreeDataVO { + boolean isManager; + List list; + + public ERFTreeDataVO() { + } + + public boolean isManager() { + return isManager; + } + + public void setManager(boolean manager) { + isManager = manager; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java index aa6ea910a..baee6ebaa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java @@ -22,10 +22,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 对外报告文件夹表 - * @Author: jero-boot - * @Date: 2022-07-25 - * @Version: V1.0 + * 对外报告文件夹表 */ @Service public class ExtRepoFolderServiceImpl extends ServiceImpl implements IExtRepoFolderService { @@ -38,9 +35,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl list = getListBySupFolder(extRepoFolder.getSupFolder()); for (ExtRepoFolder erf : list) { if (erf.getOrderId() >= extRepoFolder.getOrderId() && !erf.getId().equals(extRepoFolder.getId())) { @@ -90,9 +79,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl authManage_orig = getAuthMap(erf_orig.getAuthManageIdsName(), erf_orig.getAuthManageIds()); Map authManage_new = getAuthMap(erf_new.getAuthManageIdsName(), erf_new.getAuthManageIds()); @@ -132,20 +118,20 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl allSubFolder = getAllSubFolder(erf_orig.getId()); //存储变化的对象 - List updateFolder = new ArrayList(); + List updateFolder = new ArrayList<>(); for (ExtRepoFolder erf : allSubFolder) { boolean isChange = false; Map authManage_erf = getAuthMap(erf.getAuthManageIdsName(), erf.getAuthManageIds()); Map authView_erf = getAuthMap(erf.getAuthViewIdsName(), erf.getAuthViewIds()); for (String add : addManageRole.keySet()) { - if (!authManage_erf.keySet().contains(add)) { + if (!authManage_erf.containsKey(add)) { authManage_erf.put(add, addManageRole.get(add)); isChange = true; } } for (String del : delManageRole.keySet()) { //如果是创建人 不能删除管理权限 - if (authManage_erf.keySet().contains(del)) { + if (authManage_erf.containsKey(del)) { if (!del.equals(erf_orig.getCreateBy())) { authManage_erf.remove(del); isChange = true; @@ -153,13 +139,13 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getDefMap(Map mapA, Map mapB) { - Map res = new HashMap(); + Map res = new HashMap<>(); for (String s : mapA.keySet()) { - if (StringUtils.isNotBlank(s) && !mapB.keySet().contains(s)) { + if (StringUtils.isNotBlank(s) && !mapB.containsKey(s)) { res.put(s, mapA.get(s)); } } @@ -196,7 +178,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getAllSubFolder(String folderId) { List resList = getListBySupFolder(folderId); - List subList = new ArrayList(); + List subList = new ArrayList<>(); for (ExtRepoFolder erf : resList) { subList.addAll(getAllSubFolder(erf.getId())); } @@ -206,9 +188,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl queryList() { @@ -243,14 +217,12 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl queryTreeList() { try { List list = queryList(); - List res = getSubFolder(superFolder, list, 1); + List res = getSubFolder(superFolder, list, 1, true); Collections.sort(res); return res; } catch (Exception ex) { @@ -262,34 +234,31 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getSubFolder(String supId, List list, int level) throws Exception { - List resList = new ArrayList(); + private List getSubFolder(String supId, List list, int level, boolean needAuth) { + List resList = new ArrayList<>(); for (ExtRepoFolder erf : list) { if (supId.equals(erf.getSupFolder())) { - ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId()); - //检查有没有权限查看 - date.setDisplay(haveViewAuth(erf.getSupFolder())); - int childLevel = date.getLevel() + 1; - date.setAuthManageIdsName(erf.getAuthManageIdsName()); - date.setAuthManageIds(erf.getAuthManageIds()); - date.setAuthViewIdsName(erf.getAuthViewIdsName()); - date.setAuthViewIds(erf.getAuthViewIds()); - date.setChildren(getSubFolder(erf.getId(), list, childLevel)); - date.sortChildren(); - resList.add(date); + int childLevel = level + 1; + if (!needAuth || haveViewAuth(erf.getId())) { + ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId()); + date.setAuthManageIdsName(erf.getAuthManageIdsName()); + date.setAuthManageIds(erf.getAuthManageIds()); + date.setAuthViewIdsName(erf.getAuthViewIdsName()); + date.setAuthViewIds(erf.getAuthViewIds()); + date.setChildren(getSubFolder(erf.getId(), list, childLevel, false)); + date.sortChildren(); + resList.add(date); + } else { + resList.addAll(getSubFolder(erf.getId(), list, childLevel, true)); + } } } return resList; } private List getStringList(String listStr) { - List res = new ArrayList(); + List res = new ArrayList<>(); if (null != listStr) { res = Arrays.asList(listStr.split(",")); } @@ -297,7 +266,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getAuthMap(String strKey, String strValue) { - Map resMap = new HashMap(); + Map resMap = new HashMap<>(); List keyList = getStringList(strKey); List valueList = getStringList(strValue); for (int i = 0; i < keyList.size(); i++) { @@ -308,19 +277,17 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl userRoles = sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, loginUser.getId())); // 查询用户所有角色 - List userRoleIds = new ArrayList<>(); // 用户管理员/对外报告管理员 + List userRoleIds; // 用户管理员/对外报告管理员 if (CollectionUtil.isNotEmpty(userRoles)) { List roleIdList = ExtRepoMamagerRoleIdEnum.getIdList(); List userRoleIdList = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); - userRoleIds = roleIdList.stream().filter(e -> userRoleIdList.contains(e)).collect(Collectors.toList()); + userRoleIds = roleIdList.stream().filter(userRoleIdList::contains).collect(Collectors.toList()); return !CollectionUtil.isEmpty(userRoleIds); } return false; @@ -328,13 +295,10 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl Date: Thu, 11 Aug 2022 09:30:12 +0800 Subject: [PATCH 034/118] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardReleaseAdd.vue | 5 +++-- .../components/countryCardView.vue | 17 ++++++++++++----- .../components/problemKnowledgeBaseAdd.vue | 8 ++++++-- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index 301721aff..5ba9e0e3c 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -62,7 +62,8 @@ { this.contentList.forEach(res1 => { if (res1.name == val.lableName) { - res1.list.push({ - lableName: val.content, - lableType: val.lableType - }) + if (val.lableType == 3) { + res1.list.push({ + lableName: val.contentDropDownValue, + lableType: val.lableType + }) + } else { + res1.list.push({ + lableName: val.content, + lableType: val.lableType + }) + } } }) }) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 4b5d678f1..c954fe235 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -133,8 +133,9 @@
{{$t('content')}}
- + \ No newline at end of file From 8d009c6b15dcc072dc73ff2457040de8fb48e7bd Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 11 Aug 2022 09:32:37 +0800 Subject: [PATCH 035/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/views/externalReports/index.vue | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7596c76db..04fce3a33 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -475,7 +475,7 @@ module.exports = { away: 'Collapse', toDoProcess: 'To Do', processDone: 'Completed', - sentProcess: 'Create', + sentProcess: 'Initiated', monitoringProcess: 'Monitor', ConfirmDeployment: 'Confirm Deployment?', terminationProcess: 'Termination Process', diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index b714d81cd..82ea5c65e 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -40,7 +40,7 @@ {{title && title.length > 18?title.slice(0,17)+'...':title}} -