diff --git a/easy-activiti/src/main/java/com/easy/admin/activiti/controller/ActivitiModelController.java b/easy-activiti/src/main/java/com/easy/admin/activiti/controller/ActivitiModelController.java index b0818e5..dba8b60 100644 --- a/easy-activiti/src/main/java/com/easy/admin/activiti/controller/ActivitiModelController.java +++ b/easy-activiti/src/main/java/com/easy/admin/activiti/controller/ActivitiModelController.java @@ -2,8 +2,8 @@ package com.easy.admin.activiti.controller; import com.easy.admin.activiti.model.ActivitiModel; import com.easy.admin.activiti.service.ActivitiModelService; -import com.easy.admin.common.core.common.pagination.Page; import com.easy.admin.common.core.annotation.ResponseResult; +import com.easy.admin.common.core.common.pagination.Page; import com.fasterxml.jackson.databind.node.ObjectNode; import org.activiti.engine.impl.persistence.entity.ModelEntity; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java index 4e4518f..b44bd4d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java @@ -15,6 +15,7 @@ import com.easy.admin.activiti.model.ActivitiTask; import com.easy.admin.activiti.service.ActivitiModelService; 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.SysUser; import com.easy.admin.auth.model.SysUserRole; @@ -103,6 +104,10 @@ public class WorkflowServiceImpl implements IWorkflowService { private SysUserRoleService userRoleService; @Autowired private SysDictService dictService; + + @Autowired + private SysUserMapper userMapper; + public WorkFlow createFlow(String processDefinitionKey,String id){ String definitionId = activitiModelService.selectProcessDefinitionId(processDefinitionKey); ActivitiProcessDefinitionVO activitiProcessDefinitionVO = new ActivitiProcessDefinitionVO(); @@ -469,6 +474,16 @@ public class WorkflowServiceImpl implements IWorkflowService { if(project!=null){ item.setBusinessTitle(project.getProjectName()); item.setReformName(project.getReformName()); + // 回填发起人 + if (item.getProcessDefinitionName().equals("联合技术审查上传文件审批")){ + LambdaQueryWrapper 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); diff --git a/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx b/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx index 1c81fa2..ffef0c0 100644 Binary files a/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx and b/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx differ