From 027d6cc84ee5ce837d3e887c3a98df5cfd467687 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 11 Jul 2022 14:27:31 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E8=BF=98?= =?UTF-8?q?=E5=8E=9F=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 46302ea57..ab87459e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4766,9 +4766,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Mon, 11 Jul 2022 14:45:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index ab87459e4..763530ab2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -3144,7 +3144,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl", "").replaceAll("", ""); //您订阅的XXX已被修改 String contentInfo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to," +sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString(); - String msgTitle = "The" + technologyTerritoryNameEn + "technical field you subscribed to has been updated"; + String msgTitle = "The " + technologyTerritoryNameEn + " technical field you subscribed to has been updated"; // 封装消息的实体类 SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, msgTitle, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); @@ -3166,7 +3166,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Mon, 11 Jul 2022 17:16:45 +0800 Subject: [PATCH 3/8] =?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/virtualListDetails.vue | 17 ++++++++++++++++- .../processForm/handshakeProcess/index.vue | 3 ++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 6a178e9a5..7ae3c6526 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -162,6 +162,12 @@ {{text}} + + + + {{text}} + + {{record.designDeliverableTypeName}}
Date: Mon, 11 Jul 2022 18:02:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E5=AF=BC?= =?UTF-8?q?=E5=85=A5--=E7=BC=96=E5=8F=B7=E9=AA=8C=E9=87=8D=E4=B8=94?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 763530ab2..3e8e82250 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -1571,13 +1571,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = this.list(); - if(list.size() != 0){ - List serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); - if(serialNumberList.contains(serialNumber)){ - throw new JeroBootException("编号已存在不能重复添加"); - } - } +// List list = this.list(); +// if(list.size() != 0){ +// List serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); +// if(serialNumberList.contains(serialNumber)){ +// throw new JeroBootException("编号已存在不能重复添加"); +// } +// } SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); String issueTime = (String) (map.get("issue_time")); @@ -5453,6 +5453,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl serialNumberList = new ArrayList<>(); + if (mapList.size() != 0) { + for (Map map : mapList) { + serialNumberList.add(StringUtils.valueOf(map.get("serial_number"))); + } + } + List list = this.list(); + if(list.size() != 0){ + List serialNumberListTemp = list.stream() + .filter(e -> serialNumberList.contains(e.getSerialNumber())).collect(Collectors.toList()); + if(serialNumberListTemp.size() != 0){ + List collect = serialNumberListTemp.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException(StringUtils.join(collect,",")+" 编号已存在不能重复添加"); + }else{ + throw new JeroBootException(StringUtils.join(collect,",")+" already exists and cannot be added again"); + } + } + } + if (mapList.size() != 0) { for (Map map : mapList) { this.addInfo(map); From 28abd5bd4c25dcd76d553eb9e7eb901ed8c9652c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 11 Jul 2022 18:05:56 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=90=8D=E5=8D=95--=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectRelatedPersonnelServiceImpl.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/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 9c60e01fc..66e03ed80 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -265,7 +265,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl Date: Mon, 11 Jul 2022 18:17:50 +0800 Subject: [PATCH 6/8] =?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/OcrUpload/index.vue | 2 +- jero-web/src/components/SplitImport/index.vue | 2 +- jero-web/src/components/SplitUpload/index.vue | 2 +- .../components/importSplitUpload/index.vue | 2 +- .../src/components/uploadFileChange/file.vue | 22 +++++++++---------- .../components/uploadFileChangeDown/file.vue | 22 +++++++++---------- .../searchCenter/components/whole.vue | 1 + 7 files changed, 27 insertions(+), 26 deletions(-) diff --git a/jero-web/src/components/OcrUpload/index.vue b/jero-web/src/components/OcrUpload/index.vue index 67ba5063f..4dec33c23 100644 --- a/jero-web/src/components/OcrUpload/index.vue +++ b/jero-web/src/components/OcrUpload/index.vue @@ -32,7 +32,7 @@ return{ visible:false, uploadAction:window._CONFIG['domianURL']+"/sys/common/upload", - downLoadFileUrl:window._CONFIG['domianURL']+'/sys/common/static', + downLoadFileUrl:window._CONFIG['domianPreviewURL']+'/sys/common/static', myfileList:[], fileList:[], fileTypeSatus:false, diff --git a/jero-web/src/components/SplitImport/index.vue b/jero-web/src/components/SplitImport/index.vue index f616626eb..85a0fe05f 100644 --- a/jero-web/src/components/SplitImport/index.vue +++ b/jero-web/src/components/SplitImport/index.vue @@ -50,7 +50,7 @@ visible:false, // uploadAction:"http://10.0.1.25:8080/split/sarFileSplitItems/importSplitItems", uploadAction:window._CONFIG['domianURL']+"/split/sarFileSplitItems/importSplitItems", - downLoadFileUrl:window._CONFIG['domianURL']+'/sys/common/static', + downLoadFileUrl:window._CONFIG['domianPreviewURL']+'/sys/common/static', myfileList:[], fileList:[], fileTypeSatus:false, diff --git a/jero-web/src/components/SplitUpload/index.vue b/jero-web/src/components/SplitUpload/index.vue index 6c7a80208..15c818409 100644 --- a/jero-web/src/components/SplitUpload/index.vue +++ b/jero-web/src/components/SplitUpload/index.vue @@ -37,7 +37,7 @@ visible: false, uploadAction: window._CONFIG['domianURL'] + '/split/sarFileSplitItems/upload', upDataList: [], - downLoadFileUrl: window._CONFIG['domianURL'] + '/sys/common/static', + downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/static', fileList: [], myfileList: [], isLoding: false, diff --git a/jero-web/src/components/importSplitUpload/index.vue b/jero-web/src/components/importSplitUpload/index.vue index 8b17e8f92..1225b1edc 100644 --- a/jero-web/src/components/importSplitUpload/index.vue +++ b/jero-web/src/components/importSplitUpload/index.vue @@ -34,7 +34,7 @@ return { visible: false, uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload', - downLoadFileUrl: window._CONFIG['domianURL'] + '/sys/common/static', + downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/static', myfileList: [], fileList: [], fileTypeSatus: false, diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue index 5b7c3c846..60d65ec72 100644 --- a/jero-web/src/components/uploadFileChange/file.vue +++ b/jero-web/src/components/uploadFileChange/file.vue @@ -106,7 +106,7 @@ export default { this.fileTypeSatus = true }, mypreview(item) { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1) + let url = window._CONFIG['domianPreviewURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1) window.open(url, '_blank') }, handleChange(info) { @@ -188,17 +188,17 @@ export default { let index1 = fileName.lastIndexOf('.') let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) - if (fileSuffix === '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) - } else if (fileSuffix === '.docx') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - window.open(url, '_blank') - } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - window.open(url, '_blank') - } else { + // if (fileSuffix === '.pdf') { + // window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) + // } else if (fileSuffix === '.docx') { + // let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + // window.open(url, '_blank') + // } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { + // let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + // window.open(url, '_blank') + // } else { downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) - } + // } } } } diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue index 09ba46494..df598bc41 100644 --- a/jero-web/src/components/uploadFileChangeDown/file.vue +++ b/jero-web/src/components/uploadFileChangeDown/file.vue @@ -129,7 +129,7 @@ import { mapGetters } from 'vuex' this.fileTypeSatus = true }, mypreview(item) { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1) + let url = window._CONFIG['domianPreviewURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1) window.open(url, '_blank') }, handleChange(info) { @@ -211,17 +211,17 @@ import { mapGetters } from 'vuex' let index1 = fileName.lastIndexOf('.') let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) - if (fileSuffix === '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id)) - } else if (fileSuffix === '.docx') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - window.open(url, '_blank') - } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - window.open(url, '_blank') - } else { + // if (fileSuffix === '.pdf') { + // window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id)) + // } else if (fileSuffix === '.docx') { + // let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + // window.open(url, '_blank') + // } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { + // let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + // window.open(url, '_blank') + // } else { downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) - } + // } } } } diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index 43aaff7fb..e74325c77 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -107,6 +107,7 @@ conList: [], total: 0, pageSize: 10, + downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, queryParam: {} } From de16f6920ccf54a9ae3656ecb3afa834a23b4cbf Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 11 Jul 2022 18:23:20 +0800 Subject: [PATCH 7/8] =?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/projectManagement/components/listOfRegulations.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e5ee987c5..fa31b4536 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1503,7 +1503,7 @@ } } for (let i = 0; i < dataList.length; i++) { - if ((dataList[i].taskAffirmStatus == 'Not started' || dataList.taskAffirmStatus == 'Rejected') && + if ((dataList[i].taskAffirmStatus == 'Not started' || dataList[i].taskAffirmStatus == 'Rejected') && dataList[i].inventoryAffirmStatus == 'Accepted') { if (dataList[i].engineeringInterfacePerson) { if (dataList[i].verifyDeliverableType) { From f9399216374b59a544019bd065d0e45502a02f5b Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 11 Jul 2022 20:08:08 +0800 Subject: [PATCH 8/8] =?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/viewFileModel/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/components/viewFileModel/index.vue b/jero-web/src/components/viewFileModel/index.vue index 945838eee..6dafa860e 100644 --- a/jero-web/src/components/viewFileModel/index.vue +++ b/jero-web/src/components/viewFileModel/index.vue @@ -2,6 +2,7 @@