From e8d452721eb4b91b24ce3884b111e68fc2509f54 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 12 Aug 2022 09:11:32 +0800 Subject: [PATCH 01/49] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E4=BA=A4=E4=BA=92-?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=94=A8=E6=88=B7=E7=BB=99=E9=A3=9E=E4=B9=A6?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E5=8F=91=E9=80=81=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E7=BB=99=E6=9C=BA=E5=99=A8=E4=BA=BA=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=88=86=E7=B1=BB=E8=B4=A3=E4=BB=BB=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feishu/controller/LarkController.java | 5 ++ .../feishu/service/IFeishuService.java | 6 ++ .../service/impl/FeishuServiceImpl.java | 79 +++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java index c7b51528e..2f2ab5bf6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java @@ -67,6 +67,11 @@ public class LarkController { log.info("给"+employeeId+"用户推送知识库一级分类菜单:=========================================================="); feishuService.sendKnowledgeBaseTypeCard(employeeId.split(",")); } + //判断用户发送的消息内容，如果包含"负责人" 那么给用户推送知识库分类负责人信息 + if(StringUtils.contains(text,"负责人")){ + log.info("给"+employeeId+"用户推送知识库负责人:=========================================================="); + feishuService.sendKnowledgeBaseTypeChargePersonCard(employeeId.split(",")); + } } } return decrypt; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java index 5c8a8d213..a1999a118 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java @@ -56,4 +56,10 @@ public interface IFeishuService { * @param jsonObject */ void sendKnowledgeBaseInfoCard(JSONObject jsonObject); + + /** + * 发送知识库分类负责人卡片消息 （用户输入负责人的时候） + * @param split + */ + void sendKnowledgeBaseTypeChargePersonCard(String[] split); } 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 b1d6f2b43..32c13eaf0 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 @@ -542,4 +542,83 @@ public class FeishuServiceImpl implements IFeishuService { } } + @Override + public void sendKnowledgeBaseTypeChargePersonCard(String[] userIds) { + String token = null; + try { + token = getTenantAccessToken(); + } catch (IOException e) { + e.printStackTrace(); + } + // 设置请求头 + Map headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + token); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + + String sendJson = " {\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 jsonObject = JSONObject.parseObject(sendJson); + JSONArray elements = new JSONArray(); + JSONObject element = new JSONObject(); + element.put("tag","action"); + element.put("layout","bisected"); + + //获取分类 + List problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(); + this.problemKnowledgeBaseClassifyEOService.disposeData(problemKnowledgeBaseClassifyEOList); + + JSONArray actions = new JSONArray(); + + //组装推送过去的点击按钮 + for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) { + JSONObject buttonObject = new JSONObject(); + JSONObject text = new JSONObject(); + JSONObject value = new JSONObject(); + buttonObject.put("tag","button"); + + text.put("tag","plain_text"); + text.put("content",problemKnowledgeBaseClassifyEO.getProblemLabel() + " [" + problemKnowledgeBaseClassifyEO.getChargePersonIdName() + "]"); + value.put("chosen",problemKnowledgeBaseClassifyEO.getChargePersonId()); + + buttonObject.put("text",text); + buttonObject.put("type","primary"); + buttonObject.put("value",value); + actions.add(buttonObject); + } + + element.put("actions",actions); + + + elements.add(element); + jsonObject.put("elements",elements); + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + paramsMap.put("user_ids", userIds); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", jsonObject); + + // 发送请求给飞书 + String response = null; + try { + response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + } catch (IOException e) { + e.printStackTrace(); + } + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } + } + } From d1c4cfd8cae5d022f431f12f0b33d0052d9d158b Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 12 Aug 2022 09:54:12 +0800 Subject: [PATCH 02/49] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/exporthistory/index.vue | 2 +- .../collectionOfRegulatoryOpinions/index.vue | 1 + .../technologyAssessment/index.vue | 1 + .../regulationsKanban/components/addModel.vue | 34 ++++++++++++++++--- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index 6bec68ea0..a2d883e27 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -40,7 +40,7 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll="{x: '100%',y:600}" + :scroll="{x: '100%',y:370}" :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 0a13a4202..66551a844 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -232,6 +232,7 @@ searchReset() { this.queryParam = {} this.$route.query.serialNumber = '' + this.$route.query.gatherResult = '' this.pageNo = 1 this.getList() }, diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index c2c5935ac..acee733dc 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -301,6 +301,7 @@ searchReset() { this.queryParam = {} this.$route.query.serialNumber = '' + this.$route.query.flowStatus = '' this.pageNo = 1 this.getList() }, diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 608c4c436..b3a67398c 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -57,6 +57,30 @@ :scroll='{x: 600}' @change='handleTableChange'> + + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + + + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + + + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + @@ -125,22 +149,24 @@ export default { title: this.$t('designComplianceReview'), align: 'center', width: 250, - dataIndex: 'designStatus_dicText', + dataIndex: 'designFlowTaskStatus_dicText', + scopedSlots: { customRender: 'status' }, ellipsis: true }, { title: this.$t('preHomeConfirmation'), align: 'center', width: 270, - dataIndex: 'prehomoStatus_dicText', + dataIndex: 'prehomoFlowTaskStatus_dicText', + scopedSlots: { customRender: 'statusprehomo' }, ellipsis: true }, { title: this.$t('verificationComplianceReview'), align: 'center', width: 270, - dataIndex: 'verifyStatus_dicText', - scopedSlots: { customRender: 'file' }, + dataIndex: 'verifyFlowTaskStatus_dicText', + scopedSlots: { customRender: 'filstatuse' }, ellipsis: true } ], From 352fcc12243d2e4b3b7210e5dc0518a311224c8e Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 12 Aug 2022 10:00:09 +0800 Subject: [PATCH 03/49] =?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 --- .../classificationMaintenanceAdd.vue | 7 +++-- .../components/countryCardReleaseModelAdd.vue | 12 ++++---- .../components/problemKnowledgeBaseList.vue | 1 + .../components/commentList.vue | 4 +-- .../components/comparisonResults.vue | 3 +- .../components/documentDataComparison.vue | 29 +++++++++++-------- .../components/initiateComparison.vue | 5 ++-- 7 files changed, 36 insertions(+), 25 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue index b1d02eb16..81b080a51 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue @@ -19,7 +19,7 @@ @@ -34,6 +34,7 @@ @@ -77,6 +77,8 @@ @@ -94,7 +96,7 @@ @@ -111,7 +113,7 @@ + v-model.trim="formInline.description" :rows="4"/> @@ -190,8 +192,8 @@ ], description: [ { - max: 300, - message: this.$t('describe') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + max: 500, + message: this.$t('describe') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ] diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 9b6df4de4..89f8433f7 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -134,6 +134,7 @@ }, ResetSearch() { this.searchStr = '' + this.selectedTags = [] this.pageNo = 1 this.getList() }, diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue index f25f17751..7d27bc8fd 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue @@ -79,13 +79,13 @@ + v-model.trim="formInline.replyContent" :rows="4"/> + v-model.trim="formInline.commentContent" :rows="4"/> diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue index dec21a79b..0d49d4763 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue @@ -187,6 +187,7 @@ } else { this.isDisplay = true } + document.title = this.$t('DocumentComparison') + ' - ' + this.$t('comparisonResults') this.language = localStorage.getItem('language') || '' this.getData() }, @@ -207,7 +208,7 @@ includeComments: fullCheckbox, infoId: this.$route.query.id } - downloadFile(this.url.exportData, this.resultData.serialNumberLeft + ' - ' + this.resultData.serialNumberRight + '.xls', query, this.Deselect) + downloadFile(this.url.exportData, this.resultData.serialNumberLeft + ' - ' + this.resultData.serialNumberRight + this.$t('comparisonResults') + '.xls', query, this.Deselect) }, Deselect() { this.checkboxList = [] diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index dfe2eeb53..d424e3ab7 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -182,6 +182,7 @@ }, mounted() { this.getData() + document.title = this.$t('DocumentComparison') + ' - ' + this.$t('edit') }, methods: { Fallback() { @@ -326,12 +327,14 @@ if (detailRightColor && detailRightColor.length > 0) { detailRightColor[0].classList.remove('detail-content-content-right-data-color-right') } - let detailContent = document.getElementsByClassName('detail-content-content-right-right-top') - let detailRight = document.getElementsByClassName('detail-content-content-right-data-right') - this.dataRight = this.resultData.textRight[item.targetStand] - if (detailRight && detailRight.length > 0) { - detailRight[item.targetStand].classList.add('detail-content-content-right-data-color-right') - detailContent[0].scrollTop = detailRight[item.targetStand].offsetTop - 150 + if (item.targetStand && item.targetStand >= 0) { + let detailContent = document.getElementsByClassName('detail-content-content-right-right-top') + let detailRight = document.getElementsByClassName('detail-content-content-right-data-right') + this.dataRight = this.resultData.textRight[item.targetStand] + if (detailRight && detailRight.length > 0) { + detailRight[item.targetStand].classList.add('detail-content-content-right-data-color-right') + detailContent[0].scrollTop = detailRight[item.targetStand].offsetTop - 150 + } } } }, @@ -354,12 +357,14 @@ if (detailLeftColor && detailLeftColor.length > 0) { detailLeftColor[0].classList.remove('detail-content-content-right-data-color') } - this.dataLeft = this.resultData.textLeft[item.targetStand] - let detailContent = document.getElementsByClassName('detail-content-content-right-top') - let detailLeft = document.getElementsByClassName('detail-content-content-right-data') - if (detailLeft && detailLeft.length > 0) { - detailLeft[item.targetStand].classList.add('detail-content-content-right-data-color') - detailContent[0].scrollTop = detailLeft[item.targetStand].offsetTop - 150 + if (item.targetStand && item.targetStand >= 0) { + this.dataLeft = this.resultData.textLeft[item.targetStand] + let detailContent = document.getElementsByClassName('detail-content-content-right-top') + let detailLeft = document.getElementsByClassName('detail-content-content-right-data') + if (detailLeft && detailLeft.length > 0 && item.targetStand >= 0) { + detailLeft[item.targetStand].classList.add('detail-content-content-right-data-color') + detailContent[0].scrollTop = detailLeft[item.targetStand].offsetTop - 150 + } } } }, diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index 8a7a8ce2c..5c02c7ce8 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -242,6 +242,7 @@ mounted() { this.getListLeft() this.getListRight() + document.title = this.$t('DocumentComparison') + ' - ' + this.$t('initiateComparison') }, methods: { Fallback() { @@ -348,7 +349,7 @@ let query = { pageNo: this.pageNoLeft, pageSize: this.pageSizeLeft, - fileId:'1', + fileId: '1', ...queryParam } this.loadingLeft = true @@ -372,7 +373,7 @@ let query = { pageNo: this.pageNoRight, pageSize: this.pageSizeRight, - fileId:'1', + fileId: '1', ...queryParam } this.loadingRight = true From 10cbc10dd2158eec3e87569a5f27360bbe5fa7d6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 12 Aug 2022 10:11:57 +0800 Subject: [PATCH 04/49] =?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 --- .../problemKnowledgeBase/components/countryCardReleaseAdd.vue | 2 +- .../documentComparison/components/comparisonResults.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index 5ba9e0e3c..322962110 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -63,7 +63,7 @@ @@ -140,7 +140,7 @@ From b6f97206eeee5e56a9148e01b8d317f78f423fdd Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 12 Aug 2022 10:20:10 +0800 Subject: [PATCH 05/49] =?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/evaluationResultsClause.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index 8d2edd675..e61bb0b10 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -75,13 +75,13 @@ {{$t('fileExport')}} -
+
Date: Fri, 12 Aug 2022 11:33:39 +0800 Subject: [PATCH 06/49] =?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 | 7 +++++-- .../components/countryCardView.vue | 21 ++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 9e34a7f28..ba3d5fef4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -298,10 +298,13 @@ } }) }, - viewClick() { + viewClick(row) { let newUrl = this.$router.resolve({ path: '/countryCardView', - query: {} + query: { + applyMarket: row.applyMarket, + id: row.id + } }) window.open(newUrl.href, '_blank') }, diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 0e804b721..93adee56b 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -26,7 +26,7 @@
-
+
@@ -36,15 +36,28 @@
+ {{item2.lableName}} + v-else-if="item2.lableType == 7 && item2.lableName && index2 != 0"> {{$t('viewFile')}} + + {{item2.lableName}} + {{item2.lableName}} @@ -169,12 +182,14 @@ }) } if (content && content.length > 0) { + console.log(content) 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 + lableType: res.lableType, + relevantUrl: res.relevantUrl }) }) } From ad3c8eb66a26371f1bfc35d54c9beda0651d22a8 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 12 Aug 2022 11:47:10 +0800 Subject: [PATCH 07/49] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E6=9F=A5=E7=9C=8B-=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=AF=BC=E5=87=BA-bug57881?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/project/util/ExcelUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java index 544412b38..efca534c0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java @@ -142,6 +142,10 @@ public class ExcelUtil { if(ObjectUtil.isNull(cell)) { continue; } + // 判断单元格类型，非文本单元格不处理 + if(! (org.apache.poi.ss.usermodel.Cell.CELL_TYPE_STRING == cell.getCellType())) { + continue; + } String cellValue = cell.getStringCellValue(); From 5efbe70ddf13564d0cb78197ef04246c62bd8671 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 12 Aug 2022 13:51:38 +0800 Subject: [PATCH 08/49] =?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 --- .../classificationMaintenanceModel.vue | 1 + .../components/countryCardView.vue | 11 ++- .../components/displayInformationModel.vue | 89 ++++++++++++++++--- .../components/problemKnowledgeBaseList.vue | 24 +++-- 4 files changed, 103 insertions(+), 22 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue index 15a8814fc..6d6415529 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue @@ -115,6 +115,7 @@ }, handleCancel() { this.visible = false + this.$emit('classificationMaintenanceModelForm') }, onChange(page, pageSize) { this.pageNo = page diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 93adee56b..4c91a6b97 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -6,7 +6,7 @@ - {{$t('See')}} + {{header_text}}
@@ -107,6 +107,7 @@ queryCountryList: [], countryCardViewList: [], applyMarkets: '', + header_text: '', url: { list: '/problemKnowledgeBase/countryCardTempEO/list', deleteOne: '' @@ -151,6 +152,9 @@ this.displayList.forEach(val => { val.showOrNot = true }) + this.$nextTick(() => { + this.$refs.displayInformationModelRef.dataListOne = JSON.parse(JSON.stringify(this.displayList)) + }) this.consolidateData() this.loading = false } else { @@ -230,6 +234,11 @@ this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' this.isTrue = true }) + let content = [] + this.queryCountryList.forEach(val => { + content.push(val.applyMarket_dictText) + }) + this.header_text = content.join('-') callback && callback() if (!callback) { this.consolidateData() diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue index 724dc4f46..709a02c38 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -9,6 +9,27 @@ @close="handleCancel" :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> +
+ + + +
+
+ {{$t('LabelName')}} +
+ +
+ + + + {{$t('query')}} + {{$t('reset')}} + + + + +
{ + return res.lableName.includes(this.queryParam.labelName) + }) + this.dataList = [...this.dataList] + } + }, + searchReset() { + this.queryParam = {} + this.dataList = JSON.parse(JSON.stringify(this.dataListOne)) + this.dataList = [...this.dataList] + }, getData(data) { this.visible = true this.$nextTick(() => { - this.dataList = data + this.queryParam = {} + this.dataList = JSON.parse(JSON.stringify(data)) this.dataList = [...this.dataList] }) }, @@ -78,11 +115,16 @@ this.visible = false }, handleSubmit() { - this.$emit('displayInformationModelForm', this.dataList) + this.$emit('displayInformationModelForm', this.dataListOne) this.visible = false }, onCheckAllChange(index) { this.dataList[index].showOrNot = !this.dataList[index].showOrNot + this.dataListOne.forEach(res => { + if (res.id == this.dataList[index].id) { + res.showOrNot = !res.showOrNot + } + }) } } } @@ -107,18 +149,41 @@ border-radius: 0 0 2px 2px; } - .box-title { - width: 100%; - text-align: right; - margin-bottom: 20px; + .box-title-text { + line-height: 1.4; + display: flex; + align-items: center; + margin-bottom: 10px; } - .operator-text { - cursor: pointer; - margin-right: 13px; - font-size: 14px; - font-weight: 400; - color: #040B29; + .title-text { + width: 20%; + min-width: 110px; + color: #000F16; display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + margin-top: 3px; + text-align: right; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .box-input { + display: inline-block; + width: 70%; + height: 38px; + margin-top: 2px; + } + + .box-button { + height: 38px; + /*margin-top: 2px;*/ + } + + .text-operation { + margin-right: 8px; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 89f8433f7..0c8e92dd4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -1,15 +1,17 @@ @@ -120,6 +123,9 @@ } }) }, + classificationMaintenanceModelForm(){ + this.replacePage() + }, onSearch() { this.pageNo = 1 this.getList() From aabdb5ac0aa5ce9d465e2e7e083e32126efc2eb4 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 12 Aug 2022 14:14:21 +0800 Subject: [PATCH 09/49] =?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 --- .../problemKnowledgeBase/components/countryCardList.vue | 3 ++- .../components/problemKnowledgeBaseAdd.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index 61e974e72..4c2368253 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -47,6 +47,7 @@
@@ -573,6 +573,7 @@ .box-button { height: 38px; + margin-top: 4px; } .submit-button { From eb022b89821da166b52963bad6f9c9179f775ca6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 12 Aug 2022 14:16:33 +0800 Subject: [PATCH 10/49] =?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/problemKnowledgeBaseRelease.vue | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index cda30770c..d325f194d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -12,15 +12,17 @@
-
-
- {{$t('searchContent')}} + +
+
+ {{$t('searchContent')}} +
+ + {{$t('query')}} + {{$t('reset')}}
- - {{$t('query')}} - {{$t('reset')}} -
+
From 871b1188f0bfcea98a1b5b8c057bec5b81565e47 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 12 Aug 2022 14:25:05 +0800 Subject: [PATCH 11/49] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7-=E6=AC=A7=E6=B4=B2=E7=8E=AF=E5=A2=83-bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/system/entity/PPEmployee.java | 2 +- .../jero/modules/system/service/impl/SyncDataServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java index 68fbad730..6797f735b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java @@ -51,7 +51,7 @@ public class PPEmployee { private String data_provider; // 第三方数据提供商 private String extension_attribute1; // O365标签 private String working_hour; // 工作制 - private String domain; // 账号所属域 + private String domain; // 账号所属域 美国-amer private String ad_failed; // 创建ad失败原账号 private String have_employees; // 是否有下属员工 private String id; // id ----id diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index a50b39aab..1e82ff964 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -227,7 +227,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ JSONObject resultJsonEU = (JSONObject) myJsonEU.get("data"); //将第一页的账户信息转换为本地dto集合 List userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); - List currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); + List currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU"); ppEmployeeList.addAll(currentPPEmployeeListEU); //获取总记录数 @@ -246,7 +246,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ log.debug("【欧洲】打印输出本次同步信息返回结果:"+myJsonEU.get("data").toString()); resultJsonEU = (JSONObject) myJsonEU.get("data"); userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); - currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); + currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU"); ppEmployeeList.addAll(currentPPEmployeeListEU); } } From 4b6b3bfa6a8f17e02c46da6039a35ae65f3cf8f8 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 12 Aug 2022 15:16:10 +0800 Subject: [PATCH 12/49] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=8F=90=E4=BA=A4=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E6=94=B6(=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7,Pre-Homo,=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7)-=E7=BF=BB=E8=AF=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E9=A3=9E=E4=B9=A6=E5=8D=A1=E7=89=87=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0Assignee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FeishuServiceImpl.java | 10 +++++++ .../jero/modules/feishu/vo/FeishuMsgVo.java | 2 ++ .../ProjectLawsInventoryEOServiceImpl.java | 27 ++++++++++--------- 3 files changed, 27 insertions(+), 12 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 32c13eaf0..0f51306b6 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 @@ -213,6 +213,16 @@ public class FeishuServiceImpl implements IFeishuService { contentSb.append("}"); contentSb.append("}"); } + if (StrUtil.isNotEmpty(feishuMsgVo.getAssignee())){ + contentSb.append(","); + contentSb.append("{"); + contentSb.append("\"is_short\": false,"); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"**Assignee：** " + feishuMsgVo.getAssignee() + "\","); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("}"); + } if (StrUtil.isNotEmpty(feishuMsgVo.getDueDate())){ contentSb.append(","); contentSb.append("{"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java index 631a32d97..0aee3596c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java @@ -24,5 +24,7 @@ public class FeishuMsgVo { private String url; //回调的网址 + private String assignee; //评估人 适用范围：责任人提交通知发起人（设计符合性，pre-homo符合性，验证符合性） + } 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 023bd336c..422882210 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 @@ -2273,10 +2273,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id userIdList.add(prehomoInitiatorId); @@ -2291,10 +2292,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id userIdList.add(verifyInitiatorId); @@ -2309,10 +2311,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); }else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){ String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id userIdList.add(designDutyId); From 8660237539b7884e28e09dc289c62308ae9394e5 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 12 Aug 2022 16:08:15 +0800 Subject: [PATCH 13/49] =?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 --- .../regulationReport/components/modules/fillTableAdd.vue | 2 +- jero-web/src/views/externalReports/index.vue | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue index a2d27bb6f..de3436c1b 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -50,9 +50,9 @@ {{$t('Foldername')}}
- +
From a7ae7423f59af1a8385d20b185250f6e3b1d493d Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 12 Aug 2022 16:38:50 +0800 Subject: [PATCH 14/49] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E9=80=9A=E8=BF=87=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA(=E8=AE=BE=E8=AE=A1=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7,Pre-Homo,=E9=AA=8C=E8=AF=81=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7)-=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 --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 422882210..525b4f7e4 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 @@ -2320,7 +2320,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Fri, 12 Aug 2022 16:42:19 +0800 Subject: [PATCH 15/49] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-37,41?= =?UTF-8?q?=E8=A1=8C-=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-boot/db/蔚来标准sql/dev_third_record.sql | 7 +++++++ .../project/enums/ProjectTaskPlanningNameEnum.java | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6e33bcb04..216ff492a 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -894,6 +894,10 @@ UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Fail' WHERE `id` = '149678 UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Depart' WHERE `id` = '1174511244036587521'; UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Company' WHERE `id` = '1174511197735665665'; UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Position' WHERE `id` = '1174509082208395266'; +-- 项目状态 project_status +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Development' WHERE `id` = '1513769417081630721'; +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Production' WHERE `id` = '1513769467044179970'; + -- 表字段 英文修改 2022-08-11 -- OCR识别转换记录表 @@ -913,3 +917,6 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item No.' WHER UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Name' WHERE `id` = '9e91b704de198ccf2f5fb7297e675404'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Content' WHERE `id` = '120a92b6d595c2fd68d2b90278357ce4'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Technical Field' WHERE `id` = 'ccf68e6578a0a446a6ac34018f0a477d'; +-- 文档库信息表 +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Standard Type' WHERE `id` = '441588d80cc31ce68fbdf2ce8b36f93c'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Area' WHERE `id` = '9f82d58f22a12792a53e202d64a39f06' diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 34169acd6..13c1ff160 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -1,16 +1,16 @@ package com.jero.modules.project.enums; public enum ProjectTaskPlanningNameEnum { - LIST_CONFIRMATION("清单确认"," Checklist confirmation"), - LEGAL_TASK_CONFIRMATION("任务确认","Task confirmation"), - DESIGN_DEADLINE("设计符合性","Design compliance"), + LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"), + LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"), + DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"), // PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), // ATTESTATION_START_TIME("认证开始","Certification begins"), // ATTESTATION_END_TIME("认证结束"," End of certification"), - PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Completion"), // name:Pre-Homo value:Pre-Homo - ATTESTATION_START_TIME("认证试验结束","Homo Test Completion"),// name:认证开始 value:Certification begins - ATTESTATION_END_TIME("认证批准","Type Approval"),// name:认证结束 value:End of certification - VERIFY_DEADLINE("验证符合性","Verify compliance"), + PREHOMO_DEADLINE("Pre-Homo确认","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo + ATTESTATION_START_TIME("认证结束","Homo Completion"),// name:认证开始 value:Certification begins + ATTESTATION_END_TIME("认证开始","Homo KO"),// name:认证结束 value:End of certification + VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), ; String name; String value; From 2e69983ab6eb67ea5994eda6af00e95cbd8717c1 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 12 Aug 2022 16:59:15 +0800 Subject: [PATCH 16/49] =?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/common/lang/en-us.js | 2 +- .../components/problemKnowledgeBaseAdd.vue | 3 ++ .../components/problemKnowledgeBaseView.vue | 39 +++++++++++-------- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 91e4e0dfd..8adedf685 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1213,7 +1213,7 @@ module.exports = { displayPermission: 'Display permission', authorizedUser: 'Authorized user', problemClassification: 'Problem classification', - market: 'market', + market: 'Market', documentNumber: 'Document Number', documentTitle: 'Document Title', bringInDocumentInformation: 'Bring in document information', diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 87dba98fd..47b816081 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -587,4 +587,7 @@ ::v-deep .itemModel-explain .ant-form-explain { margin-top: 60px } + ::v-deep .ql-tooltip { + z-index: 10 !important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index b651cfbe3..377cda7ef 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -22,7 +22,7 @@ {{$t('issuedBy')}}:{{this.queryForm.createBy}} - {{$t('releaseDate')}}:{{this.queryForm.createTime}} + {{$t('releaseDate')}}:{{this.queryForm.createTime?this.queryForm.createTime.slice(0,11):''}}
@@ -254,21 +254,26 @@ this.$message.warning(this.$t('pleaseEnter')) return } - let query = { - problemKnowledgeBaseId: this.$route.query.id, - commentContent: this.formInline.commentContent, - commentUserId: this.userInfo().id - } - this.loading = true - postAction('/problemKnowledgeBase/problemKnowledgeBaseCommentEO/add', query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.releaseData() - this.formInline = {} - this.loading = false - } else { - this.$message.warning(this.$t('operationFailed')) - this.loading = false + this.$refs.ruleForm.validate(valid => { + if (valid) { + let query = { + problemKnowledgeBaseId: this.$route.query.id, + commentContent: this.formInline.commentContent, + commentUserId: this.userInfo().id + } + this.loading = true + postAction('/problemKnowledgeBase/problemKnowledgeBaseCommentEO/add', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.$refs.ruleForm.clearValidate() + this.releaseData() + this.formInline = {} + this.loading = false + } else { + this.$message.warning(this.$t('operationFailed')) + this.loading = false + } + }) } }) }, @@ -398,6 +403,7 @@ font-size: 16px; color: #040B29; font-weight: 400; + word-break: break-word; } .content-icon { @@ -510,4 +516,5 @@ font-size: 16px; margin-bottom: 20px; } + \ No newline at end of file From 791c7dd4485e47aa507f732b587905df937d00b1 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 12 Aug 2022 17:18:49 +0800 Subject: [PATCH 17/49] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF-4?= =?UTF-8?q?=E8=A1=8C-=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 --- .../service/impl/ParamsInfoEOServiceImpl.java | 72 +++++++++---------- .../vo/CertCategoryParamsInfoEnExport.java | 2 +- .../vo/CertCategoryParamsInfoEnImport.java | 2 +- .../cert/template/vo/ParamsInfoEnExport.java | 14 ++-- .../cert/template/vo/ParamsInfoEnImport.java | 14 ++-- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 8316dee8e..b2dadc5c4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -386,7 +386,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params); @@ -950,7 +950,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl list = new ArrayList<>(); if (CutEnum.EN.getValue().equals(cut)) { - String fields[] ={ "*NIO Number", "*Number", "*Params Name","Description"}; + String fields[] ={ "*NIO Number", "*Number", "*Para Name","Description"}; params.setImportFields(fields); ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params); @@ -1235,7 +1235,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Fri, 12 Aug 2022 17:29:33 +0800 Subject: [PATCH 18/49] =?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 | 82 +++++-------------- .../components/problemKnowledgeBaseList.vue | 16 +++- jero-web/src/views/externalReports/index.vue | 13 +-- .../views/regulatoryEarlyWarning/index.vue | 82 +++++-------------- 4 files changed, 62 insertions(+), 131 deletions(-) diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 7ac897a66..d16d3dd57 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -195,7 +195,7 @@ this.queryParam = {} if (this.isDefault) { let startTime = moment(new Date()).format('YYYY-MM-DD') - let endTime = this.getNewDate('after', 6) + let endTime = this.haflYear() this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam = { ...this.queryParam } } @@ -217,68 +217,26 @@ } }) }, - getNewDate(flag, many) { - - const thirtyDays = [4, 6, 9, 11] // 30天的月份 - - const thirtyOneDays = [1, 3, 5, 7, 8, 10, 12] // 31天的月份 - - const currDate = new Date() // 今天日期 - - const year = currDate.getFullYear() - - let month = currDate.getMonth() + 1 - - let targetDateMilli = 0 - - let GMTDate = '' // 中国标准时间 - - let targetYear = '' // 年 - - let targetMonth = '' // 月 - - let targetDate = '' // 日 - - let dealTargetDays = '' // 目标日期 - - const isLeapYear = !!((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) // 是否是闰年 - - let countDays = 0 // 累计天数 - - for (let i = 0; i < many; i++) { - - if (flag === 'before') { - - month = month - 1 <= 0 ? 12 : month - 1 - - } else { - - month = month + 1 > 12 ? 1 : month + 1 - - } - - thirtyDays.includes(month) ? (countDays += 30) : thirtyOneDays.includes(month) ? (countDays += 31) : isLeapYear ? (countDays += 29) : (countDays += 28) + haflYear() { + // 先获取当前时间 + var curDate = (new Date()).getTime() + // 将半年的时间单位换算成毫秒 + var halfYear = 365 / 2 * 24 * 3600 * 1000 + // 半年前的时间（毫秒单位） + var pastResult = curDate - halfYear + // 日期函数，定义起点为半年前 + var pastDate = new Date(pastResult) + var pastYear = pastDate.getFullYear() + var pastMonth = pastDate.getMonth() + 1 + var pastDay = pastDate.getDate() + if (pastMonth >= 1 && pastMonth <= 9) { + pastMonth = '0' + pastMonth } - - targetDateMilli = currDate.setDate( - currDate.getDate() - (flag === 'before' ? countDays : countDays * -1) - ) - - GMTDate = new Date(targetDateMilli) - - targetYear = GMTDate.getFullYear() - - targetMonth = GMTDate.getMonth() + 1 - - targetDate = GMTDate.getDate() - - targetMonth = targetMonth.toString().padStart(2, '0') - - targetDate = targetDate.toString().padStart(2, '0') - - dealTargetDays = `${targetYear}-${targetMonth}-${targetDate}` - - return dealTargetDays + if (pastDay >= 0 && pastDay <= 9) { + pastDay = '0' + pastDay + } + var endDate = pastYear + '-' + pastMonth + '-' + pastDay + return endDate }, dateChange(item) { this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD') diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 0c8e92dd4..2b3175a5f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -123,8 +123,8 @@ } }) }, - classificationMaintenanceModelForm(){ - this.replacePage() + classificationMaintenanceModelForm() { + this.replacePage() }, onSearch() { this.pageNo = 1 @@ -361,6 +361,18 @@ text-align: center; line-height: 10; } + + ::v-deep .ant-tag { + padding: 2px 4px; + background: #9B9DA9; + color: #fff!important; + } + ::v-deep .ant-tag-checkable:not(.ant-tag-checkable-checked):hover{ + color: #fff!important; + } + ::v-deep .ant-tag-checkable-checked{ + background: #21c9cc; + } + diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index d16d3dd57..5d0b4c20b 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -168,7 +168,7 @@ }, searchQueryList: { type: Array, - default: ()=>{ + default: () => { return [] } }, @@ -223,7 +223,7 @@ // 将半年的时间单位换算成毫秒 var halfYear = 365 / 2 * 24 * 3600 * 1000 // 半年前的时间（毫秒单位） - var pastResult = curDate - halfYear + var pastResult = curDate + halfYear // 日期函数，定义起点为半年前 var pastDate = new Date(pastResult) var pastYear = pastDate.getFullYear() @@ -235,7 +235,7 @@ if (pastDay >= 0 && pastDay <= 9) { pastDay = '0' + pastDay } - var endDate = pastYear + '-' + pastMonth + '-' + pastDay + var endDate = pastYear + '-' + pastMonth + '-' + (pastDay + 1) return endDate }, dateChange(item) { diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 8dca555ed..a2d0ce102 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -244,7 +244,7 @@ // 将半年的时间单位换算成毫秒 var halfYear = 365 / 2 * 24 * 3600 * 1000 // 半年前的时间（毫秒单位） - var pastResult = curDate - halfYear + var pastResult = curDate + halfYear // 日期函数，定义起点为半年前 var pastDate = new Date(pastResult) var pastYear = pastDate.getFullYear() @@ -256,7 +256,7 @@ if (pastDay >= 0 && pastDay <= 9) { pastDay = '0' + pastDay } - var endDate = pastYear + '-' + pastMonth + '-' + pastDay + var endDate = pastYear + '-' + pastMonth + '-' + (pastDay + 1) return endDate }, pageOnChange(page) { From 20c6aeb8b5f47b645cbc02cccb7f55842cb5b377 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 15 Aug 2022 10:34:30 +0800 Subject: [PATCH 28/49] =?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/menu/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/menu/index.js b/jero-web/src/components/menu/index.js index 1b5f3c0fd..6255cfdd4 100644 --- a/jero-web/src/components/menu/index.js +++ b/jero-web/src/components/menu/index.js @@ -109,7 +109,7 @@ export default { props = { to: { path: menu.path } } } - const attrs = { href: menu.path, target: menu.meta.target } + const attrs = { href: menu.path, target: menu.meta.target , title:menu.meta.title } if (menu.children && menu.alwaysShow) { // 把有子菜单的 并且 父菜单是要隐藏子菜单的 @@ -162,7 +162,7 @@ export default { span slot = 'title' > { this.renderIcon(menu.meta.icon) } - < span > { menu.meta.title } < /span> + < span title={menu.meta.title}> { menu.meta.title } < /span> < /span> { itemArr From 6e402a3ac8f0bcfd36b16a9594a327eddbf5034e Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 15 Aug 2022 10:48:39 +0800 Subject: [PATCH 29/49] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=20=E6=90=9C=E7=B4=A2=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E4=B8=BA1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 27e096bb4..1a2c2fbb3 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -877,6 +877,7 @@ sqp['superQueryMatchType'] = matchType } this.queryParamQuery = sqp + this.$refs.CollectionTabel.pageNo = 1 // this.$refs.CollectionTabel.getTableList(this.queryParamQuery) eventBUs.$emit('getTableList',this.queryParamQuery) }, @@ -1563,12 +1564,13 @@ handleCody() { }, searchQuery() { - this.pageNo = 1 + this.$refs.CollectionTabel.pageNo = 1 this.$refs.CollectionTabel.getTableList() }, searchReset() { this.formInline = {} this.queryParamQuery = {} + this.$refs.CollectionTabel.pageNo = 1 this.$refs.CollectionTabel.getTableListReset() this.$refs.globalAdvancedQueryRef.handleReset() // this.$refs.globalAdvancedQueryRef.emitCallback() From cd5daab666d6afe7c179d24544a0e5c54150083d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 15 Aug 2022 11:11:38 +0800 Subject: [PATCH 30/49] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= 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, 3 insertions(+), 1 deletion(-) 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 5234a90d6..e85f66024 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 @@ -2,6 +2,7 @@ package com.jero.modules.report.util; import cn.hutool.core.util.ObjectUtil; import com.jero.common.constant.enums.CutEnum; +import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl; import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; import com.jero.modules.report.entity.NewOpinionTemplateEO; import com.jero.modules.report.entity.NewStandardTemplateEO; @@ -173,7 +174,8 @@ public class WordUtil { XWPFRun run = logo.createRun(); String imgFile = logoFilePath; - InputStream is = new FileInputStream(imgFile); + InputStream is = WordUtil.class.getClassLoader().getResourceAsStream("static/home/weilai.png"); +// InputStream is = new FileInputStream(imgFile); XWPFPicture picture = run.addPicture(is, XWPFDocument.PICTURE_TYPE_PNG, imgFile, Units.toEMU(95), Units.toEMU(35)); String blipID = ""; for(XWPFPictureData picturedata : header.getAllPackagePictures()) { //这段必须有，不然打开的logo图片不显示 From 3a396ace342ba4f3c28cbbaa6e894cae09bfa5f6 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 15 Aug 2022 11:19:49 +0800 Subject: [PATCH 31/49] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA--=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index e57924d30..97c036c68 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -461,10 +461,12 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl reportTitleOneList = lawsMonthlyReportTitleTemplateEOService.list(wrapper); //蔚来汽车法规月报-202004-主页面-CN //NIO Monthly Report on Automobile Regulations-202004-Main Page-EN - String memoriesChapterCN = path + File.separator +"蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"主页面-CN.docx"; - String memoriesChapterEN = path + File.separator +"NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-Main Page-EN.docx"; - String memoriesChapterContentCn = path + File.separator +"蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-CN.docx"; - String memoriesChapterContentEn = path + File.separator +"Weilai Automobile Regulations Monthly Report-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; + String memoriesChapterCN = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-主页面-CN.docx"; + String memoriesChapterEN = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-主页面-EN.docx"; +// String memoriesChapterEN = path + File.separator +"NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-Main Page-EN.docx"; + String memoriesChapterContentCn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-CN.docx"; + String memoriesChapterContentEn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; +// String memoriesChapterContentEn = path + File.separator +"Weilai Automobile Regulations Monthly Report-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; String titleCN = "蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth(); String titleEN = "NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth(); From ff238805643d5b187902e16aa42d85036ae2b328 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 15 Aug 2022 11:46:12 +0800 Subject: [PATCH 32/49] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=90=8E--=E4=BF=AE=E6=94=B9=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 97c036c68..712e5851f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -441,7 +441,23 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl list = new ArrayList<>(); + if(StringUtils.isBlank(lawsMonthlyReportWriteEO.getIds())){ + //导出全部 + list = this.list(); + }else{ + //导出部分 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(LawsMonthlyReportWriteEO::getId,Arrays.asList(lawsMonthlyReportWriteEO.getIds().split(","))); + list = this.list(lambdaQueryWrapper); + } + for (LawsMonthlyReportWriteEO monthlyReportWriteEO : list) { + monthlyReportWriteEO.setExportState(ExportStateEnum.HAS_BEEN_EXPORT.getValue()); + } + if(list.size() != 0){ + this.updateBatchById(list); + } } From bcf64df60f5a60c1fa4a3a1adf0beae09d59b3ee Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 15 Aug 2022 11:56:12 +0800 Subject: [PATCH 33/49] =?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/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../regulationReport/components/RegulationMonthlyFill.vue | 5 +++-- .../documentComparison/components/commentList.vue | 2 +- .../documentComparison/components/initiateComparison.vue | 2 ++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 48dccaec0..5e03aefe8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1259,4 +1259,5 @@ module.exports = { pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order', currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up', currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', + weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report', } \ 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 89ac86b7b..c95accf02 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1361,4 +1361,5 @@ module.exports = { pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', + weilaiRegulationMonthlyReport:'蔚来法规月报', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 587a41d0c..07f45bb72 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -187,7 +187,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -227,10 +227,11 @@ ids: selectedRowKeys.join(','), ...this.queryParam } - downloadFile(this.url.exportData, this.$t('monthlyReportRegulations') + '.zip', query, this.Deselect) + downloadFile(this.url.exportData, this.$t('weilaiRegulationMonthlyReport') + '-' + this.queryParam.month + '.zip', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] + this.getList() }, addContentClick() { this.$refs.fillAddRef.add() diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue index 7d27bc8fd..ff412e442 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue @@ -391,7 +391,7 @@ } .box-input { - width: calc(100% - 168px); + width: calc(100% - 183px); margin-right: 8px; } diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index 5c02c7ce8..3153f2097 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -71,6 +71,7 @@ {{$t('selectedStandard')}} {{selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')}} @@ -135,6 +136,7 @@ {{$t('selectedStandard')}} {{selectedRowKeysRightRecord[0]?selectedRowKeysRightRecord[0].serialNumber+' '+selectedRowKeysRightRecord[0].fileName:$t('noComparisonDocumentSelected')}} From a4fc2b2eea302e7410ba2632055e8a965b14cea2 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 15 Aug 2022 11:58:02 +0800 Subject: [PATCH 34/49] =?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 --- .../documentComparison/components/initiateComparison.vue | 2 ++ .../src/views/documentTools/documentComparison/index.vue | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index 3153f2097..1191b6f42 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -535,6 +535,8 @@ .box-button-standard-right { width: calc(100% - 111px); height: 46px; + padding: 0 4px; + box-sizing: border-box; display: inline-block; border: 1px solid #CED0D8; overflow: hidden; diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index fc77284d1..c12995fcd 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -8,8 +8,8 @@
{{$t('standard')}}
- +
@@ -17,8 +17,8 @@
{{$t('title')}}
- +
From eff87ee9a8ad21ee802568412e8e749e805ed811 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 15 Aug 2022 12:03:14 +0800 Subject: [PATCH 35/49] =?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 --- .../documentComparison/components/comparisonResults.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue index 3f08f75da..4c910cdfe 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue @@ -450,6 +450,9 @@ border-radius: 4px 0px 0px 4px; border-right: 1px #EFF1F3 solid; padding-left: 24px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .detail-content-header-content-content { @@ -460,6 +463,9 @@ border-radius: 4px 0px 0px 4px; border-right: 1px #EFF1F3 solid; padding-left: 24px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .detail-content-header-content-right { @@ -469,6 +475,9 @@ background: rgba(4, 11, 41, 0.0300); border-radius: 4px 0px 0px 4px; padding-left: 24px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } From 994037a5a412a0a16f850abeb8aac56c22b2cd2a Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 15 Aug 2022 12:32:59 +0800 Subject: [PATCH 36/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=92=8C=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareInfoController.java | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index 2623a233d..696355fcb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -2,14 +2,13 @@ package com.jero.modules.compare.controller; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; @@ -17,6 +16,8 @@ import com.jero.modules.compare.entity.SarFileCompareDetailVO; import com.jero.modules.compare.entity.SarFileCompareInfo; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -50,22 +51,33 @@ public class SarFileCompareInfoController extends JeroController queryPageList(SarFileCompareInfo sarFileCompareInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - @RequestParam(name = "cut", defaultValue = "cn") String cut, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareInfo, req.getParameterMap()); + public Result queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "cut", defaultValue = "cn") String cut, + @RequestParam(name = "serialNumber", defaultValue = "") String serialNumber, + @RequestParam(name = "title", defaultValue = "") String title, + @RequestParam(name = "releaseState", defaultValue = "") String releaseState, + HttpServletRequest req) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.eq("create_by", sysUser.getUsername()).or().eq("release_state", ReleaseConditionEnum.PUBLISHED.getValue()); - queryWrapper.orderByAsc("create_by"); + queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.eq(SarFileCompareInfo::getCreateBy, sysUser.getUsername()).or().eq(SarFileCompareInfo::getReleaseState, ReleaseConditionEnum.PUBLISHED.getValue())); + if (StringUtils.isNotBlank(serialNumber)) { + String finalSerialNumber = serialNumber.replace("%", "\\%");; + queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.like(SarFileCompareInfo::getSerialNumberLeft, finalSerialNumber).or().like(SarFileCompareInfo::getSerialNumberRight, finalSerialNumber)); + + } + if (StringUtils.isNotBlank(title)) { + String finalTitle = title.replace("%", "\\%"); + queryWrapper.and(i -> i.like(SarFileCompareInfo::getTitleLeft, finalTitle).or().like(SarFileCompareInfo::getTitleRight, finalTitle)); + } + if (StringUtils.isNotBlank(releaseState)) { + queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.eq(SarFileCompareInfo::getReleaseState, releaseState)); + } + queryWrapper.orderByDesc(SarFileCompareInfo::getCreateTime); Page page = new Page<>(pageNo, pageSize); IPage pageList = sarFileCompareInfoService.page(page, queryWrapper); for (SarFileCompareInfo info : pageList.getRecords()) { From 688cb5956f80d9c38dbe7927c31e93ffd50425a6 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 15 Aug 2022 13:57:08 +0800 Subject: [PATCH 37/49] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=A1=AB=E5=86=99--=E6=B3=95=E8=A7=84=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsMonthlyReportWriteEO.java | 4 +- .../LawsMonthlyReportWriteEOServiceImpl.java | 39 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) 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 d5244a469..127853d68 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 @@ -162,7 +162,9 @@ public class LawsMonthlyReportWriteEO implements Serializable { /**法规联系人*/ @Excel(name = "法规联系人", width = 15) @ApiModelProperty(value = "法规联系人") - private java.lang.String lawsContact; + private java.lang.String lawsContact;//存id + @TableField(exist = false) + private java.lang.String lawsContactName;//存用户名 /**链接*/ @Excel(name = "链接", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 712e5851f..3236082de 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -1,6 +1,7 @@ package com.jero.modules.report.service.impl; import cn.hutool.core.util.ZipUtil; +import com.alibaba.fastjson.JSONObject; import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -289,6 +290,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl pageInfo = this.page(page, queryWrapper); //法规月报id List lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); + List userIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getLawsContact).collect(Collectors.toList()); + List userIds = new ArrayList<>(); + for (String s : userIdList) { + if(StringUtils.isNotBlank(s)){ + if(s.contains(",")){ + userIds.addAll(Arrays.asList(s.split(","))); + }else{ + userIds.add(s); + } + } + } + List jsonObjects = sysBaseApi.queryUsersByIds(StringUtils.join(userIds, ",")); + List userList = new ArrayList<>(); + for (JSONObject jsonObject : jsonObjects) { + LoginUser loginUser = JSONObject.parseObject(jsonObject.toJSONString(), LoginUser.class); + userList.add(loginUser); + } + //获取章节目录 List lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); @@ -311,6 +330,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() @@ -356,6 +377,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + String lawsContact = lawsMonthlyReportWriteEO.getLawsContact(); + if(StringUtils.isNotBlank(lawsContact)){ + List collect = userList.stream().filter(e -> lawsContact.contains(e.getId())).collect(Collectors.toList()); + StringBuilder sb = new StringBuilder(); + for (String s : lawsContact.split(",")) { + List loginUserList = collect.stream().filter(e -> e.getId().equals(s)).collect(Collectors.toList()); + if(loginUserList.size() != 0){ + sb.append(loginUserList.get(0).getUsername()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + lawsMonthlyReportWriteEO.setLawsContactName(substring); + } + } + } + @Override public void exportMonthlyReport(HttpServletResponse response, HttpServletRequest request, From cffa714da5feb1f94980004db6aba89f720e8a4d Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 15 Aug 2022 14:01:15 +0800 Subject: [PATCH 38/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=92=8C=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extRepo/service/impl/ExtRepoFolderServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 baee6ebaa..30df6c310 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 @@ -222,7 +222,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl queryTreeList() { try { List list = queryList(); - List res = getSubFolder(superFolder, list, 1, true); + List res = getSubFolder(superFolder, list, 1); Collections.sort(res); return res; } catch (Exception ex) { @@ -235,22 +235,22 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getSubFolder(String supId, List list, int level, boolean needAuth) { + private List getSubFolder(String supId, List list, int level) { List resList = new ArrayList<>(); for (ExtRepoFolder erf : list) { if (supId.equals(erf.getSupFolder())) { int childLevel = level + 1; - if (!needAuth || haveViewAuth(erf.getId())) { + if (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.setChildren(getSubFolder(erf.getId(), list, childLevel)); date.sortChildren(); resList.add(date); } else { - resList.addAll(getSubFolder(erf.getId(), list, childLevel, true)); + resList.addAll(getSubFolder(erf.getId(), list, childLevel)); } } } From ca78226faa90b4676760b6fa4a190ed9ed7ebb43 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 15 Aug 2022 14:47:44 +0800 Subject: [PATCH 39/49] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E6=9F=A5=E7=9C=8B-=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=AF=BC=E5=87=BA-bug57881-=E8=A7=A3=E5=86=B3sheetName?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/project/util/ExcelUtil.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java index efca534c0..2d95445af 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; @@ -120,7 +121,8 @@ public class ExcelUtil { int partNameNum = 0; for (int i = 0; i < workbook.getNumberOfSheets(); i++) {//获取每个Sheet表 sheet = workbook.getSheetAt(i); - WorksheetPart worksheetPart = (WorksheetPart) pkg.getParts().get(new PartName("/xl/worksheets/" + sheet.getSheetName().toLowerCase() + ".xml")); + String sheetName = "sheet" + (i+1); // xml下的表格名称 不是sheet页签名称 + WorksheetPart worksheetPart = (WorksheetPart) pkg.getParts().get(new PartName("/xl/worksheets/" + sheetName + ".xml")); partNameNum++; //获得数据的总行数 @@ -153,7 +155,7 @@ public class ExcelUtil { String key = (String) imgMap.get("key"); String text = (String) imgMap.get("text"); byte[] bytes = (byte[]) imgMap.get("bytes"); - if (("${" + key + "}").equals(cellValue)) { + if (StringUtils.isNotEmpty(cellValue) && cellValue.contains("${" + key + "}")) { // 根据图片大小调整行高 ByteArrayInputStream in = new ByteArrayInputStream(bytes); @@ -165,7 +167,7 @@ public class ExcelUtil { } // 插入图片到表格 - putImagePOI(worksheetPart, pkg, cell, bytes, sheet.getSheetName().toLowerCase(), String.valueOf(partNameNum)); + putImagePOI(worksheetPart, pkg, cell, bytes, sheetName, String.valueOf(partNameNum)); } } j++; // 单元格非空才++ From 4462182c801d5c047c81b633963cdfd20e0a0bc4 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 15 Aug 2022 15:22:02 +0800 Subject: [PATCH 40/49] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 3236082de..ff53dad1a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -140,6 +140,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList(); + for (NewOpinionTemplateEO newOpinionTemplateEO : newOpinionTemplateEOList) { + newOpinionTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId()); + } iNewOpinionTemplateEOService.saveBatch(newOpinionTemplateEOList); }else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ @@ -150,6 +153,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList(); + for (NewStandardTemplateEO newStandardTemplateEO : newStandardTemplateEOList) { + newStandardTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId()); + } iNewStandardTemplateEOService.saveBatch(newStandardTemplateEOList); } From 7b9bde82b2e4529c9b4e244913ce6f57c18b1b75 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 15 Aug 2022 15:32:42 +0800 Subject: [PATCH 41/49] =?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 --- .../regulationReport/components/RegulationMonthlyFill.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 07f45bb72..16c344de0 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -131,7 +131,7 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'lawsContact' + dataIndex: 'lawsContactName' }, { title: this.$t('completedBy'), From c1545afb0dee41d817af227900f2a777eb0e621c Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 15 Aug 2022 15:41:39 +0800 Subject: [PATCH 42/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E4=BF=AE=E6=94=B9fileId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compare/service/impl/SarFileCompareInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index f0d77ba71..24d378f67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -233,7 +233,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(leftInfo.getSerialNumber()); if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) { @@ -244,7 +244,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl> bussDocumentLibraryEOList1 = bussDocumentLibraryEOService.getListBySerialNumber(rightInfo.getSerialNumber()); if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList1)) { From 6eeb50b424afff4b6bdaf8df8f9903483b407c94 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 15 Aug 2022 15:42:53 +0800 Subject: [PATCH 43/49] =?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 --- .../technologyAssessment/components/initiatingProcess.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 583c1df2a..fad168e54 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -323,6 +323,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.getListOne() } eventBUs.$on('searchQuery', search => { From 5ee01df0b500ee7b91f5fad67091edca0b1ca4c4 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 15 Aug 2022 15:46:50 +0800 Subject: [PATCH 44/49] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index ff53dad1a..5e947cab4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -456,8 +456,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOService.list(); lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOS.stream() .filter(e -> memoriesChapterList.contains(e.getId())).collect(Collectors.toList()); - - String path = uploadpath + "/tempZip"; + long l = System.currentTimeMillis(); + String path = uploadpath + "/tempZip"+l; File fileTemp = new File(path); if (fileTemp.exists()) { fileTemp.delete(); @@ -477,13 +477,15 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Mon, 15 Aug 2022 16:01:50 +0800 Subject: [PATCH 45/49] =?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 --- .../views/documentManage/splitting/modules/SplitDetail.vue | 6 ++---- jero-web/src/views/externalReports/index.vue | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 91cf4407e..b3807a125 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -540,6 +540,7 @@ this.form.name = this.nodeItem.name this.form.itemName = this.nodeItem.itemName this.form.displaySeq = this.nodeItem.displaySeq + this.form = { ...this.form } this.menuRightVisible = true }, //树形删除 @@ -1314,7 +1315,7 @@ max-height: 39vh !important; } - .ant-modal-body { + .ant-modal-body { overflow-y: visible !important; } @@ -1388,11 +1389,9 @@ /*.title-text {*/ /* min-width: 73px !important;*/ /*}*/ - /*.split-detail-wrap {*/ /* height: 481px !important;*/ /*}*/ - /*.mainItem {*/ /* height: 500px;*/ /*}*/ @@ -1402,7 +1401,6 @@ /*.split-detail .split-detail-wrap .split-detail-left {*/ /* height: 735px !important;*/ /*}*/ - /*.mainItem {*/ /* height: 800px !important;*/ /*}*/ diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index a716c3f71..a3fb85c8b 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -645,6 +645,7 @@ export default { this.form.authViewIdsName = this.nodeItem.authViewIdsName this.form.folderName = this.nodeItem.folderName this.form.orderId = this.nodeItem.orderId + this.form = { ...this.form } this.menuRightVisible = true }, //树形删除 From fabc0f99148c6ebc2748572aab7e21e5f4249e54 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 15 Aug 2022 17:14:22 +0800 Subject: [PATCH 46/49] =?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/escalationlibrary/index.vue | 9 +++++---- .../components/ParameterCollectionEchart.vue | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index 3a5a5c50a..e514ad0be 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -43,8 +43,8 @@ :columns="columns" > - - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + + {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }} @@ -113,8 +113,9 @@ { title: this.$t('entryName'), align: 'center', - width: '10%', - dataIndex: 'projectName' + width: '13%', + dataIndex: 'projectName', + scopedSlots: { customRender: 'projectName' } }, { title: this.$t('ListTitle'), diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index 5688112ca..ef1051a7e 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -5,13 +5,13 @@ - + {{ d.label }} - + {{$t('Thepercentage')}} From ccadf18b0d98e9f4ebca761783a80e003fe47346 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 15 Aug 2022 17:25:33 +0800 Subject: [PATCH 47/49] =?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/common/lang/zh-cn.js | 2 +- .../businessSupport/collectionOfRegulatoryOpinions/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c95accf02..6a70fba00 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -495,7 +495,7 @@ module.exports = { toBeConfirmed: '待确认', Operator: '操作人', role: '角色', - operationContent: '操作内容', + OperationContent: '操作内容', operationTime: '操作时间', toDoProcess: '待办流程', processDone: '已办流程', diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index da4f75e4f..949aa6995 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -86,7 +86,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 160px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" From 3ddda6718c3d438ccf2afa88930ca54329973dc2 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 15 Aug 2022 17:50:52 +0800 Subject: [PATCH 48/49] =?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/initiatingProcess.vue | 2 +- .../technologyAssessment/components/initiatingProcess.vue | 2 ++ jero-web/src/views/processCenter/components/standardContent.vue | 1 - .../views/processCenter/processForm/evaluationProcess/index.vue | 2 +- .../views/processCenter/processForm/regulatoryProcess/index.vue | 2 ++ 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 929c4f38c..5d8242925 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -362,7 +362,7 @@ }, completeTask(value, taskId, isTrue) { let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') - value.operatorTime = handlingTime + value.handlingTime = handlingTime Object.keys(value).forEach(res => { if (value[res] && value[res] instanceof String) { value[res] = value[res].replace(/\"/g, '“') diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index fad168e54..cb0b66ab6 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -540,6 +540,8 @@ value[res] = value[res].replace(/\'/g, '‘') } }) + let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + value.handlingTime = operatorTime this.startProcess(value, dataList) }, startProcess(value, dataList) { diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index 44ddc7ec6..439443130 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -77,7 +77,6 @@ }, mounted() { this.queryForm = this.standardContentQuery - this.queryForm.taskExplain = 'sdf dsjf;l sdf;ldsf ;lsdfkj d;lsfkds;lfdksf第三方是德国搞定过分乐观看待给对方；公开地方领导反馈给东丽的反馈给管库给的给' }, methods: { urlClick(val) { diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 243e26780..1361ff125 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -309,7 +309,7 @@ completeTask() { let value = JSON.parse(JSON.stringify(this.queryProject)) let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') - value.operatorTime = handlingTime + value.handlingTime = handlingTime Object.keys(value).forEach(res => { if (value[res] && value[res] instanceof String) { value[res] = value[res].replace(/\"/g, '“') diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index d00ec8a03..71cb5ac64 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -173,6 +173,8 @@ }, completeTask() { let value = JSON.parse(JSON.stringify(this.queryProject)) + 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, '“') From 1a9bfcf2023b6268357b6842cf920a16543cb6e8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 15 Aug 2022 17:56:11 +0800 Subject: [PATCH 49/49] =?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 --- .../processList/tabComponents/alreadySend/index.vue | 8 +------- .../processList/tabComponents/monitorProcess/index.vue | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue index de39cef91..6b92ceb0c 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue @@ -87,13 +87,10 @@ }, { title: this.$t('createTime'), - dataIndex: 'createTime', + dataIndex: 'creatTime', align: 'center', ellipsis: true, width: 180, - customRender: function(t, r, index) { - return moment(t).format('YYYY-MM-DD HH:mm:ss') - } }, { title: this.$t('CompletionTime'), @@ -101,9 +98,6 @@ align: 'center', ellipsis: true, width: 180, - customRender: function(t, r, index) { - return moment(t).format('YYYY-MM-DD HH:mm:ss') - } }, { title: this.$t('ProcessStatus'), diff --git a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue index 5df28512c..6648dfbd2 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue @@ -87,13 +87,10 @@ }, { title: this.$t('createTime'), - dataIndex: 'createTime', + dataIndex: 'creatTime', align: 'center', ellipsis: true, width: 180, - customRender: function(t, r, index) { - return moment(t).format('YYYY-MM-DD HH:mm:ss') - } }, { title: this.$t('CompletionTime'), @@ -101,9 +98,6 @@ align: 'center', width: 180, ellipsis: true, - customRender: function(t, r, index) { - return moment(t).format('YYYY-MM-DD HH:mm:ss') - } }, { title: this.$t('ProcessStatus'),