Commit b70b8d58 by chenweisong

更新

parent 75c3092a
......@@ -120,7 +120,7 @@ public class TaskController {
// 组id
String groupId = "id:" + templateId;
if (groupId.equals(identityLink.getGroupId())) {
missions.add(convertTaskToMission(groupTask, ImmutableMap.of("username", username, "type", CtrlConstant.TASK_TYPE_GROUP, "templateId", templateId)));
missions.add(convertTaskToMission(groupTask, ImmutableMap.of("username", username, "type", CtrlConstant.TASK_TYPE_GROUP, "templateId", templateId, "config", template.getConfig())));
}
});
}
......@@ -339,17 +339,21 @@ public class TaskController {
missionType = CtrlConstant.MISSION_TYPE_DATA_ENTER;
mission = CtrlConstant.MISSION_TEXT_DATA_ENTER;
long templateId = 0;
String config = "";
if (type == CtrlConstant.TASK_TYPE_PERSONAL) {
String assignee = task.getAssignee();
String[] array = assignee.split(":");
try {
templateId = Long.parseLong(array[1]);
config = "";
} catch (Exception e) {
}
} else if (type == CtrlConstant.TASK_TYPE_GROUP) {
templateId = Long.parseLong(params.get("templateId").toString());
config = params.get("config").toString();
}
builder.config(config);
builder.excelId(templateId);
} else if (task.getTaskDefinitionKey().equals(CtrlConstant.MISSION_KEY_DATA_AUDIT)) {
missionType = CtrlConstant.MISSION_TYPE_DATA_AUDIT;
......
......@@ -21,8 +21,10 @@ public class Mission {
private int missionType;
@ApiModelProperty(name = "mission", value = "任务名称")
private String mission;
@ApiModelProperty(name = "excelId", value = "模板id(前身为excelList[0])")
@ApiModelProperty(name = "excelId", value = "模板id(前身为excelList[0].id)")
private long excelId;
@ApiModelProperty(name = "config", value = "模板配置(前身为excelList[0].config)")
private String config;
@ApiModelProperty(name = "processId", value = "流程实例id 补录任务需要用到")
private String processId;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment