From f105f78edd8bcf22783a4c6720f2cb857093e62d Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Tue, 22 Jul 2025 10:27:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActivitiModelController.java | 2 +- .../service/impl/WorkflowServiceImpl.java | 15 +++++++++++++++ .../excelTemplate/项目计划模板.xlsx | Bin 17551 -> 17622 bytes 3 files changed, 16 insertions(+), 1 deletion(-) 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 1c81fa2c229a08688dc7ad322e4d7ec764e13b07..ffef0c05c95a9efff958c407de5539d91bf34b69 100644 GIT binary patch delta 3562 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 delta 3520 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

B_u21CV{Ebk z_v9|Y$zkv<{=E+6Br^3RdW;XOF%^QGBSOjEWdCL$?|^`alt5XW32*L>7>JIi(!FEr z`a`DkV%RybR$Jzfit72WYNS=I`b|L!tdv2gBx|@YYzyLdccVaG#57SS@K#W$8YFVC z#+DrU0q3eZBU&ZpNhxRW-k$wAV@3hE7!`AHe!90Jq*?2ofE>>8GVNnO=25<+WfP?* zf$>To`Xb^{_Yhsxk_5>IJIU(C#_`)2+Q1u4?Wy`6B$8+%N{85o_m3d zRL=c!^r;8=Wzzdd&IIHmhPkkp{^hkK^T~R%xclJs?WNPw{`7<5zXa1Q+)>&vh41ul zL`*t<(=w$Du6n#3OwQcpr!;XVYLk>~iM-oG2m9h3ZASf%$B}%r-F+hlFSBP~4Iw_= z)B!TbSWA2K!uIbvv!hjb()yW(e))h(