|
@ -15,6 +15,7 @@ import com.easy.admin.activiti.model.ActivitiTask; |
|
|
import com.easy.admin.activiti.service.ActivitiModelService; |
|
|
import com.easy.admin.activiti.service.ActivitiModelService; |
|
|
import com.easy.admin.activiti.service.ActivitiProcessDefinitionService; |
|
|
import com.easy.admin.activiti.service.ActivitiProcessDefinitionService; |
|
|
|
|
|
|
|
|
|
|
|
import com.easy.admin.auth.dao.SysUserMapper; |
|
|
import com.easy.admin.auth.model.SysRole; |
|
|
import com.easy.admin.auth.model.SysRole; |
|
|
import com.easy.admin.auth.model.SysUser; |
|
|
import com.easy.admin.auth.model.SysUser; |
|
|
import com.easy.admin.auth.model.SysUserRole; |
|
|
import com.easy.admin.auth.model.SysUserRole; |
|
@ -103,6 +104,10 @@ public class WorkflowServiceImpl implements IWorkflowService { |
|
|
private SysUserRoleService userRoleService; |
|
|
private SysUserRoleService userRoleService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private SysDictService dictService; |
|
|
private SysDictService dictService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private SysUserMapper userMapper; |
|
|
|
|
|
|
|
|
public WorkFlow createFlow(String processDefinitionKey,String id){ |
|
|
public WorkFlow createFlow(String processDefinitionKey,String id){ |
|
|
String definitionId = activitiModelService.selectProcessDefinitionId(processDefinitionKey); |
|
|
String definitionId = activitiModelService.selectProcessDefinitionId(processDefinitionKey); |
|
|
ActivitiProcessDefinitionVO activitiProcessDefinitionVO = new ActivitiProcessDefinitionVO(); |
|
|
ActivitiProcessDefinitionVO activitiProcessDefinitionVO = new ActivitiProcessDefinitionVO(); |
|
@ -469,6 +474,16 @@ public class WorkflowServiceImpl implements IWorkflowService { |
|
|
if(project!=null){ |
|
|
if(project!=null){ |
|
|
item.setBusinessTitle(project.getProjectName()); |
|
|
item.setBusinessTitle(project.getProjectName()); |
|
|
item.setReformName(project.getReformName()); |
|
|
item.setReformName(project.getReformName()); |
|
|
|
|
|
// 回填发起人
|
|
|
|
|
|
if (item.getProcessDefinitionName().equals("联合技术审查上传文件审批")){ |
|
|
|
|
|
LambdaQueryWrapper<HuzhouProjectinfo> qw = new LambdaQueryWrapper<>(); |
|
|
|
|
|
qw.eq(HuzhouProjectinfo::getProjectName,project.getProjectName()).last("limit 1"); |
|
|
|
|
|
HuzhouProjectinfo projectInfo = projectinfoMapper.selectOne(qw); |
|
|
|
|
|
String projectContacts = projectInfo.getProjectContacts(); |
|
|
|
|
|
SysUser user = userMapper.getById(projectContacts); |
|
|
|
|
|
item.setApplyUser(user.getNickname()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
page.setRecords(select); |
|
|
page.setRecords(select); |
|
|