From ecebc183da5f034ef4bdf049ddead53188887918 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Mar 2023 13:40:59 +0800 Subject: [PATCH 1/2] bug 67631 --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- jero-web/src/components/uploadFile/file.vue | 2 +- jero-web/src/components/uploadFileOta/file.vue | 11 ++++++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4f0c90365..b07dc98e7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1739,5 +1739,5 @@ module.exports = { verifyConformanceConfirmation:'Verify conformance confirmation', designConformanceVerification:'Design conformance verification', nomorethan:'No more than 10', - uploadedfilelarger:'The uploaded file is larger than 50 MB', + uploadedfilelarger:'The uploaded file is larger than', } \ 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 aaa978cf2..37ca1e33e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1841,5 +1841,5 @@ module.exports = { verifyConformanceConfirmation:'验证符合性确认', designConformanceVerification:'设计符合性确认', nomorethan:'不能超过10个', - uploadedfilelarger:'文件大于50M', + uploadedfilelarger:'文件大于', } \ No newline at end of file diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 747211830..b5af5bf18 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -103,7 +103,7 @@ const isLt2KB = file.size / 1024 /1024 < this.size let name = file.name if (!isLt2KB) { - this.$message.error(name + this.$t('uploadedfilelarger')) + this.$message.error(name + this.$t('uploadedfilelarger') + this.size + 'M') return false } } diff --git a/jero-web/src/components/uploadFileOta/file.vue b/jero-web/src/components/uploadFileOta/file.vue index eee02201e..06be66e1c 100644 --- a/jero-web/src/components/uploadFileOta/file.vue +++ b/jero-web/src/components/uploadFileOta/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], + props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl','size', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -98,6 +98,15 @@ return false } } + // 根据大小拦截 + if(this.size){ + const isLt2KB = file.size / 1024 /1024 < this.size + let name = file.name + if (!isLt2KB) { + this.$message.error(name + this.$t('uploadedfilelarger') + this.size + 'M') + return false + } + } if (this.isMultiple) { if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) { this.$message.warning(this.$t('onlyOnefileUploaded')) From fa91deefdfd6ad0f9ea5fd9794e22a2d2c502f95 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 30 Mar 2023 13:54:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?67377=20=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E5=8F=91=E8=B5=B7=E4=BB=BB=E5=8A=A1=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=BE=85=E5=8A=9E=E8=BD=AC=E5=B7=B2=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/OperatorTypeEnum.java | 5 +++++ .../impl/ProjectLawsInventoryEOServiceImpl.java | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index f39631239..a053a49f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -76,6 +76,11 @@ public enum OperatorTypeEnum { LAWS_INVENTORY_STUDIO_EXPEDITING("法规清单-studio催办","lawsInventoryStudioExpediting"), LAWS_INVENTORY_REGULATION_OWNER_EXPEDITING("法规清单-法规工程师催办","lawsInventoryRegulationOwnerExpediting"), LAWS_INVENTORY_ENGINEERING_INTERFACE_PERSON_EXPEDITING("法规清单-工程接口人催办","lawsInventoryEngineeringInterfacePersonExpediting"), + + /** + * 待办中心-将法规工程师的法规清单确认待办任务转为已办 + */ + TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE("待办中心，法规工程师待办任务转为已办","toDoCenterFgConvertToHaveDone"), ; String name; 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 95884b422..34bc2d6d0 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 @@ -3194,6 +3194,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl pidUpdateWrap = new LambdaUpdateWrapper<>(); + pidUpdateWrap.eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.QDQR.getValue()); + pidUpdateWrap.eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryId); + pidUpdateWrap.set(ProcessInfoDetailEO::getStatus,TaskStatusEnum.HAVE_DONE.getValue()); + this.processInfoDetailEOService.update(pidUpdateWrap); + } + } + return new Result<>().success("调用成功！"); }