From fa91deefdfd6ad0f9ea5fd9794e22a2d2c502f95 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 30 Mar 2023 13:54:01 +0800 Subject: [PATCH 1/4] =?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("调用成功！"); } From e47a206703815bf98d3eedd1b1db80bbd307643a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 13:57:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/ota/controller/OtaBaSjListController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index edc26fec1..c527fc18f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -83,7 +83,7 @@ public class OtaBaSjListController extends JeroController Date: Thu, 30 Mar 2023 14:00:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?67627=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E8=B0=83=E5=8F=96=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 42836a268..3905c9ac6 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 @@ -2663,6 +2663,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 14:00:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0=E4=B8=89=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=B9=B6=E5=88=A4=E6=96=AD=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 69 +++++++++++++++---- 1 file changed, 55 insertions(+), 14 deletions(-) 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 42836a268..91deef4e0 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 @@ -2711,13 +2711,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 200){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ + message = errorMsg + "报告编号不能超过200个字符, "; + }else{ + message = errorMsg + " The Report No cannot contain more than 200 characters, "; + } + msgList.add(message); + } + } + //产品型号 + if(StringUtils.isNotBlank(productModel)){ + if(productModel.length() > 200){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ + message = errorMsg + "产品型号不能超过200个字符, "; + }else{ + message = errorMsg + " The Product Model cannot contain more than 200 characters, "; + } + msgList.add(message); + } + } + //生产企业名称 + if(StringUtils.isNotBlank(productionEnterpriseName)){ + if(productionEnterpriseName.length() > 200){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ + message = errorMsg + "生产企业名称不能超过200个字符, "; + }else{ + message = errorMsg + " The Name Of Manufacturer cannot contain more than 200 characters, "; + } + msgList.add(message); + } + } //WVTA ID if(StringUtils.isNotBlank(wvtaId)){ - if(wvtaId.length() > 100){ + if(wvtaId.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ - message = errorMsg + "WVTA ID不能超过100个字符, "; + message = errorMsg + "WVTA ID不能超过300个字符, "; }else{ - message = errorMsg + " The WVTA ID cannot contain more than 100 characters, "; + message = errorMsg + " The WVTA ID cannot contain more than 300 characters, "; } msgList.add(message); } @@ -3025,12 +3066,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 100){ + if(category.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ - message = errorMsg + "类别不能超过100个字符, "; + message = errorMsg + "类别不能超过300个字符, "; }else{ - message = errorMsg + " The Category cannot contain more than 100 characters, "; + message = errorMsg + " The Category cannot contain more than 300 characters, "; } msgList.add(message); } @@ -3049,9 +3090,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 100){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ - message = errorMsg + "检验项目不能超过100个字符, "; + message = errorMsg + "检验项目不能超过300个字符, "; }else{ - message = errorMsg + " The InspectionItem cannot contain more than 100 characters, "; + message = errorMsg + " The InspectionItem cannot contain more than 300 characters, "; } msgList.add(message); } @@ -3067,12 +3108,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 100){ + if(configItem.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ message = errorMsg + "配置项不能超过100个字符, "; }else{ - message = errorMsg + " The ConfigItem cannot contain more than 100 characters, "; + message = errorMsg + " The ConfigItem cannot contain more than 300 characters, "; } msgList.add(message); }