From e035f46fda61bd3489e609fb7b59226184f1580f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 9 Oct 2023 14:26:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E6=B6=88=E6=81=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/project/job/PrehomoJob.java | 4 +- ...ojectTaskInventoryDetailEOServiceImpl.java | 26 ++++----- .../ProjectTaskInventoryEOServiceImpl.java | 54 +++++++++---------- ...ectTaskInventoryFeedbackEOServiceImpl.java | 52 +++++++++--------- 4 files changed, 69 insertions(+), 67 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java index 04736c68e..2c0a4ac94 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java @@ -73,7 +73,7 @@ public class PrehomoJob implements Job { @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { log.info("prehomo流程，定时任务开启 ====================================================="); - +/* //查询出已经启动了prehomo流程的数据。 并且流程没有结束。 QueryWrapper queryProjectTaskInventoryWrapper = new QueryWrapper<>(); queryProjectTaskInventoryWrapper.isNotNull("prehomo_p_id"); @@ -367,5 +367,7 @@ public class PrehomoJob implements Job { } } log.info("prehomo流程，定时任务结束 ====================================================="); + + */ } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index 6be203fab..582a40d6c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -543,19 +543,19 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl Date: Mon, 9 Oct 2023 18:07:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=92=8C=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=20=20=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/AuthDummyInventoryInfoEO.java | 5 ++ .../AuthDummyInventoryInfoEOServiceImpl.java | 22 +++++---- .../ProjectCertificationInventoryEO.java | 5 ++ ...ctCertificationInventoryEOServiceImpl.java | 30 +++++++++--- .../certificationList/components/addModel.vue | 49 ++++++++++++++++++- .../components/certificationList/index.vue | 7 +++ .../components/addModel.vue | 24 +++++++++ .../components/editModel.vue | 31 +++++++++++- .../certificationListMaintenance.vue | 7 +++ 9 files changed, 161 insertions(+), 19 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index f627832be..43f046ec2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -161,4 +161,9 @@ public class AuthDummyInventoryInfoEO implements Serializable { /**认证类型*/ @ApiModelProperty(value = "认证类型") private String attestationType; + + /**备注*/ + @ApiModelProperty(value = "备注") + @Excel(name = "备注", width = 50) + private String remark; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 6ddfe2164..091cf57c6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -961,9 +961,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl 1){ @@ -1623,8 +1623,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl collect = bussDocumentLibraryEOList.stream() - .filter(e -> e.getSerialNumber().equals(authDummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); - authDummyInventoryInfoEO.setBussDocumentLibraryId(collect.get(0).getId()); + .filter(e -> e.getSerialNumber().trim().equals(authDummyInventoryInfoEO.getSerialNumber().trim())).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(collect)){ + authDummyInventoryInfoEO.setBussDocumentLibraryId(collect.get(0).getId()); + } } } // //2. 验证标准号在法规清单中是否添加过 @@ -1705,6 +1707,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl list = Arrays.asList(title.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ - index = list.indexOf("交付物模板") + 1; + index = list.indexOf("备注") + 1; }else{ - index = list.indexOf("Deliverable Template") + 1; + index = list.indexOf("Remark") + 1; } //创建临时文件夹 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index e08add5f6..816d2d002 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -256,6 +256,11 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "认证类型") private String attestationType; + /**备注*/ + @ApiModelProperty(value = "备注") + @Excel(name = "备注", width = 50) + private String remark; + /**一级责任领域**/ @TableField(exist = false) private String firstLevelDutyTerritory; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index c9c01689f..2bfe78073 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -4459,11 +4459,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 1){ @@ -4817,6 +4817,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 500){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ + message = errorMsg + "备注不能超过500个字符"; + }else{ + message = errorMsg + " The Remark cannot contain more than 200 characters"; + } + msgList.add(message); + } + } + } return msgList; } @@ -5659,6 +5673,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(title.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - index = list.indexOf("生产企业名称") + 1; + index = list.indexOf("备注") + 1; }else{ - index = list.indexOf("Name Of Manufacturer") + 1; + index = list.indexOf("Remark") + 1; } //创建临时文件夹 diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 633656b76..3bb460671 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -321,7 +321,24 @@ - + + +
+
+ {{$t('remarks')}} +
+ + + +
+ + @@ -638,6 +655,22 @@ + + +
+
+ {{$t('remarks')}} +
+ + + +
+ +
@@ -770,7 +803,14 @@ message: this.$t('configurationItem') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } - ] + ], + remark:[ + { + max: 500, + message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + trigger: 'blur' + } + ], }, disabled: false, flowdisabled: false, @@ -1258,6 +1298,11 @@ ::v-deep .ant-form-item-with-help { margin-bottom: 25px; } + .itemModel-text { + width: calc(100% - 130px); + display: inline-block; + margin-top: 2px; + } \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 741455b05..0e5e4a6eb 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -222,6 +222,22 @@
+ + +
+
+ {{$t('remarks')}} +
+ + + +
+ +
@@ -325,7 +341,14 @@ message: this.$t('Deliverables') + this.$t('cannotEmpty'), trigger: 'change' } - ] + ], + remark:[ + { + max: 500, + message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + trigger: 'blur' + } + ], } } }, @@ -560,4 +583,10 @@ ::v-deep .ant-form-item-with-help { margin-bottom: 25px; } + + .itemModel-text { + width: calc(100% - 130px); + display: inline-block; + margin-top: 2px; + } \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 2cbaa8960..229b5bca9 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -429,6 +429,13 @@ ellipsis: true, scopedSlots: { customRender: 'deliverableTemplate' } }, + { + title: this.$t('remarks'), + align: 'left', + dataIndex: 'remark', + width: 330, + ellipsis: true + }, { title: this.$t('operation'), align: 'left', From 7a52087ec3265f25ec961e172c2d269df21011ba Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 10 Oct 2023 11:18:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index 31f23a177..8878e44fe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -4555,11 +4555,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ title = "*类别,*检验项目,*认证类型,*WVTA ID," + "*标准编号,*责任领域,*工程接口人,*责任人," + - "交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称"; + "交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称,备注"; }else { title = "*Category,*Inspection Items,*Certification Type,*WVTA ID," + "*Standard No,*Responsible Field,*Eng. Interface,*Assignee," + - "Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer"; + "Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer,Remark"; } int pos = file.getOriginalFilename().lastIndexOf("."); @@ -4675,7 +4675,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if (i == 0) { cell.setCellType(HSSFCell.CELL_TYPE_STRING); headerSb.append(cell.getStringCellValue() + ","); - if(j == 14){ + if(j == 15){ break; } } else if(i > 1){ @@ -5823,6 +5823,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI case "产品型号": return "productModel"; case "生产企业名称": return "productionEnterpriseName"; case "认证进度": return "certificationProgress"; + case "备注": return "remark"; case "*Category": return "category"; case "*Inspection Items": return "inspectionItem"; @@ -5842,6 +5843,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI case "Product Model": return "productModel"; case "Name Of Manufacturer": return "productionEnterpriseName"; case "Homologation Progress": return "certificationProgress"; + case "Remark": return "remark"; default: return null; //"Deliverable Type,Deliverable Template,initiator,Assignee,Due Date," + @@ -5866,19 +5868,19 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ title = "*类别,*检验项目,*认证类型,*WVTA ID," + "*标准编号,*责任领域,*工程接口人,*责任人," + - "交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称"; + "交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称,备注"; }else { title = "*Category,*Inspection Items,*Certification Type,*WVTA ID," + "*Standard No,*Responsible Field,*Eng. Interface,*Assignee," + - "Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer"; + "Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer,Remark"; } List list = Arrays.asList(title.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - index = list.indexOf("生产企业名称") + 1; + index = list.indexOf("备注") + 1; }else{ - index = list.indexOf("Name Of Manufacturer") + 1; + index = list.indexOf("Remark") + 1; } //创建临时文件夹 @@ -5902,7 +5904,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI cellStyleTemp.setWrapText(true);//自动换行 CellRangeAddress region = - new CellRangeAddress(1, 1, 0, 13); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列 + new CellRangeAddress(1, 1, 0, 14); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列 sheet.addMergedRegion(region); String explain= ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ @@ -6071,8 +6073,10 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI String projectLibraryId = pciList.get(0).getProjectLibraryId(); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ - List studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); - + List studioEngineerUserInfo = new ArrayList<>(); + if(StringUtils.isNotBlank(projectLibraryBase.getStudioEngineer())){ + studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); + } String certificationEngineerUserNames = ""; if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){ List certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));