diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 83bcbfc1f..b851236bb 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -619,4 +619,6 @@ INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `descrip INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646033251040337922', '1646032917672861697', '地标', 'dfbc363b6e2d4d9c97664aeb6731767e', NULL, 3, 1, 'admin', '2023-04-12 14:11:24', NULL, NULL, 1, NULL, NULL, '0', 'Landmark'); INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646033351942709250', '1646032917672861697', '其他', '17a3731e5a374d8ba3909cca2464a8eb', NULL, 4, 1, 'admin', '2023-04-12 14:11:48', NULL, NULL, 1, NULL, NULL, '0', 'Other'); - +-- 市场认证清单 增加字段 2023-04-17 未同步生产环境 +ALTER TABLE `auth_dummy_inventory_info` + ADD COLUMN `attestation_type` varchar(2000) NULL COMMENT '认证类型' AFTER `deliverable_template`; 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 fce9cc117..69cd8bdf5 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 @@ -77,6 +77,11 @@ public class AuthDummyInventoryInfoEO implements Serializable { @ApiModelProperty(value = "配置项") private java.lang.String configItem; + /**认证类型名称**/ + @Excel(name = "认证类型", width = 20) + @TableField(exist = false) + private String attestationTypeName; + /**WVTA ID*/ @Excel(name = "WVTA ID", width = 15) @ApiModelProperty(value = "WVTA ID") @@ -149,4 +154,8 @@ public class AuthDummyInventoryInfoEO implements Serializable { // 1顺序 2倒序 @TableField(exist = false) private String orderBy; + + /**认证类型*/ + @ApiModelProperty(value = "认证类型") + private String attestationType; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java index 16a256048..cd6089938 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java @@ -74,6 +74,12 @@ public class AuthDummyInventoryInfoEOEn implements Serializable { @ApiModelProperty(value = "配置项") private String configItem; + /**认证类型*/ + @Excel(name = "Certification Type", width = 20) + @ApiModelProperty(value = "认证类型") + @TableField(exist = false) + private String attestationTypeName; + /**WVTA ID*/ @Excel(name = "WVTA ID", width = 15) @ApiModelProperty(value = "WVTA ID") 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 2e9ac51b3..605ac3bf8 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 @@ -957,9 +957,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl 1){ @@ -1293,6 +1293,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl list = Arrays.asList(title.split(",")); @@ -1896,6 +1908,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl hrefFeishuMap = projectLawsInventoryEOService - .getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = projectLawsInventoryEOService + .getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - //飞书消息（模板-20230410） - Map params = new HashMap<>(); - params.put("contentInfoFeiCn",contentInfoFeiCn); - params.put("contentInfoFeiEn",contentInfoFeiEn); - params.put("userIdList",Arrays.asList(sysUser.getId().split(","))); - params.put("projectCn",projectInfo.getProjectName()); - params.put("projectEn",projectInfo.getProjectNameEn()); - params.put("initiatorCn",currentUser.getUsername()); - params.put("initiatorEn",currentUser.getUsername()); - params.put("dueDate",sdf.format(deadline)); - params.put("back_url_cn",hrefFeishuCn); - params.put("back_url_en",hrefFeishuEn); + //飞书消息（模板-20230410） + Map params = new HashMap<>(); + params.put("contentInfoFeiCn",contentInfoFeiCn); + params.put("contentInfoFeiEn",contentInfoFeiEn); + params.put("userIdList",Arrays.asList(sysUser.getId().split(","))); + params.put("projectCn",projectInfo.getProjectName()); + params.put("projectEn",projectInfo.getProjectNameEn()); + params.put("initiatorCn",currentUser.getUsername()); + params.put("initiatorEn",currentUser.getUsername()); + params.put("dueDate",sdf.format(deadline)); + params.put("back_url_cn",hrefFeishuCn); + params.put("back_url_en",hrefFeishuEn); // params.put("back_url_cn",(String)hrefFeishuMap.get("hrefFeishu_cn")); // params.put("back_url_en",(String)hrefFeishuMap.get("hrefFeishu_en")); - feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null); + feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null); + } } } catch (Exception e) { log.error("飞书消息推送失败"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index f89d94d31..eb69d5e54 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -260,4 +260,18 @@ public class ProjectRelatedPersonnelController extends JeroController> regulatoryEngineerMapList = projectRelatedPersonnelService.queryLawEngineerByProjectId(params); return Result.OK(regulatoryEngineerMapList); } + + //engineeringInterfacePerson + /** + * 通过projectId查询法规工程师 + * + * @return + */ + @AutoLog(value = "项目库-相关人员维护表-根据projectId查询工程接口人") + @ApiOperation(value="项目库-相关人员维护表-根据projectId查询工程接口人", notes="项目库-相关人员维护表-根据projectId查询工程接口人") + @GetMapping(value = "/queryEngineeringInterfacePersonByProjectId") + public Result queryEngineeringInterfacePersonByProjectId(@RequestParam Map params){ + List> engineeringInterfacePersonMapList = projectRelatedPersonnelService.queryEngineeringInterfacePersonByProjectId(params); + return Result.OK(engineeringInterfacePersonMapList); + } } 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 e17baecfb..81f7d6d4b 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 @@ -80,6 +80,11 @@ public class ProjectCertificationInventoryEO implements Serializable { @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") private String configItem; + /**认证类型名称**/ + @Excel(name = "认证类型", width = 20) + @TableField(exist = false) + private String attestationTypeName; + /**WVTA ID*/ @Excel(name = "WVTA ID", width = 20) @ApiModelProperty(value = "WVTA ID") @@ -183,10 +188,13 @@ public class ProjectCertificationInventoryEO implements Serializable { private String productionEnterpriseName; /**认证进度*/ - @ApiModelProperty(value = "认证进度") private String certificationProgress; + // 认证进度排序字段 + @TableField(exist = false) + private String certificationProgressNumber; + /**认证进度展示名称**/ @Excel(name = "认证进度", width = 20) @TableField(exist = false) @@ -246,9 +254,4 @@ public class ProjectCertificationInventoryEO implements Serializable { /**认证类型*/ @ApiModelProperty(value = "认证类型") private String attestationType; - - /**认证类型名称**/ - @Excel(name = "认证类型", width = 20) - @TableField(exist = false) - private String attestationTypeName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java index 2e46eece5..6136ab470 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java @@ -78,6 +78,12 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") private java.lang.String configItem; + /**认证类型*/ + @Excel(name = "Certification Type", width = 20) + @ApiModelProperty(value = "认证类型") + @TableField(exist = false) + private String attestationTypeName; + /**WVTA ID*/ @Excel(name = "WVTA ID", width = 20) @ApiModelProperty(value = "WVTA ID") @@ -219,9 +225,4 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @TableField(exist = false) private String endTimeStr; - /**认证类型*/ - @Excel(name = "Certification Type", width = 20) - @ApiModelProperty(value = "认证类型") - @TableField(exist = false) - private String attestationTypeName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java index 12fa19212..3eb8ffd21 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java @@ -7,22 +7,24 @@ import com.jero.common.constant.enums.CutEnum; * 认证进度枚举类 */ public enum CertificationProgressEnum { - TEST_PASSED("实验通过","Test passed"), - TEST_FAILED("实验失败","Test failed"), - NOT_START("未开始","Not start"), - IN_PROGRESS("进行中","In progress"), + NOT_START("未开始","Not start","1"), + IN_PROGRESS("进行中","In progress","2"), + TEST_PASSED("实验通过","Test passed","3"), + TEST_FAILED("实验失败","Test failed","4"), // NA("不涉及","NA"),// 04-12弃用， - COMPONENT_REPORT_NOT_SUBMITTED("部件报告未提交","Component report not submitted"), - COMPONENT_REPORT_SUBMITTED("部件报告已提交","Component report submitted"), - COMPONENT_REPORT_HAS_BEEN_STORED("部件报告已入库","Component report has been stored"), + COMPONENT_REPORT_NOT_SUBMITTED("部件报告未提交","Component report not submitted","5"), + COMPONENT_REPORT_SUBMITTED("部件报告已提交","Component report submitted","6"), + COMPONENT_REPORT_HAS_BEEN_STORED("部件报告已入库","Component report has been stored","7"), ; String name; String value; + String number; - private CertificationProgressEnum(String name, String value) { + private CertificationProgressEnum(String name, String value,String number) { this.name = name; this.value = value; + this.number = number; } public String getName() { @@ -41,7 +43,15 @@ public enum CertificationProgressEnum { this.value = value; } - public static String getTextByValue(String value,String cut) { + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + + public static String getTextByValue(String value, String cut) { CertificationProgressEnum[] values = values(); for (CertificationProgressEnum certificationProgressEnum : values) { if (certificationProgressEnum.value.equals(value)) { @@ -54,4 +64,14 @@ public enum CertificationProgressEnum { } return null; } + + public static String getNumberByValue(String value) { + CertificationProgressEnum[] values = values(); + for (CertificationProgressEnum certificationProgressEnum : values) { + if (certificationProgressEnum.value.equals(value)) { + return certificationProgressEnum.number; + } + } + return null; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java index 92fd32efe..55523cda4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java @@ -70,13 +70,14 @@ public class CertificationInventoryJob implements Job { if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)){ ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - - if(StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())){ - // 消息提醒 认证工程师 认证清单数据 - this.remindCertificationEngineer(projectCertificationInventoryEOS,projectLibraryBase); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if(StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())){ + // 消息提醒 认证工程师 认证清单数据 + this.remindCertificationEngineer(projectCertificationInventoryEOS,projectLibraryBase); + } + // 消息提醒 责任人 认证清单数据 + this.remindDutyPerson(projectCertificationInventoryEOS,projectLibraryBase); } - // 消息提醒 责任人 认证清单数据 - this.remindDutyPerson(projectCertificationInventoryEOS,projectLibraryBase); } } } @@ -210,20 +211,20 @@ public class CertificationInventoryJob implements Job { * @param projectLibraryBase */ private void remindDutyPerson(List projectCertificationInventoryEOS,ProjectLibraryBase projectLibraryBase) { - Map> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOS.stream().filter(data -> { + // 结果待提交 、审查退回 + Map> toBeSubmittedCiEoListByDutyPersonMap = projectCertificationInventoryEOS.stream().filter(data -> { boolean flag = ( - StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - || StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) || StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()) ); return flag; }).collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson)); - if(ObjectUtils.isNotEmpty(certifycationInventoryListByDutyPersonMap)){ + if(ObjectUtils.isNotEmpty(toBeSubmittedCiEoListByDutyPersonMap)){ List dutyPersonIdList = projectCertificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); List dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList); - for (Map.Entry> dataByDutyPersonMap : certifycationInventoryListByDutyPersonMap.entrySet()) { + for (Map.Entry> dataByDutyPersonMap : toBeSubmittedCiEoListByDutyPersonMap.entrySet()) { String dutyPersonUserId = dataByDutyPersonMap.getKey(); List dutyPersonDataList = dataByDutyPersonMap.getValue(); if(CollectionUtils.isEmpty(dutyPersonDataList)){ @@ -295,6 +296,78 @@ public class CertificationInventoryJob implements Job { } } } + + // 任务待确认 + Map> toBeConfirmedCiEoListByDutyPersonMap = projectCertificationInventoryEOS.stream().filter(data -> { + boolean flag = (StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())); + return flag; + }).collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson)); + + if(ObjectUtils.isNotEmpty(toBeConfirmedCiEoListByDutyPersonMap)){ + List dutyPersonIdList = projectCertificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); + List dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList); + + for (Map.Entry> dataByDutyPersonMap : toBeConfirmedCiEoListByDutyPersonMap.entrySet()) { + String dutyPersonUserId = dataByDutyPersonMap.getKey(); + List dutyPersonDataList = dataByDutyPersonMap.getValue(); + if(CollectionUtils.isEmpty(dutyPersonDataList)){ + continue; + } + + Map sendMsgDataListMap = this.disposeSendMsgDataListByTaskConfirmEndTime(dutyPersonDataList); + + // 十四天后结束的 + List fourteenDaysList = (List) sendMsgDataListMap.get("fourteenDaysList"); + if(CollectionUtils.isNotEmpty(fourteenDaysList)){ + this.sendLarkCardMsgByTemplate( + projectLibraryBase, + dutyPersonList, + dutyPersonUserId, + fourteenDaysList, + TemplateInfoEnum2.CERTIFICATION_MESSAGE19.getValue(), + fourteenDaysList.get(0).getTaskConfirmEndTime() + ); + } + + // 七天后结束的 + List sevenDaysList = (List) sendMsgDataListMap.get("sevenDaysList"); + if(CollectionUtils.isNotEmpty(sevenDaysList)){ + this.sendLarkCardMsgByTemplate( + projectLibraryBase, + dutyPersonList, + dutyPersonUserId, + sevenDaysList, + TemplateInfoEnum2.CERTIFICATION_MESSAGE20.getValue(), + sevenDaysList.get(0).getTaskConfirmEndTime() + ); + } + + // 当天结束的 + List currentDaysList = (List) sendMsgDataListMap.get("currentDaysList"); + if(CollectionUtils.isNotEmpty(currentDaysList)){ + this.sendLarkCardMsgByTemplate( + projectLibraryBase, + dutyPersonList, + dutyPersonUserId, + currentDaysList, + TemplateInfoEnum2.CERTIFICATION_MESSAGE21.getValue(), + currentDaysList.get(0).getTaskConfirmEndTime() + ); + } + // 逾期的 + List overdueList = (List) sendMsgDataListMap.get("overdueList"); + if(CollectionUtils.isNotEmpty(overdueList)){ + this.sendLarkCardMsgByTemplate( + projectLibraryBase, + dutyPersonList, + dutyPersonUserId, + overdueList, + TemplateInfoEnum2.CERTIFICATION_MESSAGE22.getValue(), + overdueList.get(0).getTaskConfirmEndTime() + ); + } + } + } } /** @@ -508,6 +581,101 @@ public class CertificationInventoryJob implements Job { return result; } + /** + * 处理需要发送消息的数据 + * @param pciEoList + * @return + */ + private Map disposeSendMsgDataListByTaskConfirmEndTime(List pciEoList) { + Map result = new HashMap<>(); + Date currentDate = new Date(); + + //获取后三天前的时间 + Calendar calendar=new GregorianCalendar(); + calendar.setTime(new Date()); + calendar.add(Calendar.DATE,3); + Date threeDays = calendar.getTime(); + + //获取后七天后的时间 + Calendar sevenCalendar=new GregorianCalendar(); + sevenCalendar.setTime(new Date()); + sevenCalendar.add(Calendar.DATE,7); + Date sevenDays = sevenCalendar.getTime(); + + //获取后十四天后的时间 + Calendar fourteenCalendar=new GregorianCalendar(); + fourteenCalendar.setTime(new Date()); + fourteenCalendar.add(Calendar.DATE,14); + Date fourteenDays = fourteenCalendar.getTime(); + + String threeDaysStr = sdf.format(threeDays); + String sevenDaysStr = sdf.format(sevenDays); + String fourteenDaysStr = sdf.format(fourteenDays); + String currentDateStr = sdf.format(currentDate); + + // 当天结束的 + List currentDaysList = pciEoList.stream().filter(data -> { + boolean flag = false; + //结束日期是当前日期 + if(data.getTaskConfirmEndTime() != null){ + if (StringUtils.equals(currentDateStr, sdf.format(data.getTaskConfirmEndTime()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 三天后结束的 + List threeDaysList = pciEoList.stream().filter(data -> { + boolean flag = false; + if(data.getTaskConfirmEndTime() != null){ + if (StringUtils.equals(threeDaysStr, sdf.format(data.getTaskConfirmEndTime()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 七天后结束的 + List sevenDaysList = pciEoList.stream().filter(data -> { + boolean flag = false; + if(data.getTaskConfirmEndTime()!=null){ + if (StringUtils.equals(sevenDaysStr, sdf.format(data.getTaskConfirmEndTime()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 十四天后结束的 + List fourteenDaysList = pciEoList.stream().filter(data -> { + boolean flag = false; + if(data.getTaskConfirmEndTime() != null){ + if (StringUtils.equals(fourteenDaysStr, sdf.format(data.getTaskConfirmEndTime()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 逾期的 + List overdueList = pciEoList.stream().filter(data -> { + // 只要早于当前日期都算逾期 + boolean flag = false; + if(data.getTaskConfirmEndTime() != null){ + flag = (data.getTaskConfirmEndTime().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getTaskConfirmEndTime()))); + } + return flag; + }).collect(Collectors.toList()); + + result.put("currentDaysList",currentDaysList); + result.put("threeDaysList",threeDaysList); + result.put("overdueList",overdueList); + result.put("sevenDaysList",sevenDaysList); + result.put("fourteenDaysList",fourteenDaysList); + return result; + } + /** * 根据模板 发送飞书消息 * @param projectLibraryBase diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index ef7c6f917..cdd502126 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -130,15 +130,17 @@ public class InventoryAffirmJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator",projectLibraryBase.getStudioEngineerName()); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); + } } // 当天结束的 List currentDaysList = (List) sendMsgDataListMap.get("currentDaysList"); @@ -159,15 +161,17 @@ public class InventoryAffirmJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator",projectLibraryBase.getStudioEngineerName()); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); + } } // 逾期的 List overdueList = (List) sendMsgDataListMap.get("overdueList"); @@ -188,15 +192,17 @@ public class InventoryAffirmJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator",projectLibraryBase.getStudioEngineerName()); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); + } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java index 48ccf0143..03b944d72 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java @@ -137,22 +137,24 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Design Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + } } // 当天结束的 List currentDaysList = (List) sendMsgDataListMap.get("currentDaysList"); @@ -175,22 +177,24 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Design Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + } } // 逾期的 List overdueList = (List) sendMsgDataListMap.get("overdueList"); @@ -213,22 +217,24 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Design Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params); + } } } // 验证符合性 @@ -266,22 +272,24 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Validation Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = threeDaysList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = threeDaysList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + } } // 当天结束的 List currentDaysList = (List) sendMsgDataListMap.get("currentDaysList"); @@ -304,22 +312,24 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Validation Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + } } // 逾期的 List overdueList = (List) sendMsgDataListMap.get("overdueList"); @@ -342,22 +352,24 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Validation Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params); + } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index 042057226..7c2db9b57 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -126,22 +126,24 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } // 七天后结束的 @@ -163,22 +165,24 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } // 当天结束的 @@ -200,22 +204,24 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } // 逾期的 List overdueList = (List) sendMsgDataListMap.get("overdueList"); @@ -236,22 +242,24 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION3.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION3.getValue(),params); + } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index d36ffc901..8eecd0f8a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -126,22 +126,24 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } // 七天后结束的 @@ -163,22 +165,24 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } // 当天结束的 @@ -200,22 +204,24 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } // 逾期的 List overdueList = (List) sendMsgDataListMap.get("overdueList"); @@ -236,22 +242,24 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 - String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 - // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION3.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION3.getValue(),params); + } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index bb91c7abd..9e34642b4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -101,4 +101,6 @@ public interface IProjectRelatedPersonnelService extends IService> queryLawEngineerByProjectId(Map params); + + List> queryEngineeringInterfacePersonByProjectId(Map params); } 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 b2d97dc70..80be66333 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 @@ -213,18 +213,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); - List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + List userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); - editEndTimeCertificationInventoryEOS.get(0).setEndTime(projectCertificationInventoryEO.getEndTime()); + editEndTimeCertificationInventoryEOS.get(0).setEndTime(projectCertificationInventoryEO.getEndTime()); - this.sendMessageByTemplateId( - editEndTimeCertificationInventoryEOS, - TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(), - userIdList, - userInfoList, - projectCertificationInventoryEO.getEndTime() - ); + this.sendMessageByTemplateId( + editEndTimeCertificationInventoryEOS, + TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(), + userIdList, + userInfoList, + projectCertificationInventoryEO.getEndTime() + ); + } } } @@ -622,16 +624,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); - List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + List userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); - this.sendMessageByTemplateId( - projectCertificationInventoryEOS, - TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(), - userIdList, - userInfoList, - projectCertificationInventoryEO.getEndTime() - ); + this.sendMessageByTemplateId( + projectCertificationInventoryEOS, + TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(), + userIdList, + userInfoList, + projectCertificationInventoryEO.getEndTime() + ); + } } } if(CollectionUtils.isNotEmpty(updateList)){ @@ -674,49 +678,50 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN); + String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); + String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); - // 获取认证清单 - 飞书跳转链接 - Map hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN); - String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); - String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); + Map standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOS); + String standName = (String) standNameAndItemName.get("standName"); + String itemName = (String) standNameAndItemName.get("itemName"); - Map standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOS); - String standName = (String) standNameAndItemName.get("standName"); - String itemName = (String) standNameAndItemName.get("itemName"); + try { + for (String userId : userIdList) { + String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId); - try { - for (String userId : userIdList) { - String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId); - - if(StringUtils.isNotEmpty(thirdId)){ - // 根据结束时间进行排序，获取最近的时间，发消息时使用。 + if(StringUtils.isNotEmpty(thirdId)){ + // 根据结束时间进行排序，获取最近的时间，发消息时使用。 // this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOS); // Date endTime = projectCertificationInventoryEOS.get(0).getEndTime(); - JSONObject larkMesJson = new JSONObject(); - larkMesJson.put("template_id", templeteId); - larkMesJson.put("userIds",thirdId); + JSONObject larkMesJson = new JSONObject(); + larkMesJson.put("template_id", templeteId); + larkMesJson.put("userIds",thirdId); - Map templateVariableMap = new HashMap<>(); - templateVariableMap.put("projectNameCn",PRN_CN); - templateVariableMap.put("projectNameEn",PRN_EN); - templateVariableMap.put("standName",standName); - templateVariableMap.put("itemName",itemName); - templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName()); - templateVariableMap.put("endTime",DateUtils.formatDate(endTime)); - templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); - templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); - templateVariableMap.put("operateUserName",currentUser.getUsername()); + Map templateVariableMap = new HashMap<>(); + templateVariableMap.put("projectNameCn",PRN_CN); + templateVariableMap.put("projectNameEn",PRN_EN); + templateVariableMap.put("standName",standName); + templateVariableMap.put("itemName",itemName); + templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName()); + templateVariableMap.put("endTime",DateUtils.formatDate(endTime)); + templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); + templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); + templateVariableMap.put("operateUserName",currentUser.getUsername()); - larkMesJson.put("templateVariableMap",templateVariableMap); - this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson); + larkMesJson.put("templateVariableMap",templateVariableMap); + this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson); + } } + } catch (Exception e) { + log.error("飞书消息推送失败"); } - } catch (Exception e) { - log.error("飞书消息推送失败"); } } @@ -1000,6 +1005,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationEngineerIdList = Arrays.asList(certificationEngineer.split(",")); - // 给认证工程师分配任务 - for (String userId : certificationEngineerIdList) { - ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); - processInfoDetailEO.setUserId(userId); - processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey()); - processInfoDetailEO.setCreateTime(new Date()); - processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue()); - processInfoDetailEO.setProcessInfoId(projectLibraryId); - processInfoDetailEO.setActiProcInstId(projectLibraryId); - processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue()); - processInfoDetailEO.setEndTime(inventoryVerifyEndTime); - processInfoDetailEOList.add(processInfoDetailEO); - } - - ProcessInfoEO processInfoEO = new ProcessInfoEO(); - this.addProcessInfoEO(processInfoEO,projectLibraryId); - - // 删除该项目数据的待办任务，key为 认证工程师接受任务的数据 - QueryWrapper deleteDetailWrap = new QueryWrapper<>(); - deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoEO.getId()); - deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey()); - deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue()); - this.processInfoDetailEOService.remove(deleteDetailWrap); - this.processInfoDetailEOService.saveBatch(processInfoDetailEOList); - this.updateBatchById(projectCertificationInventoryEOList); - - // 获取认证清单 - 飞书跳转链接 - Map hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryId, PRN_CN, PRN_EN); - String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); - String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); - - List certificationEngineerUserInfoList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); - certificationEngineerIdList.forEach(userId -> { - try { - String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerUserInfoList,userId); - - if(StringUtils.isNotEmpty(thirdId)){ - JSONObject larkMesJson = new JSONObject(); - larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE2.getValue()); - larkMesJson.put("userIds",thirdId); - - Map templateVariableMap = new HashMap<>(); - templateVariableMap.put("projectNameCn",PRN_CN); - templateVariableMap.put("projectNameEn",PRN_EN); - templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName()); - templateVariableMap.put("endTime",DateUtils.formatDate(inventoryVerifyEndTime)); - templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); - templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); - - larkMesJson.put("templateVariableMap",templateVariableMap); - this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson); + String certificationEngineer = projectLibraryBase.getCertificationEngineer(); + if(StringUtils.isEmpty(certificationEngineer)){ + if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("There is no certified engineer in this project. Please maintain the certified engineer first!"); + }else { + throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！"); } - } catch (Exception e) { - log.error("飞书消息推送失败"); } - }); + + List certificationEngineerIdList = Arrays.asList(certificationEngineer.split(",")); + // 给认证工程师分配任务 + for (String userId : certificationEngineerIdList) { + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setUserId(userId); + processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey()); + processInfoDetailEO.setCreateTime(new Date()); + processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue()); + processInfoDetailEO.setProcessInfoId(projectLibraryId); + processInfoDetailEO.setActiProcInstId(projectLibraryId); + processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue()); + processInfoDetailEO.setEndTime(inventoryVerifyEndTime); + processInfoDetailEOList.add(processInfoDetailEO); + } + + ProcessInfoEO processInfoEO = new ProcessInfoEO(); + this.addProcessInfoEO(processInfoEO,projectLibraryId); + + // 删除该项目数据的待办任务，key为 认证工程师接受任务的数据 + QueryWrapper deleteDetailWrap = new QueryWrapper<>(); + deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoEO.getId()); + deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey()); + deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue()); + this.processInfoDetailEOService.remove(deleteDetailWrap); + this.processInfoDetailEOService.saveBatch(processInfoDetailEOList); + this.updateBatchById(projectCertificationInventoryEOList); + + // 获取认证清单 - 飞书跳转链接 + Map hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryId, PRN_CN, PRN_EN); + String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); + String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); + + List certificationEngineerUserInfoList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); + certificationEngineerIdList.forEach(userId -> { + try { + String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerUserInfoList,userId); + + if(StringUtils.isNotEmpty(thirdId)){ + JSONObject larkMesJson = new JSONObject(); + larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE2.getValue()); + larkMesJson.put("userIds",thirdId); + + Map templateVariableMap = new HashMap<>(); + templateVariableMap.put("projectNameCn",PRN_CN); + templateVariableMap.put("projectNameEn",PRN_EN); + templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName()); + templateVariableMap.put("endTime",DateUtils.formatDate(inventoryVerifyEndTime)); + templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); + templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); + + larkMesJson.put("templateVariableMap",templateVariableMap); + this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson); + } + } catch (Exception e) { + log.error("飞书消息推送失败"); + } + }); + } return Result.OK("发布成功！"); } @@ -1439,6 +1451,24 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl{ + String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : ""); + String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : ""); + return comparator.compare(e1WvtaId,e2WvtaId); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1,e2)->{ + String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : ""); + String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : ""); + return comparator.compare(e2WvtaId,e1WvtaId); + }); + } + } + // 标准编号 serialNumber if(StringUtils.equals("serialNumber",orderByField)){ if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ @@ -1456,6 +1486,57 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl{ + String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : ""); + String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : ""); + return comparator.compare(e1DutyTerritoryName,e2DutyTerritoryName); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1,e2)->{ + String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : ""); + String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : ""); + return comparator.compare(e2DutyTerritoryName,e1DutyTerritoryName); + }); + } + } + + // 工程接口人 sdtName + if(StringUtils.equals("sdtName",orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1, e2)->{ + String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : ""); + String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : ""); + return comparator.compare(e1SdtName,e2SdtName); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1,e2)->{ + String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : ""); + String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : ""); + return comparator.compare(e2SdtName,e1SdtName); + }); + } + } + + // 责任人 dutyPersonName + if(StringUtils.equals("dutyPersonName",orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1, e2)->{ + String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : ""); + String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : ""); + return comparator.compare(e1DutyPersonName,e2DutyPersonName); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1,e2)->{ + String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : ""); + String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : ""); + return comparator.compare(e2DutyPersonName,e1DutyPersonName); + }); + } + } + // 交付物类型 deliverableTypeName if(StringUtils.equals("deliverableTypeName",orderByField)){ if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ @@ -1506,6 +1587,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl{ + String e1CertificationProgressNumber = (StringUtils.isNotEmpty(e1.getCertificationProgressNumber()) ? e1.getCertificationProgressNumber() : ""); + String e2CertificationProgressNumber = (StringUtils.isNotEmpty(e2.getCertificationProgressNumber()) ? e2.getCertificationProgressNumber() : ""); + return comparator.compare(e1CertificationProgressNumber,e2CertificationProgressNumber); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1,e2)->{ + String e1CertificationProgressNumber = (StringUtils.isNotEmpty(e1.getCertificationProgressNumber()) ? e1.getCertificationProgressNumber() : ""); + String e2CertificationProgressNumber = (StringUtils.isNotEmpty(e2.getCertificationProgressNumber()) ? e2.getCertificationProgressNumber() : ""); + return comparator.compare(e2CertificationProgressNumber,e1CertificationProgressNumber); + }); + } + } } return datas; } @@ -2212,7 +2310,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl() { + /*Collections.sort(projectCertificationInventoryEOList, new Comparator() { @Override public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { if(p1.getEndTime() != null && p2.getEndTime() != null){ @@ -2221,7 +2319,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + List studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); - String certificationEngineerUserNames = ""; - if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){ - List certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); - List certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); - certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(",")); - } - - List pciLogEOList = new ArrayList<>(); - for (ProjectCertificationInventoryEO pci : pciList) { - StringBuilder contentCnSb = new StringBuilder(); - StringBuilder contentEnSb = new StringBuilder(); - if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); - contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" "); - - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); - contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getSerialNumber()).append("\""); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发布了认证清单"); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has published a certification list"); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核退回"); - contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\""); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" review and returned"); - contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\""); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核通过"); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" pass the audit"); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue())){ - if (StringUtils.equals(pci.getValueType(), SysCategoryValueTypeEnum.FILE.getValue())) { - String fileName = "N/A"; - if (StringUtils.isNotEmpty(pci.getDeliveryResult())) { - fileName = this.ossFileService.getFileInfos(pci.getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - } - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了附件 ").append(fileName); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted attachment ").append(fileName); - }else { - String deliveryResult = (StringUtils.isNotEmpty(pci.getDeliveryResult()) ? pci.getDeliveryResult() : "N/A"); - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了交付结果为").append(deliveryResult); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted a delivery result of ").append(deliveryResult); - } - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("接受了任务信息"); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" accepts the task information"); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("退回了任务信息"); - contentCnSb.append("，拒绝原因:\"").append(pci.getReasonForReturn()).append("\""); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information"); - contentEnSb.append(",Reject for Reason:\"").append(pci.getReasonForReturn()).append("\""); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("拒绝，流程退回至") - .append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\""); - contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\""); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" refuses, and the process returns to ") - .append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\""); - contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\""); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发起了Pre-Homo流程"); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" initiates the Pre-Homo process"); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("操作了流程重置功能"); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has operated the process reset function"); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("从").append("\"").append(certificationEngineerUserNames).append("\"撤回了流程"); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" withdrew the process from \"").append(certificationEngineerUserNames).append("\""); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL_ADD.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); - contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" "); - - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); - contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getSerialNumber()).append("\""); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_IMPORT_ADD.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); - contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" "); - - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); - contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getSerialNumber()).append("\""); - } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD_CONFIG.getValue())){ - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); - contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); - contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" "); - - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); - contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); - contentEnSb.append("\"").append(pci.getSerialNumber()).append("\""); + String certificationEngineerUserNames = ""; + if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){ + List certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + List certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); + certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(",")); } - ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO(); - pciLogEO.setProjectCertificationInventoryId(pci.getId()); - pciLogEO.setContentCn(contentCnSb.toString()); - pciLogEO.setContentEn(contentEnSb.toString()); - pciLogEO.setOperatorType(operateType); - pciLogEOList.add(pciLogEO); - } + List pciLogEOList = new ArrayList<>(); + for (ProjectCertificationInventoryEO pci : pciList) { + StringBuilder contentCnSb = new StringBuilder(); + StringBuilder contentEnSb = new StringBuilder(); + if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); + contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" "); - if(CollectionUtils.isNotEmpty(pciLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(pciLogEOList); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); + contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getSerialNumber()).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发布了认证清单"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has published a certification list"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核退回"); + contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\""); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" review and returned"); + contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核通过"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" pass the audit"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue())){ + if (StringUtils.equals(pci.getValueType(), SysCategoryValueTypeEnum.FILE.getValue())) { + String fileName = "N/A"; + if (StringUtils.isNotEmpty(pci.getDeliveryResult())) { + fileName = this.ossFileService.getFileInfos(pci.getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + } + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了附件 ").append(fileName); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted attachment ").append(fileName); + }else { + String deliveryResult = (StringUtils.isNotEmpty(pci.getDeliveryResult()) ? pci.getDeliveryResult() : "N/A"); + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了交付结果为").append(deliveryResult); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted a delivery result of ").append(deliveryResult); + } + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("接受了任务信息"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" accepts the task information"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("退回了任务信息"); + contentCnSb.append("，拒绝原因:\"").append(pci.getReasonForReturn()).append("\""); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information"); + contentEnSb.append(",Reject for Reason:\"").append(pci.getReasonForReturn()).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("拒绝，流程退回至") + .append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\""); + contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\""); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" refuses, and the process returns to ") + .append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\""); + contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发起了Pre-Homo流程"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" initiates the Pre-Homo process"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("操作了流程重置功能"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has operated the process reset function"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("从").append("\"").append(certificationEngineerUserNames).append("\"撤回了流程"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" withdrew the process from \"").append(certificationEngineerUserNames).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL_ADD.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); + contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" "); + + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); + contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getSerialNumber()).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_IMPORT_ADD.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); + contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" "); + + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); + contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getSerialNumber()).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD_CONFIG.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); + contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" "); + + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); + contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getSerialNumber()).append("\""); + } + + ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO(); + pciLogEO.setProjectCertificationInventoryId(pci.getId()); + pciLogEO.setContentCn(contentCnSb.toString()); + pciLogEO.setContentEn(contentEnSb.toString()); + pciLogEO.setOperatorType(operateType); + pciLogEOList.add(pciLogEO); + } + + if(CollectionUtils.isNotEmpty(pciLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(pciLogEOList); + } } } } 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 bf3cc5822..58699d625 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 @@ -790,85 +790,87 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); - // 将之前的法规工程师的待办任务，转给新的法规工程师办理 - QueryWrapper pidEoQueryWrap = new QueryWrapper<>(); - pidEoQueryWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryEO.getId()); - List pidEoList = this.processInfoDetailEOService.list(pidEoQueryWrap); - if(CollectionUtils.isNotEmpty(pidEoList)){ - // 过滤出来，清单确认流程，并且是法规工程师审核节点的数据，转办给新的法规工程师 - List qdqrPidEoList = pidEoList.stream().filter(pidEo -> { - boolean flag = ( - StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.QDQR.getValue()) - && StringUtils.equals(pidEo.getTaskDefinitionKey(),InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey()) - && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) - ); - return flag; - }).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(qdqrPidEoList)) { - qdqrPidEoList.forEach(qdqrPidEo -> { - qdqrPidEo.setUserId(projectLawsInventoryEO.getRegulationOwnerId()); - }); - this.processInfoDetailEOService.updateBatchById(qdqrPidEoList); - } + // 将之前的法规工程师的待办任务，转给新的法规工程师办理 + QueryWrapper pidEoQueryWrap = new QueryWrapper<>(); + pidEoQueryWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryEO.getId()); + List pidEoList = this.processInfoDetailEOService.list(pidEoQueryWrap); + if(CollectionUtils.isNotEmpty(pidEoList)){ + // 过滤出来，清单确认流程，并且是法规工程师审核节点的数据，转办给新的法规工程师 + List qdqrPidEoList = pidEoList.stream().filter(pidEo -> { + boolean flag = ( + StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.QDQR.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(),InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey()) + && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(qdqrPidEoList)) { + qdqrPidEoList.forEach(qdqrPidEo -> { + qdqrPidEo.setUserId(projectLawsInventoryEO.getRegulationOwnerId()); + }); + this.processInfoDetailEOService.updateBatchById(qdqrPidEoList); + } - List taskIdList = new ArrayList<>(); + List taskIdList = new ArrayList<>(); - // 过滤出来，设计符合性流程，并且是法规工程师审核节点的数据，转办给新的法规工程师 - List designFlowPidEoList = pidEoList.stream().filter(pidEo -> { - boolean flag = ( - StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue()) - && StringUtils.equals(pidEo.getTaskDefinitionKey(), DesignComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) - && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) - ); - return flag; - }).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(designFlowPidEoList)) { - designFlowPidEoList.forEach(qdqrPidEo -> { - qdqrPidEo.setUserId(projectLawsInventoryEO.getRegulationOwnerId()); - }); - this.processInfoDetailEOService.updateBatchById(designFlowPidEoList); + // 过滤出来，设计符合性流程，并且是法规工程师审核节点的数据，转办给新的法规工程师 + List designFlowPidEoList = pidEoList.stream().filter(pidEo -> { + boolean flag = ( + StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(), DesignComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) + && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(designFlowPidEoList)) { + designFlowPidEoList.forEach(qdqrPidEo -> { + qdqrPidEo.setUserId(projectLawsInventoryEO.getRegulationOwnerId()); + }); + this.processInfoDetailEOService.updateBatchById(designFlowPidEoList); - taskIdList.addAll(designFlowPidEoList.stream().map(ProcessInfoDetailEO::getTaskId).collect(Collectors.toList())); - } + taskIdList.addAll(designFlowPidEoList.stream().map(ProcessInfoDetailEO::getTaskId).collect(Collectors.toList())); + } - // 过滤出来，验证符合性流程，并且是法规工程师审核节点的数据，转办给新的法规工程师 - List verifyFlowPidEoList = pidEoList.stream().filter(pidEo -> { - boolean flag = ( - StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue()) - && StringUtils.equals(pidEo.getTaskDefinitionKey(), VerifyComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) - && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) - ); - return flag; - }).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(verifyFlowPidEoList)) { - verifyFlowPidEoList.forEach(qdqrPidEo -> { - qdqrPidEo.setUserId(projectLawsInventoryEO.getRegulationOwnerId()); - }); - this.processInfoDetailEOService.updateBatchById(verifyFlowPidEoList); + // 过滤出来，验证符合性流程，并且是法规工程师审核节点的数据，转办给新的法规工程师 + List verifyFlowPidEoList = pidEoList.stream().filter(pidEo -> { + boolean flag = ( + StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(), VerifyComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) + && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(verifyFlowPidEoList)) { + verifyFlowPidEoList.forEach(qdqrPidEo -> { + qdqrPidEo.setUserId(projectLawsInventoryEO.getRegulationOwnerId()); + }); + this.processInfoDetailEOService.updateBatchById(verifyFlowPidEoList); - taskIdList.addAll(verifyFlowPidEoList.stream().map(ProcessInfoDetailEO::getTaskId).collect(Collectors.toList())); - } + taskIdList.addAll(verifyFlowPidEoList.stream().map(ProcessInfoDetailEO::getTaskId).collect(Collectors.toList())); + } - if (CollectionUtils.isNotEmpty(taskIdList)) { - String taskIds = String.join(",", taskIdList); - // 更新流程服务办理人 - this.workFlowFeignClient.changeAssigneeBatch(taskIds,projectLawsInventoryEO.getRegulationOwnerId()); + if (CollectionUtils.isNotEmpty(taskIdList)) { + String taskIds = String.join(",", taskIdList); + // 更新流程服务办理人 + this.workFlowFeignClient.changeAssigneeBatch(taskIds,projectLawsInventoryEO.getRegulationOwnerId()); + } } } } @@ -891,20 +893,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } } } if((projectLawsInventoryOld.getVerifyDueDate() != null && projectLawsInventoryEO.getVerifyDueDate() != null) && toBeCheckedFlag){ @@ -925,20 +929,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } } } @@ -966,20 +972,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } } } @@ -1006,20 +1014,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } } } @@ -1050,21 +1060,23 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } // 验证符合性 结果待审查、结果待提交 标识 判断法规工程师是否被修改了 如果被修改了，给新的法规工程师发消息 @@ -1088,21 +1100,23 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } } } @@ -1588,6 +1602,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ +// Collections.sort(result,(e1,e2)->{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// } + } // 验证符合性排序 // 验证符合性-责任人 verifyDutyId @@ -1642,6 +1674,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ +// Collections.sort(result,(e1,e2)->{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// } + } } return result; } @@ -3479,24 +3529,26 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - prarams.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - prarams.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + prarams.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + prarams.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String projectLawsInventoryId = (String) prarams.get("id"); - ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectById(projectLawsInventoryId); - String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - prarams.put("Initiator",regulationOwnerUserName); + String projectLawsInventoryId = (String) prarams.get("id"); + ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectById(projectLawsInventoryId); + String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + prarams.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(templateId,prarams); + this.sendMessageByTemplateId(templateId,prarams); + } } // 将法规工程师的 法规清单确认待办中心任务转为已办 @@ -6612,16 +6664,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - paramsMsg.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - paramsMsg.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - paramsMsg.put("Initiator",projectLibraryBase.getStudioEngineerName()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + paramsMsg.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + paramsMsg.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + paramsMsg.put("Initiator",projectLibraryBase.getStudioEngineerName()); - - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),paramsMsg); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),paramsMsg); + } } return Result.OK("变更成功！"); } @@ -10278,22 +10331,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } } } @@ -10340,22 +10395,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } } } } @@ -10403,21 +10460,23 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } } } @@ -10465,15 +10524,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator",projectLibraryBase.getStudioEngineerName()); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); + } } } } @@ -10520,22 +10581,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } } } @@ -10582,22 +10645,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } } } } @@ -10645,21 +10710,23 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); - Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); - String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); + String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); + params.put("Initiator",regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + } } } } @@ -10707,15 +10774,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator",projectLibraryBase.getStudioEngineerName()); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); + } } } } @@ -11400,15 +11469,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator",projectLibraryBase.getStudioEngineerName()); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); + } return Result.OK("发起清单确认成功！"); } @@ -11489,15 +11560,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator",projectLibraryBase.getStudioEngineerName()); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params); + } return Result.OK("撤回成功！"); } @@ -11509,63 +11582,65 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) - ); + // studio信息 + SysUser studioUserInfo = this.sysUserMapper.selectOne( + new QueryWrapper().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) + ); - String ids = json.getString("ids"); + String ids = json.getString("ids"); - QueryWrapper queryWrapper = new QueryWrapper<>(); - if(StringUtils.isEmpty(ids)){ - throw new JeroBootException("至少选择一条数据进行操作！"); - } - queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); - List projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper); - for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) { - if(StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - || StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())){ - projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(StringUtils.isEmpty(ids)){ + throw new JeroBootException("至少选择一条数据进行操作！"); } - if(StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - || StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())){ - projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()); + queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + List projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper); + for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) { + if(StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())){ + projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()); + } + if(StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())){ + projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()); + } } + + this.updateBatchById(projectLawsInventoryEOS); + + this.lawsInventoryEOListSortByInventoryAffirmDueDate(projectLawsInventoryEOS); + Date inventoryAffirmDueDate = projectLawsInventoryEOS.get(0).getInventoryAffirmDueDate(); + String endTime = ""; + if(inventoryAffirmDueDate != null){ + endTime = DateUtils.formatDate(inventoryAffirmDueDate); + } + List userIdList = Arrays.asList(studioUserInfo.getId().split(",")); + String serialNumbers = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + + // 给studio发消息 + Map params = new HashMap<>(); + String contentCn = "您好，该任务被"+ currentUser.getUsername() +"退回，请及时查看处理。"; + String contentEn = "Hello! This task is rejected by "+ currentUser.getUsername() +". Please check and address it in a timely manner."; + params.put("contentCn",contentCn); + params.put("contentEn",contentEn); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue()); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(),params); } - - this.updateBatchById(projectLawsInventoryEOS); - - this.lawsInventoryEOListSortByInventoryAffirmDueDate(projectLawsInventoryEOS); - Date inventoryAffirmDueDate = projectLawsInventoryEOS.get(0).getInventoryAffirmDueDate(); - String endTime = ""; - if(inventoryAffirmDueDate != null){ - endTime = DateUtils.formatDate(inventoryAffirmDueDate); - } - List userIdList = Arrays.asList(studioUserInfo.getId().split(",")); - String serialNumbers = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); - - // 给studio发消息 - Map params = new HashMap<>(); - String contentCn = "您好，该任务被"+ currentUser.getUsername() +"退回，请及时查看处理。"; - String contentEn = "Hello! This task is rejected by "+ currentUser.getUsername() +". Please check and address it in a timely manner."; - params.put("contentCn",contentCn); - params.put("contentEn",contentEn); - params.put("projectLibraryId",projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); - - // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); - - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(),params); return Result.OK("退回成功！"); } @@ -11626,42 +11701,42 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl templateVariableMap = new HashMap<>(); + templateVariableMap.put("contentCn",contentCn); + templateVariableMap.put("contentEn",contentEn); + templateVariableMap.put("projectNameCn",PRN_CN); + templateVariableMap.put("projectNameEn",PRN_EN); + templateVariableMap.put("Initiator",Initiator); + templateVariableMap.put("studioEngineerName",projectLibraryBase.getStudioEngineerName()); + templateVariableMap.put("endTime",endTime); + templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); + templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); + templateVariableMap.put("operateUserName",ObjectUtils.isNotEmpty(currentUser) ? currentUser.getUsername() : projectLibraryBase.getStudioEngineerName()); + templateVariableMap.put("standName",serialNumbers); + templateVariableMap.put("flowTypeCn",flowTypeCn); + templateVariableMap.put("flowTypeEn",flowTypeEn); - if(StringUtils.isNotEmpty(thirdId)){ - // 根据结束时间进行排序，获取最近的时间，发消息时使用。 - JSONObject larkMesJson = new JSONObject(); - larkMesJson.put("template_id", templeteId); - larkMesJson.put("userIds",thirdId); - - Map templateVariableMap = new HashMap<>(); - templateVariableMap.put("contentCn",contentCn); - templateVariableMap.put("contentEn",contentEn); - templateVariableMap.put("projectNameCn",PRN_CN); - templateVariableMap.put("projectNameEn",PRN_EN); - templateVariableMap.put("Initiator",Initiator); - templateVariableMap.put("studioEngineerName",projectLibraryBase.getStudioEngineerName()); - templateVariableMap.put("endTime",endTime); - templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); - templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); - templateVariableMap.put("operateUserName",ObjectUtils.isNotEmpty(currentUser) ? currentUser.getUsername() : projectLibraryBase.getStudioEngineerName()); - templateVariableMap.put("standName",serialNumbers); - templateVariableMap.put("flowTypeCn",flowTypeCn); - templateVariableMap.put("flowTypeEn",flowTypeEn); - - larkMesJson.put("templateVariableMap",templateVariableMap); - this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson); + larkMesJson.put("templateVariableMap",templateVariableMap); + this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson); + } } + } catch (Exception e) { + log.error("飞书消息推送失败"); } - } catch (Exception e) { - log.error("飞书消息推送失败"); } } } @@ -12048,7 +12123,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl pliQueryWrap = new QueryWrapper<>(); pliQueryWrap.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList); - List pliEoList = this.list(); + List pliEoList = this.list(pliQueryWrap); if(CollectionUtils.isNotEmpty(pliEoList)){ QueryWrapper piQueryWrap = new QueryWrapper<>(); piQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,projectLawsInventoryIdList); @@ -12056,13 +12131,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + pliEo.setDesignDutyId(designTransferUserId); + }); // 设计符合性相关待办任务强制转办 this.designCompulsoryTransfer(projectLibraryId, designTransferUserId, pliEoList, piEoList); } if(StringUtils.isNotEmpty(verifyTransferUserId)){ + pliEoList.forEach(pliEo -> { + pliEo.setVerifyDutyId(verifyTransferUserId); + }); // 验证符合性相关待办任务强制转办 this.verifyCompulsoryTransfer(projectLibraryId,verifyTransferUserId, pliEoList, piEoList); } + + this.updateBatchById(pliEoList); } } return Result.OK("强制转办成功！"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 6a59f1992..2f3d96bc9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -2014,61 +2014,66 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl records = this.projectLibraryBaseMapper.queryById(projectLibraryId); - List studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList()); - List studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList); - disposeData(records,"",false); + if(CollectionUtils.isNotEmpty(records)){ + List studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList()); + List studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList); + disposeData(records,"",false); - List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); - for(ProjectLibraryBase projectLibraryBase: records){ - //历史数据的主版本没有版本号,所以默认给00 - if(StringUtils.isBlank(projectLibraryBase.getParentId()) && StringUtils.isBlank(projectLibraryBase.getProjectVersion())){ - projectLibraryBase.setProjectVersion("00"); - } - //目标市场 英文 - Map paramEn = new HashMap<>(); - paramEn.put("cut",CutEnum.EN.getValue()); - String targetMarketEn = getMarket(paramEn, targetMarketList, projectLibraryBase); + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + for(ProjectLibraryBase projectLibraryBase: records){ + //历史数据的主版本没有版本号,所以默认给00 + if(StringUtils.isBlank(projectLibraryBase.getParentId()) && StringUtils.isBlank(projectLibraryBase.getProjectVersion())){ + projectLibraryBase.setProjectVersion("00"); + } + //目标市场 英文 + Map paramEn = new HashMap<>(); + paramEn.put("cut",CutEnum.EN.getValue()); + String targetMarketEn = getMarket(paramEn, targetMarketList, projectLibraryBase); - //目标市场 中文 - Map paramCn = new HashMap<>(); - paramCn.put("cut",CutEnum.CN.getValue()); - String targetMarketCn = getMarket(paramCn, targetMarketList, projectLibraryBase); + //目标市场 中文 + Map paramCn = new HashMap<>(); + paramCn.put("cut",CutEnum.CN.getValue()); + String targetMarketCn = getMarket(paramCn, targetMarketList, projectLibraryBase); - //主项目的版本号 - String projectVersion = ""; - if(StringUtils.isBlank(projectLibraryBase.getParentId())){ - projectVersion = "00"; - }else{ - projectVersion = projectLibraryBase.getProjectVersion(); - } - if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ - projectLibraryBase.setProjectNameEn(projectLibraryBase.getProjectName() - + "-" + projectLibraryBase.getYearName() - + "-" + targetMarketEn - + "-" + projectVersion); + //主项目的版本号 + String projectVersion = ""; + if(StringUtils.isBlank(projectLibraryBase.getParentId())){ + projectVersion = "00"; + }else{ + projectVersion = projectLibraryBase.getProjectVersion(); + } + if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ + projectLibraryBase.setProjectNameEn(projectLibraryBase.getProjectName() + + "-" + projectLibraryBase.getYearName() + + "-" + targetMarketEn + + "-" + projectVersion); - projectLibraryBase.setProjectNameCn(projectLibraryBase.getProjectName() - + "-" + projectLibraryBase.getYearName() - + "-" + targetMarketCn - + "-" + projectVersion); - } + projectLibraryBase.setProjectNameCn(projectLibraryBase.getProjectName() + + "-" + projectLibraryBase.getYearName() + + "-" + targetMarketCn + + "-" + projectVersion); + } - if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){ - if(CollectionUtils.isNotEmpty(studioEngineerUserInfo)){ - String studioEngineerUserName = studioEngineerUserInfo.stream().filter(studioEngineerUser -> { - boolean flag = false; - if (StringUtils.equals(projectLibraryBase.getStudioEngineer(), studioEngineerUser.getId())) { - flag = true; - } - return flag; - }).map(SysUser::getUsername).collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){ + if(CollectionUtils.isNotEmpty(studioEngineerUserInfo)){ + String studioEngineerUserName = studioEngineerUserInfo.stream().filter(studioEngineerUser -> { + boolean flag = false; + if (StringUtils.equals(projectLibraryBase.getStudioEngineer(), studioEngineerUser.getId())) { + flag = true; + } + return flag; + }).map(SysUser::getUsername).collect(Collectors.joining(",")); - projectLibraryBase.setStudioEngineerName(studioEngineerUserName); + projectLibraryBase.setStudioEngineerName(studioEngineerUserName); + } } } + + result = records.get(0); } - return records.get(0); + return result; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 9382bec93..674640af9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -1823,4 +1823,45 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> queryEngineeringInterfacePersonByProjectId(Map params) { + List> resultList = new ArrayList<>(); + String projectLibraryId = (String) params.get("projectLibraryId"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + List prpEoList = this.list(queryWrapper.eq("project_id", projectLibraryId)); + if(CollectionUtils.isNotEmpty(prpEoList)){ + List userIdList = new ArrayList<>(); + + String engineeringInterfacePersonIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson) + .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(engineeringInterfacePersonIds)){ + userIdList.addAll(Arrays.asList(engineeringInterfacePersonIds.split(","))); + } + String engineerAttSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerAttSet) + .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(engineerAttSetIds)){ + userIdList.addAll(Arrays.asList(engineerAttSetIds.split(","))); + } + String engineerLawSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerLawSet) + .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(engineerLawSetIds)){ + userIdList.addAll(Arrays.asList(engineerLawSetIds.split(","))); + } + + if(CollectionUtils.isNotEmpty(userIdList)){ + userIdList = userIdList.stream().filter(userId -> StringUtils.isNotEmpty(userId)).collect(Collectors.toList()); + List engineeringInterfacePersonList = this.sysUserService.querySysUserListByIdList(userIdList); + if(CollectionUtils.isNotEmpty(engineeringInterfacePersonList)){ + for (SysUser engineeringInterfacePerson : engineeringInterfacePersonList) { + Map engineeringInterfacePersonMap = new HashMap<>(); + engineeringInterfacePersonMap.put("id",engineeringInterfacePerson.getId()); + engineeringInterfacePersonMap.put("userName",engineeringInterfacePerson.getUsername()); + resultList.add(engineeringInterfacePersonMap); + } + } + } + } + return resultList; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index 2018b7622..ea504c0db 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -767,7 +767,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl - + + { let data = { ...item } @@ -412,8 +428,16 @@ } } }, - methods: { + getDeliverableTree() { + getAction('/sys/category/getDeliverableTree', {}).then((res) => { + if (res.success) { + this.DeliverableTreeList = res.result + } else { + this.DeliverableTreeList = [] + } + }) + }, show() { if (!this.queryParamsModel || this.queryParamsModel.length === 0) { this.resetLine() @@ -484,6 +508,7 @@ }, handleSelected(node, item) { console.log(node) + console.log(item) let { type, options, dictCode, dictTable, dictText, customReturnField, popup } = node.dataRef item['type'] = type item['options'] = options @@ -498,6 +523,9 @@ this.$set(item, 'val', undefined) this.$set(item, 'valueName', undefined) this.$set(item, 'valueId', undefined) + if(item.type == 'deliverables'){ + this.getDeliverableTree() + } }, handleOpen() { this.show() diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 778ed12b4..2b7829bc7 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -101,8 +101,9 @@ {{$t('CustomExport')}} + + placement="bottomRight" >