|
|
@@ -619,6 +619,11 @@ public class TaskController extends BladeController {
|
|
|
String[] parts = key.split("@@@");
|
|
|
return Integer.parseInt(parts[0]);
|
|
|
}
|
|
|
+ @Data
|
|
|
+ class buildTaskInfoDto{
|
|
|
+ private String taskId;
|
|
|
+ private String taskName;
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 构造创建审批任务
|
|
|
@@ -657,7 +662,12 @@ public class TaskController extends BladeController {
|
|
|
}
|
|
|
List<String> taskNameList =Arrays.asList(approvalDTO.getTaskName().split(","));
|
|
|
|
|
|
- String[] formDataIds = approvalDTO.getPeriodId().split(",");
|
|
|
+ String[] formDataIds;
|
|
|
+ if(meterTaskType!=4){
|
|
|
+ formDataIds= approvalDTO.getPeriodId().split(",");
|
|
|
+ }else {
|
|
|
+ formDataIds= approvalDTO.getIds().split(",");
|
|
|
+ }
|
|
|
String[] taskIdList = taskId.split(",");
|
|
|
for (int i = 0; i < formDataIds.length; i++) {
|
|
|
/*主任务*/
|