From 2dddea0b21cb4c8252c3c3d03dc0b8d482920a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 7 Jul 2023 14:27:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FeishuServiceImpl.java | 2 +- .../modules/phone/enums/BrowseTypeEnum.java | 2 +- .../enums/CertificationFlowNodeEnum.java | 6 +-- .../modules/project/enums/JumpLinkEnum.java | 4 ++ .../job/CertificationInventoryJob.java | 4 ++ .../project/job/InventoryAffirmJob.java | 3 ++ ...ctCertificationInventoryEOServiceImpl.java | 40 ++++++++++++++++++- .../ProjectLawsInventoryEOServiceImpl.java | 21 +++++++++- .../DesignComplianceFlowNodeKeyEnum.java | 2 +- .../VerifyComplianceFlowNodeKeyEnum.java | 18 ++++----- jero-web/src/common/lang/en-us.js | 39 +++++++++--------- jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/views/phoneView/taskData.vue | 2 +- 13 files changed, 105 insertions(+), 39 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index e7c33753f..35b9a561d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -1425,7 +1425,7 @@ public class FeishuServiceImpl implements IFeishuService { paramsMap.put("user_ids", userIdArr); paramsMap.put("msg_type", "interactive"); paramsMap.put("card", templateJson); - + log.error("请求飞书消息：" + paramsMap.toJSONString()); // 发送请求给飞书 String response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); // 获取返回结果 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/enums/BrowseTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/enums/BrowseTypeEnum.java index b52761d5c..46b61b9ba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/enums/BrowseTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/enums/BrowseTypeEnum.java @@ -8,7 +8,7 @@ import com.jero.modules.system.util.StringUtils; */ public enum BrowseTypeEnum { WDK("Document Library", "文档库", "Document Library"), - ZSFX("Knowledge sharing", "知识分享", "Knowledge sharing"), + ZSFX("Knowledge sharing", "知识分享", "Knowledge Sharing"), FGYB("Regulatory Monthly Report", "法规月报", "Regulatory Monthly Report"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java index 54147a691..c5d43e6e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java @@ -25,9 +25,9 @@ public enum CertificationFlowNodeEnum { * 任务办理 -> 责任人接受之后，等待提交交付物 * 任务审查 -> 责任人提交交付物之后，认证工程师审查。 */ - CHECKLIST_VERIFICATION ("Task initiation","任务发起","Task initiation"), - TASK_RESPONSIBILITY_CONFIRMATION ("Task responsibility confirmation","任务责任确认","Responsibility confirm"), - TASK_HANDLING ("Task handling","任务办理","Task handling"), + CHECKLIST_VERIFICATION ("Task initiation","任务发起","Task Initiation"), + TASK_RESPONSIBILITY_CONFIRMATION ("Task responsibility confirmation","任务责任确认","Responsibilty Confirmation"), + TASK_HANDLING ("Task handling","任务办理","Task Handling"), TASK_REVIEW ("Task Review","任务审查","Task Review"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java index b93669d80..08b17eb41 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java @@ -29,6 +29,10 @@ public enum JumpLinkEnum { PROBLEM_KNOWLEDGE_BASE("问题知识库，列表页","","/problemknowledgeBase",""), + TO_DO_CENTER_PHONE("手机端待办中心","","/phoneToDoCenter",""), + + + //认证参数收集,认证工程师发起，工程接口人接收 // PROBLEM_KNOWLEDGE_BASE("问题知识库，列表页","","/problemknowledgeBase",""), 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 55523cda4..f0c8a22a6 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 @@ -698,6 +698,8 @@ public class CertificationInventoryJob implements Job { Map hrefFeishuMap = this.projectCertificationInventoryEOService.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN); String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); + String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); + Map standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(list); String standName = (String) standNameAndItemName.get("standName"); @@ -717,6 +719,8 @@ public class CertificationInventoryJob implements Job { templateVariableMap.put("endTime", DateUtils.formatDate(endTime)); templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); + templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P); + larkMesJson.put("templateVariableMap",templateVariableMap); this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson); 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 cdd502126..d77b9fa07 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 @@ -137,6 +137,7 @@ public class InventoryAffirmJob implements Job { 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("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); @@ -168,6 +169,7 @@ public class InventoryAffirmJob implements Job { 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("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); @@ -199,6 +201,7 @@ public class InventoryAffirmJob implements Job { 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("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),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 158d627ff..a87189caf 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 @@ -3,6 +3,7 @@ package com.jero.modules.project.service.impl; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; +import cn.hutool.core.util.URLUtil; import cn.hutool.core.util.ZipUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -152,6 +153,9 @@ 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"); + String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); Map standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOS); String standName = (String) standNameAndItemName.get("standName"); @@ -722,6 +727,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryId, PRN_CN, PRN_EN); String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); + String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); + List certificationEngineerUserInfoList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); certificationEngineerIdList.forEach(userId -> { @@ -1177,6 +1186,8 @@ 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"); + String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); Map standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOList); String standName = (String) standNameAndItemName.get("standName"); @@ -2149,8 +2161,10 @@ 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"); + String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); Map standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOList); String standName = (String) standNameAndItemName.get("standName"); @@ -2287,6 +2302,8 @@ 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"); + String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); // 给studio分配待办中心任务 /*List processInfoDetailEOList = new ArrayList<>(); @@ -2416,6 +2434,8 @@ 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"); + String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); Map> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOList.stream().collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson)); try { @@ -2536,6 +2557,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryId, PRN_CN, PRN_EN); String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); + String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); + List idList = Arrays.asList(ids.split(",")); @@ -3068,6 +3093,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryId, PRN_CN, PRN_EN); String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); + String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); /** * studio催办：除了 清单待发布、审查通过、认证退回 的 催办当前办理人 @@ -3307,8 +3334,10 @@ public class ProjectCertificationInventoryEOServiceImpl 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("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P")); paramsMsg.put("Initiator", projectLibraryBase.getStudioEngineerName()); this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(), paramsMsg); @@ -10834,6 +10838,7 @@ 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("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P")); params.put("Initiator", projectLibraryBase.getStudioEngineerName()); this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(), params); @@ -11090,6 +11095,7 @@ 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("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P")); params.put("Initiator", projectLibraryBase.getStudioEngineerName()); this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(), params); @@ -11794,6 +11800,7 @@ 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("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P")); params.put("Initiator", projectLibraryBase.getStudioEngineerName()); this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(), params); @@ -11885,6 +11892,7 @@ 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("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P")); params.put("Initiator", projectLibraryBase.getStudioEngineerName()); this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(), params); @@ -11955,6 +11963,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 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("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P")); params.put("Initiator", projectLibraryBase.getStudioEngineerName()); this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(), params); @@ -12017,6 +12026,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl
- {{$t('filledBy')}} + {{$t('filledByPhone')}}
{{item.waitSdtNum || '--'}}