Skip to content

A
amos-boot-biz
Commit 50412359 authored by litengwei's avatar litengwei
Browse files
Options

代码提交

parent cc7de47c
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 62 deletions
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java
View file @ 50412359
......@@ -264,72 +264,74 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
}
}
taskName = dataObject.getString("name");
ProjectInitiation projectInitiation = new ProjectInitiation();
projectInitiation.setInstanceId(instanceId);
//将所要的数据存为context格式
projectInitiation.setContext(JSON.toJSONString(objectd));
projectInitiation.setTaskId(dataObject.getString("id"));
projectInitiation.setTaskName(taskName);
projectInitiation.setType(ProcessTypeEnum.项目立项.getType());
//项目的管辖区域
String regionCode = project.getInstallRegionCode();
LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SuperviseRule :: getAdminRegionCode,regionCode);
SuperviseRule superviseRule = superviseRuleService.getOne(wrapper);
if (ProjectInitiationEnum.告知申请.getName().equals(taskName) && !ValidationUtil.isEmpty(objectd)) {
object.put("companyName",project.getConstructionUnit());
problemInitiationService.sendSms(object, SMSEnum.项目安装告知申请.getCode());
}
if (ProjectInitiationEnum.告知申请.getName().equals(taskName) || ProjectInitiationEnum.接受告知.getName().equals(taskName) ) {
extendId = object.getLong("sequenceNbr");
}
if (ProjectInitiationEnum.监检员审核.getName().equals(taskName) && "1".equals(option)) {
if(null != dataObject) {
taskName = dataObject.getString("name");
ProjectInitiation projectInitiation = new ProjectInitiation();
projectInitiation.setInstanceId(instanceId);
//将所要的数据存为context格式
projectInitiation.setContext(JSON.toJSONString(objectd));
projectInitiation.setTaskId(dataObject.getString("id"));
projectInitiation.setTaskName(taskName);
projectInitiation.setType(ProcessTypeEnum.项目立项.getType());
//项目的管辖区域
String regionCode = project.getInstallRegionCode();
LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SuperviseRule :: getAdminRegionCode,regionCode);
SuperviseRule superviseRule = superviseRuleService.getOne(wrapper);
if (ProjectInitiationEnum.告知申请.getName().equals(taskName) && !ValidationUtil.isEmpty(objectd)) {
object.put("companyName",project.getConstructionUnit());
problemInitiationService.sendSms(object, SMSEnum.项目安装告知申请.getCode());
}
if (ProjectInitiationEnum.告知申请.getName().equals(taskName) || ProjectInitiationEnum.接受告知.getName().equals(taskName) ) {
extendId = object.getLong("sequenceNbr");
}
if (ProjectInitiationEnum.监检员审核.getName().equals(taskName) && "1".equals(option)) {
projectInitiation.setTaskName(taskName+"（流程结束！）");
}
}
try {
//组装信息
TaskResultDTO dto = new TaskResultDTO();
dto.setResult(condition);
dto.setResultCode(XJConstant.condition);
dto.setTaskId(projectInitiation.getTaskId());
HashMap<String, Object> variables = new HashMap<>();
variables.put(XJConstant.condition, condition);
variables.put(XJConstant.option,option);
dto.setVariable(variables);
//执行流程
Workflow.taskClient.completeByTask(projectInitiation.getTaskId(),dto);
//保存日志
this.save(projectInitiation);
try {
//组装信息
TaskResultDTO dto = new TaskResultDTO();
dto.setResult(condition);
dto.setResultCode(XJConstant.condition);
dto.setTaskId(projectInitiation.getTaskId());
HashMap<String, Object> variables = new HashMap<>();
variables.put(XJConstant.condition, condition);
variables.put(XJConstant.option,option);
dto.setVariable(variables);
//执行流程
Workflow.taskClient.completeByTask(projectInitiation.getTaskId(),dto);
//保存日志
this.save(projectInitiation);
//更新任务表的状态 已办
taskType = getUnitId(unitIds, project, superviseRule);
//更新任务表的状态 已办
taskType = getUnitId(unitIds, project, superviseRule);
// if(ProjectInitiationEnum.设计开工资料提交.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装开工资料提交.getName().equals(project.getStatus())){
// project.setStatus(ProjectInitiationEnum.提交资料.getName());
// }
if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(project.getStatus())){
project.setStatus(ProjectInitiationEnum.建设负责人指定项目资料员.getName());
}
taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(project.getStatus())){
project.setStatus(ProjectInitiationEnum.建设负责人指定项目资料员.getName());
}
taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
//更新project种的status字段,更新关系表中的state字段，表示当前流程下一个执行的任务
boolean bool = updateFlowStatus(instanceId);
//更新project种的status字段,更新关系表中的state字段，表示当前流程下一个执行的任务
boolean bool = updateFlowStatus(instanceId);
//如果更新了status状态 新增任务表的状态 待办
if(bool) {
project = projectService.getById(object.getString("sequenceNbr"));
if (ValidationUtil.isEmpty(project)) {
project = projectService.getById(object.getString("projectId"));
//如果更新了status状态 新增任务表的状态 待办
if(bool) {
project = projectService.getById(object.getString("sequenceNbr"));
if (ValidationUtil.isEmpty(project)) {
project = projectService.getById(object.getString("projectId"));
}
unitIds = new ArrayList<>();
taskType = getUnitId(unitIds, project, superviseRule);
taskService.saveOrUpdateTask(project.getStatus(), false, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds, extendId, instanceId);
}
unitIds = new ArrayList<>();
taskType = getUnitId(unitIds, project, superviseRule);
taskService.saveOrUpdateTask(project.getStatus(), false, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds, extendId, instanceId);
} catch (Exception e) {
e.printStackTrace();
}
} catch (Exception e) {
e.printStackTrace();
}
}
......@@ -609,13 +611,13 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
taskName = taskName + "/" + sjStatus;
}
}
if ("流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus())) {
if (project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) {
taskName = StringUtils.substringBefore(project.getStatus(), "/");
} else if (project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName())) {
taskName = StringUtils.substringAfter(project.getStatus(), "/");
}
}
// if ("流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus())) {
// if (project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) {
// taskName = StringUtils.substringBefore(project.getStatus(), "/");
// } else if (project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName())) {
// taskName = StringUtils.substringAfter(project.getStatus(), "/");
// }
// }
project.setStatus(taskName);
projectService.updateById(project);
......
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