From 72ecc67954de982d053a199650d4c2e0fdac9581 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sat, 7 May 2022 15:19:11 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 164 ++++++++++++++---- 1 file changed, 132 insertions(+), 32 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 539f3dfb3..0ff8e7969 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 @@ -1405,12 +1405,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(titleOne.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ @@ -1598,12 +1597,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList = new ArrayList<>(); String value = ""; boolean flag = true; - //iProjectRelatedPersonnelService //编号验证 -// List bussDocumentLibraryEOList = verifySerialNumber(dataList,projectLawsInventoryEOTemp); + verifySerialNumber(dataList,projectLawsInventoryEOTemp); for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { i++; String errorMsg = ""; @@ -1944,6 +1951,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> mapCertificationList = (List>) objectMap.get("certificationEngineerList"); //工程接口人 List> mapPersonList = (List>) objectMap.get("engineeringInterfacePersonList"); + //所有人 + List> allPersonList = (List>) objectMap.get("allPersonList"); String nameCn = ""; String nameEn = ""; @@ -1952,7 +1961,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataList,ProjectLawsInventoryEO projectLawsInventoryEOTemp){ + //1. 验证标准号在文档库中是否存在 + List serialNumberList = dataList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList); + List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); + //文档库中可能存在重复的标准号 + List serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList()); + if(serialNumberList.size() != serialNumberListTemp.size()){ + //存在文档库没有的数据 + List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + List serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added"); + } + } + + //2. 验证标准号在法规清单中是否添加过 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(ProjectLawsInventoryEO::getSerialNumber,serialNumberList).in(ProjectLawsInventoryEO::getProjectLibraryId,projectLawsInventoryEOTemp.getProjectLibraryId()); + List projectLawsInventoryEOList = this.list(lambdaQueryWrapper); + List serialNumberTempList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); + if(projectLawsInventoryEOList.size() > 0){ + if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); + } + } + //3. 通过编号将导入的数据与文档库进行关联 + for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getSerialNumber().equals(projectLawsInventoryEO.getSerialNumber())).collect(Collectors.toList()); + projectLawsInventoryEO.setTitle(collect.get(0).getTitle());//标题 + projectLawsInventoryEO.setCorrespondingStandard(collect.get(0).getCorrespondingStandard());//对应标准 + projectLawsInventoryEO.setRegion(collect.get(0).getRegion());//适用地区 + projectLawsInventoryEO.setImplementTime(collect.get(0).getImplementTime());//在产车实施日期 + projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());//新车实施日期 + } + } + private void personnelVerify(ProjectLawsInventoryEO projectLawsInventoryEO, - String errorMsg, String regulationOwnerId, - List> mapList, - String nameCn,String nameEn) { + String errorMsg, List msgList, + String regulationOwnerId, + List> mapList, + String nameCn,String nameEn) { //单选 if(regulationOwnerId.contains(",")){ if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ @@ -2094,6 +2160,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Sat, 7 May 2022 15:32:50 +0800 Subject: [PATCH 02/14] =?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 | 126 +++++++++--------- .../components/PersonnelSelection/index.vue | 1 + jero-web/src/permission.js | 6 +- 3 files changed, 68 insertions(+), 65 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 79a382ccb..95fbb89a9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -15,7 +15,7 @@ module.exports = { frozen: 'frozen', reset: 'reset', putAway: 'Put away', - open: 'open', + open: 'More', addUser: 'add user', userInformation: 'user information', export: 'export', @@ -134,7 +134,7 @@ module.exports = { enterMobileNumber: 'Please enter your mobile phone number', enterAddress: 'Please enter the address', address: 'address', - remarks: 'remarks', + remarks: 'Comments', enterComments: 'Please enter comments', selectDepartmentFirst: 'Please select a department first!', OrganizationCode: 'Organization code', @@ -463,7 +463,7 @@ module.exports = { charactersLength1to300: '1 - 300 characters in length', OnlyOneSelected: 'Only one piece of data can be selected', OnlyPDF: 'Only PDF files can be imported', - open: 'open', + open: 'More', away: 'away', toDoProcess: 'To Do List', processDone: 'Process done', @@ -493,7 +493,7 @@ module.exports = { ProcessType: 'Process type', AddProcess: 'Add process', RelatedItems: 'Related items', - Sponsor: 'Sponsor', + Sponsor: 'Initiator', CurrentProcessor: 'Current processor', LastProcessor: 'Last processor', ProcessingTime: 'Processing time', @@ -534,7 +534,7 @@ module.exports = { unsubscribeConfirm: 'unsubscribe confirm?', confirmCancelCollection: 'confirm to cancel collection?', theRelease: 'The release date should not exceed the standard implementation date', - zoneOfApplication: 'zone of application', + zoneOfApplication: 'Area', releaseDate: 'release Date', standardImplementationTime: 'Standard implementation time', onlyPicture: 'only upload pictures!', @@ -582,20 +582,20 @@ module.exports = { instructionForUse: 'instruction for use', subtitle: 'Sub-Title', scopeOfApplication: 'Scope of application', - correspondingStandard: 'Corresponding standard', - implementationCategory: 'Implementation category', + correspondingStandard: 'Compare', + implementationCategory: 'Usage', certificationType: 'Certification Type', certificationLevel: 'Certification Level', areaOfResponsibility: 'Responsible Field', - confirmationOfDesignConformity: 'Design Compliance Check Deliverable', + confirmationOfDesignConformity: 'Design Compliance Check', Deliverables: 'Deliverables', - personLiable: 'person liable', - PrehomoConfirmation: 'Prehomo confirmation', - verificationAndConformityconfirmation: 'Verification and conformity confirmation', + personLiable: 'Assignee', + PrehomoConfirmation: 'Pre-homo Check', + verificationAndConformityconfirmation: 'Validation Compliance Check', StandardImplementationDate: 'Standard implementation date', - regulatoryEngineer: 'Regulatory Engineer', - certifiedEngineer: 'Certified Engineer', - engineeringInterfacePerson: 'Engineering interface person', + regulatoryEngineer: 'Regulation Engineer', + certifiedEngineer: 'Homologation Engineer', + engineeringInterfacePerson: 'Engineering Interface', typeOfDeliverables: 'Type of deliverables', deliverableTemplate: 'Deliverable template', entryName: 'entry name', @@ -609,7 +609,7 @@ module.exports = { certificationProgramInformation: 'Certification program information', taskReleaseStatus: 'Task release status', task: 'task', - TaskCutOffTime: 'Task cut-off time', + TaskCutOffTime: 'Due Date', Transfer: 'Transfer', CertificationDirectory: 'Certification directory', TaskRequirements: 'Task requirements', @@ -660,8 +660,8 @@ module.exports = { initiateTaskConfirmation: 'Initiate task confirmation', alteration: 'alteration', fixedPlate: 'Fixed plate', - taskAffirmStatus: 'task Affirm Status', - listConfirmationStatus: 'List confirmation status', + taskAffirmStatus: 'Task Confirmation Status', + listConfirmationStatus: 'List Confirmation Status', ListConfirmationDeadline: 'List confirmation deadline', dataConfirmation: 'Please select the data whose list confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty', pleaseSelectPersonFirst: 'Please select a person first', @@ -741,50 +741,50 @@ module.exports = { opinion: 'opinion', operationNode: 'operation node', taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty', - selectIssuer:'Select issuer', - sendBack:'send back', - taskConfirmationProcess:'Task confirmation process', - notFinished:'not finished', - Finished:'Finished', - theRequirementst:'The engineering interface person confirms the compliance requirements', - dataLoading:'Data loading...', - Submitting:'Submitting', - Returning:'Returning', - terminationProcessing:'Termination process', - publishComment:'publish comment', - record:'record', - replyToComments:'Reply to comments', - noComment:'No comment', - theReceived:'The final version can be made only when the list confirmation status and task confirmation status of all data are received', - notEvaluated:'Not evaluated', - cannotExceed:'cannot exceed', - Characters:'Characters', - standardInformation:'standardInformation', - VirtualList:'VirtualList', - importTemplate:'import template', - verificationConfirmationDeadline:'Verification compliance confirmation deadline', - technicalEvaluationResults:'technical evaluation results', - engineeringConfirmation:'engineeringConfirmation', - feedbackFromTheEngineer:'Feedback from the Engineer', - completedBy:'Completed by', - completedTime:'Completed time', - replyFromProjectContactPerson:'Reply from project contact person', - answer:'answer', - distributionEngineer:'Distribution Engineer', - reminderHandling:'Reminder handling', - addFeedback:'Add feedback', - engineer:'engineer', - engineeringConfirmationDetails:'Engineering confirmation details', - reminder:'reminder', - adopt:'adopt', - reviewedByThePersonInCharge:'Reviewed by the person in charge', - onlyDeleted:'Only data whose list confirmation status is not initiated or rejected can be deleted', - experimentPassed:'Experiment passed', - experimentFailed:'Experiment failed', - toBeStarted:'To be started', - inProgress:'In Progress', - green:'green', - red:'red', - blue:'blue', - yellow:'yellow', + selectIssuer: 'Select issuer', + sendBack: 'send back', + taskConfirmationProcess: 'Task confirmation process', + notFinished: 'not finished', + Finished: 'Finished', + theRequirementst: 'The engineering interface person confirms the compliance requirements', + dataLoading: 'Data loading...', + Submitting: 'Submitting', + Returning: 'Returning', + terminationProcessing: 'Termination process', + publishComment: 'publish comment', + record: 'record', + replyToComments: 'Reply to comments', + noComment: 'No comment', + theReceived: 'The final version can be made only when the list confirmation status and task confirmation status of all data are received', + notEvaluated: 'Not evaluated', + cannotExceed: 'cannot exceed', + Characters: 'Characters', + standardInformation: 'standardInformation', + VirtualList: 'VirtualList', + importTemplate: 'import template', + verificationConfirmationDeadline: 'Verification compliance confirmation deadline', + technicalEvaluationResults: 'technical evaluation results', + engineeringConfirmation: 'engineeringConfirmation', + feedbackFromTheEngineer: 'Feedback from the Engineer', + completedBy: 'Completed by', + completedTime: 'Completed time', + replyFromProjectContactPerson: 'Reply from project contact person', + answer: 'answer', + distributionEngineer: 'Distribution Engineer', + reminderHandling: 'Reminder handling', + addFeedback: 'Add feedback', + engineer: 'engineer', + engineeringConfirmationDetails: 'Engineering confirmation details', + reminder: 'reminder', + adopt: 'adopt', + reviewedByThePersonInCharge: 'Reviewed by the person in charge', + onlyDeleted: 'Only data whose list confirmation status is not initiated or rejected can be deleted', + experimentPassed: 'Experiment passed', + experimentFailed: 'Experiment failed', + toBeStarted: 'To be started', + inProgress: 'In Progress', + green: 'green', + red: 'red', + blue: 'blue', + yellow: 'yellow' } \ No newline at end of file diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index c03f72ed7..b417b1025 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -30,6 +30,7 @@ style="margin-bottom: 60px;height: 600px" v-if="treeVisible" checkable + checkStrictly :loading="loading" :tree-data="gData" @check="onCheck" diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index d0ac7014b..419112d34 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -49,8 +49,9 @@ router.beforeEach((to, from, next) => { message: '系统提示', description: '请求用户信息失败，请重试！' })*/ + // query: { redirect: to.fullPath } store.dispatch('Logout').then(() => { - next({ path: '/user/login', query: { redirect: to.fullPath } }) + next({ path: '/user/login', }) }) }) } else { @@ -62,7 +63,8 @@ router.beforeEach((to, from, next) => { // 在免登录白名单，直接进入 next() } else { - next({ path: '/user/login', query: { redirect: to.fullPath } }) + //query: { redirect: to.fullPath } + next({ path: '/user/login', }) NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } } From c5396b0465d8600bb79386f1cdb08b8c9df53643 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Sat, 7 May 2022 15:34:17 +0800 Subject: [PATCH 03/14] =?UTF-8?q?[update]=20=E5=AE=A2=E6=88=B7=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/searchaloneorc/index.vue | 250 ++++++++++++++++++ .../documentManage/ocr/modules/DocTable.vue | 6 +- 2 files changed, 253 insertions(+), 3 deletions(-) create mode 100644 jero-web/src/components/searchaloneorc/index.vue diff --git a/jero-web/src/components/searchaloneorc/index.vue b/jero-web/src/components/searchaloneorc/index.vue new file mode 100644 index 000000000..228495035 --- /dev/null +++ b/jero-web/src/components/searchaloneorc/index.vue @@ -0,0 +1,250 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue index 473c2b1a4..370ad0ec8 100644 --- a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue +++ b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue @@ -11,7 +11,7 @@ >
- +
@@ -34,13 +34,13 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 3cfe77f89..b104cef49 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -2,7 +2,7 @@
- +
@@ -37,7 +37,7 @@