WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改手机端发送消息

Browse Source
This commit is contained in:
高嵩
2023-07-07 14:27:41 +08:00
parent 2607c0775f
commit 2dddea0b21
13 changed files with 105 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java
+1 -1
View File
@@ -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());
// 获取返回结果
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/enums/BrowseTypeEnum.java
+1 -1
View File
@@ -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"),
;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java
+3 -3
View File
@@ -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"),
;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java
+4
View File
@@ -29,6 +29,10 @@ public enum JumpLinkEnum {
PROBLEM_KNOWLEDGE_BASE("问题知识库，列表页","","/problemknowledgeBase",""),
TO_DO_CENTER_PHONE("手机端待办中心","","/phoneToDoCenter",""),
//认证参数收集,认证工程师发起，工程接口人接收
// PROBLEM_KNOWLEDGE_BASE("问题知识库，列表页","","/problemknowledgeBase",""),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java
+4
View File
@@ -698,6 +698,8 @@ public class CertificationInventoryJob implements Job {
Map<String, Object> 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<String, Object> 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);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
+3
View File
@@ -137,6 +137,7 @@ public class InventoryAffirmJob implements Job {
Map<String, Object> 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<String, Object> 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<String, Object> 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);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+38 -2
View File
@@ -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<Proj
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
@Value(value = "${jero.path.upload}")
private String uploadpath;
@Autowired
@@ -695,6 +699,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
Map<String, Object> 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<String, Object> standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOS);
String standName = (String) standNameAndItemName.get("standName");
@@ -722,6 +727,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
templateVariableMap.put("operateUserName",currentUser.getUsername());
larkMesJson.put("templateVariableMap",templateVariableMap);
@@ -1159,6 +1166,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
Map<String, Object> 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<SysUser> certificationEngineerUserInfoList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
certificationEngineerIdList.forEach(userId -> {
@@ -1177,6 +1186,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
templateVariableMap.put("endTime",DateUtils.formatDate(inventoryVerifyEndTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
larkMesJson.put("templateVariableMap",templateVariableMap);
this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
@@ -2100,6 +2111,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
Map<String, Object> 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<String, Object> standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOList);
String standName = (String) standNameAndItemName.get("standName");
@@ -2149,8 +2161,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
templateVariableMap.put("operateUserName",currentUser.getUsername());
larkMesJson.put("templateVariableMap",templateVariableMap);
this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
}
@@ -2217,6 +2231,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
Map<String, Object> 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<String, Object> standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOList);
String standName = (String) standNameAndItemName.get("standName");
@@ -2287,6 +2302,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
templateVariableMap.put("operateUserName",currentUser.getUsername());
larkMesJson.put("templateVariableMap",templateVariableMap);
@@ -2345,6 +2362,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
Map<String, Object> 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<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
@@ -2416,6 +2434,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
templateVariableMap.put("certificationEngineer",currentUser.getUsername());
larkMesJson.put("templateVariableMap",templateVariableMap);
@@ -2475,6 +2495,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
Map<String, Object> 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<String, List<ProjectCertificationInventoryEO>> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOList.stream().collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson));
try {
@@ -2536,6 +2557,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
templateVariableMap.put("endTime",DateUtils.formatDate(taskConfirmEndTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
templateVariableMap.put("certificationEngineer",currentUser.getUsername());
larkMesJson.put("templateVariableMap",templateVariableMap);
@@ -2971,6 +2994,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
Map<String, Object> 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<String> idList = Arrays.asList(ids.split(","));
@@ -3068,6 +3093,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
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);
@@ -3254,6 +3280,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
Map<String, Object> 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<Proj
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("viewBtnUrlEnPhone",hrefFeishu_CN_P);
larkMesJson.put("templateVariableMap",templateVariableMap);
this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
@@ -3368,6 +3397,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
templateVariableMap.put("endTime",DateUtils.formatDate(inventoryVerifyEndTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
templateVariableMap.put("viewBtnUrlEnPhone",hrefFeishu_CN_P);
larkMesJson.put("templateVariableMap",templateVariableMap);
this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
@@ -3574,8 +3604,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
+ JumpLinkEnum.CERTIFICATION_INVENTORY_LINK.getType()
+ "&projectName=" + PRN_EN;
result.put("hrefFeishu_CN",hrefFeishu_CN);
result.put("hrefFeishu_EN",hrefFeishu_EN);
//飞书手机跳转链接
String hrefFeishu_CN_P = backUrlPhone
+ JumpLinkEnum.TO_DO_CENTER_PHONE.getLink();
result.put("hrefFeishu_CN", URLUtil.encode(hrefFeishu_CN));
result.put("hrefFeishu_EN",URLUtil.encode(hrefFeishu_EN));
result.put("hrefFeishu_CN_P",URLUtil.encode(hrefFeishu_CN_P));
return result;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+19 -2
View File
@@ -1,5 +1,6 @@
package com.jero.modules.project.service.impl;
import cn.hutool.core.util.URLUtil;
import cn.hutool.core.util.ZipUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -203,6 +204,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
private String simfangFontFilePath;
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
@Autowired
private SysCategoryServiceImpl sysCategoryService;
@@ -6879,6 +6882,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> 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<ProjectLawsIn
Map<String, Object> 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<ProjectLawsIn
Map<String, Object> 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<ProjectLawsIn
Map<String, Object> 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<ProjectLawsIn
Map<String, Object> 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<ProjectLawsIn
Map<String, Object> 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<ProjectLawsIn
String flowTypeEn = (String) params.get("flowTypeEn");
String hrefFeishu_CN = (String) params.get("hrefFeishu_CN");
String hrefFeishu_EN = (String) params.get("hrefFeishu_EN");
String hrefFeishu_CN_P = (String) params.get("hrefFeishu_CN_P");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
@@ -12042,6 +12053,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
templateVariableMap.put("studioEngineerName", projectLibraryBase.getStudioEngineerName());
templateVariableMap.put("endTime", endTime);
templateVariableMap.put("viewBtnUrlCn", hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlCnPhone", hrefFeishu_CN_P);
templateVariableMap.put("viewBtnUrlEn", hrefFeishu_EN);
templateVariableMap.put("operateUserName", ObjectUtils.isNotEmpty(currentUser) ? currentUser.getUsername() : projectLibraryBase.getStudioEngineerName());
templateVariableMap.put("standName", serialNumbers);
@@ -12078,8 +12090,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
+ "&projectName=" + PRN_EN
+ "&roleOpen=" + roleOpen;
result.put("hrefFeishu_CN", hrefFeishu_CN);
result.put("hrefFeishu_EN", hrefFeishu_EN);
//飞书手机跳转链接
String hrefFeishu_CN_P = backUrlPhone
+ JumpLinkEnum.TO_DO_CENTER_PHONE.getLink();
result.put("hrefFeishu_CN", URLUtil.encode(hrefFeishu_CN));
result.put("hrefFeishu_EN", URLUtil.encode(hrefFeishu_EN));
result.put("hrefFeishu_CN_P", URLUtil.encode(hrefFeishu_CN_P));
return result;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java
+1 -1
View File
@@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils;
* 待办中心-设计符合性流程节点key枚举类
*/
public enum DesignComplianceFlowNodeKeyEnum {
FQLC("发起流程","Process initiation","fqlc"),
FQLC("发起流程","Task initiation","fqlc"),
ZRRQR("任务责任确认","Responsibility confirm","zrrqr"), // 责任人确认
DEZRRQR("任务责任确认","Responsibility confirm","dezrrqr"),// 第二责任人确认
ZRRTJJFW("符合性确认","Compliance confirm","zrrtjjfw"),// "责任人提交交付物"
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java
+9 -9
View File
@@ -7,17 +7,17 @@ import org.apache.commons.lang3.StringUtils;
* 待办中心-验证符合性流程节点key枚举类
*/
public enum VerifyComplianceFlowNodeKeyEnum {
FQLC("发起流程","Process initiation","fqlc"),
ZRRQR("任务责任确认","Responsibility confirm","zrrqr"), // 责任人确认
DEZRRQR("任务责任确认","Responsibility confirm","dezrrqr"),// 第二责任人确认
ZRRTJJFW("符合性确认","Compliance confirm","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("符合性确认","Compliance confirm","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核
FQLC("发起流程","Task Initiation","fqlc"),
ZRRQR("任务责任确认","Responsibility Confirm","zrrqr"), // 责任人确认
DEZRRQR("任务责任确认","Responsibility Confirm","dezrrqr"),// 第二责任人确认
ZRRTJJFW("符合性确认","Compliance Confirm","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("符合性确认","Compliance Confirm","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("符合性审查","Compliance Review","fggcssh"), // 法规工程师审核
// 修改交付物流程
BCTJ_ZRRBCTJFQ("补充提交","Supplementary submission","zrrbctjfq"), // 责任人补充提交发起
BCTJ_ZRRBCTJXG("补充提交","Supplementary submission","zrrbctjxg"), // 责任人补充提交修改
BCTJ_FGGCSBCSH("补充审查","Supplementary review","fggcsbcsh"), // 法规工程师补充审核
BCTJ_ZRRBCTJFQ("补充提交","Supplementary Submission","zrrbctjfq"), // 责任人补充提交发起
BCTJ_ZRRBCTJXG("补充提交","Supplementary Submission","zrrbctjxg"), // 责任人补充提交修改
BCTJ_FGGCSBCSH("补充审查","Supplementary Review","fggcsbcsh"), // 法规工程师补充审核
;
String cnName;
jero-web/src/common/lang/en-us.js
+20 -19
View File
@@ -123,7 +123,7 @@ module.exports = {
MergeAll: 'Merge All',
TreeOperation: 'Tree Operation',
essentialInformation: 'General Information',
DetailsPhasedImplementation: 'Details of the phased implementation',
DetailsPhasedImplementation: 'Phased Implementation',
Statutenumberclause: 'Statute number/clause',
OrganizationName: 'Organization Name',
EnterOrganizationDepartment: 'Please enter organization / department name',
@@ -501,9 +501,9 @@ module.exports = {
feedback: 'Feedback',
approvalHistory: 'Approval History',
cannotExceed500characters: 'Cannot Exceed 500 characters',
accord: 'Compliant',
nonConformity: 'Non-compliant',
Tracked: 'To Be Tracked',
accord: 'Compliance',
nonConformity: 'Non-compliance',
Tracked: 'To be Tracked',
notInvolved: 'NA',
Operator: 'Operator',
role: 'Role',
@@ -906,11 +906,11 @@ module.exports = {
maintainVirtualList: 'Maintain Market List',
certificationListMaintenance: 'Homo List Maintenance',
reasonsForRejection: 'Reason for Rejection',
inconformity: 'Non-compliant',
toTrack: 'To Be Tracked',
inconformity: 'Non-compliance',
toTrack: 'To be Tracked',
Launch: 'Initiate',
maintainProgress: 'Maintain Schedule',
redSchedule: 'Red: non-compliant, without acceptable solutions or timeline ',
redSchedule: 'Red: non-compliance, without acceptable solutions or timeline ',
yellowSchedule: 'Yellow: non-compliant/to be tracked, with acceptable solutions and timeline ',
greenRequirements: 'Green: compliant or meeting the requirements',
blueUndeterminedState: 'Blue: pending',
@@ -986,7 +986,7 @@ module.exports = {
CollectionInitiated: 'To be collected',
handledInterface: 'To be processed by eng. interface',
ReturnedPerson: 'Rejected by eng. interface',
completed: 'To Be Filled',
completed: 'To be filled',
Filledreturn: 'Rejected by the applicant',
Submitted: 'Submitted',
ReturnedEngineer: 'Rejected by homo engineer',
@@ -1361,10 +1361,11 @@ module.exports = {
taskConfirmationHandling:'Task confirmation handling',
relatedVersion:'Related Version',
filledBy:'Filled by',
parameterToBeInitiated:'Parameter to be initiated',
parameterToBeInitiated:'To be initiated',
listTaskConfirmation:'List task confirmation',
completednum: 'To Be Filled',
completednum: 'To be filled',
filledBynum:'Filled by',
filledByPhone:'To be assigned',
parameterToBeInitiatednum:'Parameter to be initiated',
listToConfirm:'To Be Confirmed',
toSubmit:'To Be Submitted',
@@ -1414,8 +1415,8 @@ module.exports = {
returnedForApproval:'Returned',
changeSetting:'Change Configuration',
referenceDeliverables:'Reference Deliverable',
missionAccepted:'Task Accepted',
missionRejection:'Task Rejected',
missionAccepted:'Accept',
missionRejection:'Reject',
turnToDo:'Forward',
initiateTask:'Initiate Task',
compliancereport:'Generate Compliance report',
@@ -1527,9 +1528,9 @@ module.exports = {
Tasknode:'Task Node',
Taskresponsibilityrecognition:'Responsibility Confirm',
uploadattachment:'Upload',
Processhistory:'Process history',
Processhistory:'Process History',
historyData:'1. Regulatory Engineer, 2. Responsible person, 3. Responsible person, 4. Regulatory Engineer',
resultofhandling:'Result of handling',
resultofhandling:'Result',
cause:'cause',
networksecurityrequirements:'Network security requirements',
upgradefunctionrequirements:'Upgrade function requirements',
@@ -1754,13 +1755,13 @@ module.exports = {
taskToBeConfirmed:'Task to be confirmed',
resultsToBeSubmitted:'Results to be submitted',
resultsToBeReviewed:'Results to be reviewed',
compliance:'Compliant',
nonCompliance:'Non-compliant',
toBeTracked:'To Be Tracked',
compliance:'Compliance',
nonCompliance:'Non-compliance',
toBeTracked:'To be Tracked',
NA:'NA',
electroniccontrollerparameter:'Electronic controller parameter',
reviewAndPass:'Review and pass',
reviewAndReturn:'Review and return',
reviewAndPass:'Approve',
reviewAndReturn:'Reject',
marketRegulationListDetails:'Market Regulation List Details',
marketRegulationList:'Market Regulation List',
onlyDataWithTheCurrentCanBeManipulated:'Only data with the current user as the responsible person can be manipulated',
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1462,6 +1462,7 @@ module.exports = {
taskConfirmationHandling: '任务确认办理',
relatedVersion: '相关版本',
filledBy: '待分配填写人',
filledByPhone:'待分配填写人',
parameterToBeInitiated: '参数待发起',
listTaskConfirmation: '清单任务确认',
completednum: '待填写',
jero-web/src/views/phoneView/taskData.vue
+1 -1
View File
@@ -115,7 +115,7 @@
</div>
<div class="parame-box-bottom-box">
<div class="parame-box-bottom-box-text-top">
{{$t('filledBy')}}
{{$t('filledByPhone')}}
</div>
<div class="parame-box-bottom-box-text-num">
{{item.waitSdtNum || '--'}}