diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java index 85486fe..ca20f56 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java @@ -201,6 +201,8 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{ this.sendMessage(entity,processWorkFlowResponse.getUserId(),content); return this.planService.updateById(entity); } + log.error("plan_listener_entity:{}",entity); + this.planService.updateById(entity); this.saveAccessMaterial(entity); this.saveAccessContent(entity); String content = "您有一条检修计划待审批!检修计划名称:".concat(entity.getName()) @@ -218,7 +220,6 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{ for(OperAccessContentDTO item : entity.getAccessContents()){ //任务参数 AccessTaskV4DTO task = BeanUtil.copy(item, AccessTaskV4DTO.class); - task.setId(null); task.setCreateTime(new Date()); task.setCreateUser(entity.getCreateUser()); task.setProcDefId(entity.getProcDefId()); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java index 209ae0f..e9e2381 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java @@ -78,6 +78,7 @@ public class AccessTaskV4ServiceImpl implements AccessTaskV4Service { // 步骤1.保存检修任务 this.save(entity); + log.error("start_task_processV4 : {}",entity.getId()); // 步骤2.保存检修材料 this.saveMaterial(entity); @@ -183,19 +184,20 @@ public class AccessTaskV4ServiceImpl implements AccessTaskV4Service { this.statiticsSave(entity); // 更新任务数据 return this.taskService.updateById(entity); - }else if(ObjectUtil.isEmpty(variables.get("examine")) && !(Boolean) variables.get("examine")){ + }else if(ObjectUtil.isNotEmpty(variables.get("examine")) && !(Boolean) variables.get("examine")){ String content = "您有一条检修任务待处理!检修任务名称:".concat(entity.getName()) .concat(",当前环节:") .concat(processWorkFlowResponse.getTaskName()); this.sendMessage(entity,processWorkFlowResponse.getUserId(),content); return this.taskService.updateById(entity); } + this.taskService.updateById(entity); // 保存检修材料 this.saveMaterial(entity); // 保存检修详情 this.saveDetails(entity); // 发送消息 - String content = "您有一条检修任务待审批!检修任务名称:".concat(entity.getName()) + String content = "您有一条检修任务待处理/审核,检修任务名称:".concat(entity.getName()) .concat(",当前环节:") .concat(processWorkFlowResponse.getTaskName()); this.sendMessage(entity,processWorkFlowResponse.getUserId(),content);