From e6759c73fcbe35c1678100de7918ccd517886e09 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 9 Mar 2023 09:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-studio?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E3=80=81=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88=E9=80=80=E5=9B=9Estudio=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/enums/CertificationFlowNodeEnum.java | 2 ++ ...ProjectCertificationInventoryEOServiceImpl.java | 14 ++++++++++---- .../todoCenter/mapper/xml/ProcessInfoEOMapper.xml | 8 ++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java index 0833b9b80..9925ad9f6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java @@ -15,6 +15,8 @@ public enum CertificationFlowNodeEnum { ZRRJJRW ("zrrjjrw","责任人拒绝任务","The person in charge refused the assignment"), ZRRTJRW ("zrrtjrw","责任人提交任务","The responsible person submits the task"), RZGCSSC ("rzgcssc","认证工程师审查","Certified engineer review"), + RZGCSSC_TG ("rzgcssc_tg","认证工程师审查-通过","Certified engineer review through"), + RZGCSSC_TH ("rzgcssc_th","认证工程师审查-退回","Certified engineer review returned"), ; String key; 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 d37e42d1f..c305d85ff 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 @@ -301,6 +301,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(ids.split(",")); @@ -315,7 +316,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryEOList = this.list(certificationQueryWrap); if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){ - throw new JeroBootException("至少选择一条数据流程状态为'清单待发布 或 认证退回'的数据！"); + if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("Select at least one data flow whose status is' List to be released or Certification returned '!"); + }else { + throw new JeroBootException("至少选择一条数据流程状态为'清单待发布 或 认证退回'的数据！"); + } + } List processInfoDetailEOList = new ArrayList<>(); @@ -723,18 +729,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOList = new ArrayList<>(); + /*List processInfoDetailEOList = new ArrayList<>(); ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); processInfoDetailEO.setUserId(projectLibraryBase.getStudioEngineer()); processInfoDetailEOList.add(processInfoDetailEO); - this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.STUDIOFQ.getKey()); + this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.STUDIOFQ.getKey());*/ try { for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()); } - // 认证工程师发起任务，将数据的状态更新为 任务待确认。 + // 认证工程师退回任务到studio，将数据的状态更新为 认证退回 this.updateBatchById(projectCertificationInventoryEOList); // 更新该项目认证流程中，认证工程师的任务状态。 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index 0a2b1654f..d3d4486ae 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -172,14 +172,14 @@ '' as title_en, pi.flow_type, pi.create_by, - - ( + ) as end_time, + pi.STATUS, pi.prc_num, pi.prc_name,