diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/config/ActivitiConfig.java b/laws-modules/src/main/java/com/jero/modules/activiti/config/ActivitiConfig.java index 84bc51d5..57aebbcd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/config/ActivitiConfig.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/config/ActivitiConfig.java @@ -1,10 +1,12 @@ package com.jero.modules.activiti.config; import com.jero.modules.activiti.listener.MyGlobalEventListener; +import com.jero.modules.activiti.service.impl.image.ICustomProcessDiagramGenerator; import org.activiti.spring.SpringProcessEngineConfiguration; import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer; import org.springframework.context.annotation.Configuration; +import javax.annotation.Resource; import java.util.Collections; @@ -14,13 +16,15 @@ import java.util.Collections; */ @Configuration public class ActivitiConfig implements ProcessEngineConfigurationConfigurer { - + @Resource + private ICustomProcessDiagramGenerator customProcessDiagramGenerator; @Override public void configure(SpringProcessEngineConfiguration springProcessEngineConfiguration) { //全局监听器 springProcessEngineConfiguration.setEventListeners(Collections.singletonList(new MyGlobalEventListener())); //有bug 自定义id //springProcessEngineConfiguration.setIdGenerator(new MyGen()); + springProcessEngineConfiguration.setProcessDiagramGenerator(customProcessDiagramGenerator); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java index 6fb45b3e..f1545789 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java @@ -147,9 +147,9 @@ public class ActivitiController { public Result complete(@RequestBody Map map) { //todo 判断当前节点,执行不同的操作 String taskId = map.get("taskId").toString(); - Integer commitFlag = Integer.valueOf(map.get("commitFlag").toString()); - String commitText = map.get("commitText").toString(); - String commitFile = map.get("commitFile").toString(); + //Integer commitFlag = Integer.valueOf(map.get("commitFlag").toString()); + //String commitText = map.get("commitText").toString(); + //String commitFile = map.get("commitFile").toString(); Task task=taskService.createTaskQuery() // 创建任务查询 @@ -161,13 +161,13 @@ public class ActivitiController { }else if ("其他起草人线下填写,上传".equals(taskName)){ } //更新审批表为完成,填充数据 - ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId); - approvalRecord.setCommitFlag(commitFlag == 1? CommitFlagEnum.PASS.getValue() : CommitFlagEnum.REJECT.getValue()); - approvalRecord.setCommitText(commitText); - approvalRecord.setCommitFile(commitFile); - approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); - approvalRecord.setEndTime(new Date()); - processApprovalRecordService.updateById(approvalRecord); + //ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId); + //approvalRecord.setCommitFlag(commitFlag == 1? CommitFlagEnum.PASS.getValue() : CommitFlagEnum.REJECT.getValue()); + //approvalRecord.setCommitText(commitText); + //approvalRecord.setCommitFile(commitFile); + //approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); + //approvalRecord.setEndTime(new Date()); + //processApprovalRecordService.updateById(approvalRecord); //审批节点 taskService.complete(taskId, map); return Result.OK(); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java index ae45161c..d60a36f5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java @@ -11,6 +11,7 @@ import java.util.Date; import java.util.List; import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; /** @@ -213,4 +214,13 @@ public class ProcessProjectStandardTerm { @ApiModelProperty(value="评估结果") private String assessResults_dictText; + /**工作令编号*/ + @TableField(exist = false) + @ApiModelProperty(value = "工作令编号") + private String workNumber; + /**项目名称*/ + @TableField(exist = false) + @ApiModelProperty(value = "项目名称") + private String projectName; + } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java index 8fdbe25f..e209eb5e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java @@ -16,6 +16,8 @@ public interface ProcessProjectStandardTermMapper extends BaseMapper getByModuleOwner(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId, @Param("hasDesignEngineer") Boolean hasDesignEngineer); + List getByRejectModuleOwner(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); + List getByModuleOwnerAutoComplete(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); List getByDesignEngineer(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml index 9f65bc79..83d1e5b5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml @@ -82,6 +82,26 @@ and ppstu.id is not null + +