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 c600ead2a..5f24d4222 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 @@ -95,6 +95,9 @@ public class ProjectCertificationInventoryEO implements Serializable { /**责任领域名称**/ @TableField(exist = false) private String dutyTerritoryName; + /**责任领域名称-英文**/ + @TableField(exist = false) + private String dutyTerritoryNameEn; /**交付物*/ @Excel(name = "交付物", width = 15) @@ -126,14 +129,20 @@ public class ProjectCertificationInventoryEO implements Serializable { @Excel(name = "交付物类型", width = 15) @ApiModelProperty(value = "交付物类型") private java.lang.String deliverableType; - @TableField(exist = false) // 交付物类型名称 + @TableField(exist = false) private String deliverableTypeName; + // 交付物类型名称-英文 + @TableField(exist = false) + private String deliverableTypeNameEn; /**交付物模板*/ @Excel(name = "交付物模板", width = 15) @ApiModelProperty(value = "交付物模板") private java.lang.String deliverableTemplate; + /**交付物模板名称**/ + @TableField(exist = false) + private String deliverableTemplateName; /**交付结果*/ @Excel(name = "交付结果", width = 15) @@ -151,8 +160,8 @@ public class ProjectCertificationInventoryEO implements Serializable { @Excel(name = "流程状态", width = 15) @ApiModelProperty(value = "流程状态") private java.lang.String flowStatus; - @TableField(exist = false) // 流程状态展示名称 + @TableField(exist = false) private String flowStatusName; /**报告编号*/ 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 49b977190..f317be5a2 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 @@ -58,6 +58,7 @@ public enum OperatorTypeEnum { CERTIFICATION_INVENTORY_EDIT("认证清单-编辑","certificationInventoryEdit"), CERTIFICATION_INVENTORY_ADD("认证清单-添加","certificationInventoryAdd"), CERTIFICATION_INVENTORY_CALL("认证清单-调取","certificationInventoryCall"), + CERTIFICATION_INVENTORY_STUDIO_ISSUE("认证清单-studio发布","certificationInventoryStudioIssue"), ; String name; 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 82d53df68..8eddd2cbd 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 @@ -17,6 +17,8 @@ import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO; import com.jero.modules.project.entity.ProjectLibraryBase; @@ -110,6 +112,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl editBeforeList = new ArrayList<>(); ProjectCertificationInventoryEO editBefore = this.queryById(projectCertificationInventoryEO.getId()); editBeforeList.add(editBefore); + this.disposeData(editBeforeList,CutEnum.CN.getValue()); List editAfterList = new ArrayList<>(); editAfterList.add(projectCertificationInventoryEO); + this.disposeData(editAfterList,CutEnum.CN.getValue()); this.setEditProjectCertificationInventoryLogEO(editBeforeList,editAfterList); Date now = new Date(); @@ -182,102 +188,153 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl deliverableTemplateFileInfos = this.ossFileService.getFileInfos(data.getDeliverableTemplate()); + if(CollectionUtils.isNotEmpty(deliverableTemplateFileInfos)){ + String deliverableTemplateNames = deliverableTemplateFileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + data.setDeliverableTemplateName(deliverableTemplateNames); + } + } } } } @@ -566,12 +636,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); List processInfoDetailEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { // 将数据的状态更新为:清单待校核,更新截止时间。等待认证工程师进行操作。 projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); // projectCertificationInventoryEO.setEndTime(DateUtils.str2Date(endTime,DateUtils.date_sdf.get())); + + String contentCn = "\"" + currentUser.getUsername() + "\"" +"发布了认证清单"; + String contentEn = "\"" + currentUser.getUsername() + "\"" +" publishes the authentication list"; + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); + projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); + projectCertificationInventoryLogEO.setContentCn(contentCn); + projectCertificationInventoryLogEO.setContentEn(contentEn); + projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue()); + projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); + } + + if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); } String projectLibraryId = json.getString("projectLibraryId"); @@ -1552,6 +1638,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + List certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); + String certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(",")); + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -1599,6 +1688,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { // 把交付结果、截止日期清空,流程状态 设置为 清单待发布 LambdaUpdateWrapper updateWrap = new LambdaUpdateWrapper<>(); @@ -1607,10 +1698,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); if(CollectionUtils.isNotEmpty(certificationEngineerList)){ for (String certificationEngineerId : certificationEngineerIdList) { String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerList,certificationEngineerId);