Commit 2c698ffc authored by 刘凡's avatar 刘凡

优化:移装变更 代办任务model字段

parent efce4678
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -8,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
import com.yeejoin.amos.boot.module.jg.api.entity.*;
......@@ -671,7 +673,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
TaskModelDto taskModelDto = new TaskModelDto();
BeanUtils.copyProperties(taskV2Model, taskModelDto);
// 创建新的代办
taskModelDto.setModel(jgChangeRegistrationTransfer);
taskModelDto.setTaskName(workflowResult.getNextTaskName());
taskModelDto.setExecuteUserIds(workflowResult.getNextExecutorUserIds());
taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
......@@ -680,6 +681,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
taskModelDto.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
taskModelDto.setRelationId(instanceId);
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(jgChangeRegistrationTransfer, taskMessageDto);
taskModelDto.setModel(taskMessageDto);
commonService.buildTaskModel(Collections.singletonList(taskModelDto));
}
}
......@@ -1058,12 +1062,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
toDoTask.setFlowStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
toDoTask.setFlowStatusLabel(transfer.getStatus());
toDoTask.setFlowCode(transfer.getNextTaskId());
toDoTask.setModel(transfer);
toDoTask.setStartUserId(transfer.getCreateUserId());
toDoTask.setStartUser(transfer.getCreateUserName());
toDoTask.setStartUserCompanyName(transfer.getCreateUserCompanyName());
toDoTask.setStartDate(new Date());
toDoTask.setNextExecuteUser(transfer.getNextExecutorIds());
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(sorkflow, taskMessageDto);
toDoTask.setModel(taskMessageDto);
toDoTasklist.add(toDoTask);
}
commonService.buildTaskModel(toDoTasklist);
......
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