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

Merge remote-tracking branch 'origin/fix_20230627' into fix_20230627

Browse Source
This commit is contained in:
zyx.net
2023-06-28 11:49:04 +08:00
parent a2da942929 f4259a34a5
commit ce70b3ed94
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java
+3 -3
View File
@@ -415,11 +415,11 @@ public class ToDoCenterServiceImpl implements IToDoCenterService {
data.setTaskDefinitionKeyName(taskDefinitionKeyName);
}
}
// 如果是清单确认流程，将任务节点设置为 清单校核：Checklist verification
// 如果是清单确认流程，将任务节点设置为 任务发起：Task initiation
if (StringUtils.equals(data.getFlowType(), FlowTypeEnum.QDQR.getValue())) {
String taskDefinitionKeyName = "清单校核";
String taskDefinitionKeyName = "任务发起";
if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
taskDefinitionKeyName = "Checklist verification";
taskDefinitionKeyName = "Task initiation";
}
data.setTaskDefinitionKeyName(taskDefinitionKeyName);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java
+1 -1
View File
@@ -25,7 +25,7 @@ public enum CertificationFlowNodeEnum {
* 任务办理 -> 责任人接受之后，等待提交交付物
* 任务审查 -> 责任人提交交付物之后，认证工程师审查。
*/
CHECKLIST_VERIFICATION ("Checklist verification","清单校核","Checklist verification"),
CHECKLIST_VERIFICATION ("Task initiation","任务发起","Task initiation"),
TASK_RESPONSIBILITY_CONFIRMATION ("Task responsibility confirmation","任务责任确认","Task responsibility confirmation"),
TASK_HANDLING ("Task handling","任务办理","Task handling"),
TASK_REVIEW ("Task Review","任务审查","Task Review"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+3 -3
View File
@@ -778,11 +778,11 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
data.setTaskDefinitionKeyName(taskDefinitionKeyName);
}
}
// 如果是清单确认流程，将任务节点设置为 清单校核：Checklist verification
// 如果是清单确认流程，将任务节点设置为 verdutyId：Task initiation
if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.QDQR.getValue())){
String taskDefinitionKeyName = "清单校核";
String taskDefinitionKeyName = "任务发起";
if(StringUtils.equals(cut,CutEnum.EN.getValue())){
taskDefinitionKeyName = "Checklist verification";
taskDefinitionKeyName = "Task initiation";
}
data.setTaskDefinitionKeyName(taskDefinitionKeyName);
}