Commit a75857ff authored by litengwei's avatar litengwei

代码提交

parent 586dc11e
...@@ -226,6 +226,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -226,6 +226,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
Long extendId = -1L; Long extendId = -1L;
String taskName = ""; String taskName = "";
String roleId = orgService.getReginParams().getRole().getSequenceNbr().toString(); String roleId = orgService.getReginParams().getRole().getSequenceNbr().toString();
System.out.println(roleId+"角色ID");
JSONObject object = JSON.parseObject(JSON.toJSONString(objectd)); JSONObject object = JSON.parseObject(JSON.toJSONString(objectd));
Project project = JSON.parseObject(JSON.toJSONString(objectd),Project.class); Project project = JSON.parseObject(JSON.toJSONString(objectd),Project.class);
...@@ -246,8 +247,10 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -246,8 +247,10 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
boolean flag = false; boolean flag = false;
for(Object o:jsonArray){ for(Object o:jsonArray){
String name = JSON.parseObject(JSON.toJSONString(o)).getString("name"); String name = JSON.parseObject(JSON.toJSONString(o)).getString("name");
System.out.println(name+"外层==============");
if(ProjectInitiationEnum.安装开工资料修改.getName().equals(name) || ProjectInitiationEnum.设计开工资料修改.getName().equals(name) ){ if(ProjectInitiationEnum.安装开工资料修改.getName().equals(name) || ProjectInitiationEnum.设计开工资料修改.getName().equals(name) ){
dataObject = JSON.parseObject(JSON.toJSONString(o)); dataObject = JSON.parseObject(JSON.toJSONString(o));
AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(String.valueOf(JSON.parseObject(JSON.toJSONString(o)).getString("id"))); AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(String.valueOf(JSON.parseObject(JSON.toJSONString(o)).getString("id")));
if (!ObjectUtils.isEmpty(taskGroupName)) { if (!ObjectUtils.isEmpty(taskGroupName)) {
JSONArray data2 = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data"))); JSONArray data2 = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
...@@ -268,6 +271,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -268,6 +271,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
} }
if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(name) || ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(name) ){ if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(name) || ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(name) ){
System.out.println(name+"外层==============");
dataObject = JSON.parseObject(JSON.toJSONString(o)); dataObject = JSON.parseObject(JSON.toJSONString(o));
AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(String.valueOf(JSON.parseObject(JSON.toJSONString(o)).getString("id"))); AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(String.valueOf(JSON.parseObject(JSON.toJSONString(o)).getString("id")));
if (!ObjectUtils.isEmpty(taskGroupName)) { if (!ObjectUtils.isEmpty(taskGroupName)) {
......
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