Merge remote-tracking branch 'origin/master'

fuliqi

2025-02-12 b17b0e4d165d3d5cc272bd796e0dc315847de1a9

Merge remote-tracking branch 'origin/master'

 business/src/main/java/com/ycl/domain/form/TaskJumpForm.java

@@ -29,4 +29,7 @@

    @ApiModelProperty("流程实例id，用于保存日志")
    private String processInsId;

    @ApiModelProperty("说明")
    private String desc;
}

 business/src/main/java/com/ycl/domain/json/JumpData.java

New file
@@ -0,0 +1,22 @@
package com.ycl.domain.json;

import lombok.Data;

/**
 * 跳过任务
 *
 * @author：xp
 * @date：2025/2/12 13:43
 */
@Data
public class JumpData {


    /** 情况说明 */
    private String desc;


    public JumpData(String desc) {
        this.desc = desc;
    }
}

 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java

@@ -24,6 +24,7 @@
import com.ycl.domain.form.TaskJumpForm;
import com.ycl.domain.form.TaskSuperviseForm;
import com.ycl.domain.json.DelegateData;
import com.ycl.domain.json.JumpData;
import com.ycl.domain.json.SuperviseData;
import com.ycl.domain.vo.CustomerTaskVO;
import com.ycl.domain.vo.IndexCustomerTaskVO;
@@ -621,7 +622,7 @@
        Task task = taskService.createTaskQuery().taskId(form.getTaskId()).processInstanceId(form.getProcessInsId()).singleResult();
        if (Objects.nonNull(task)) {
            // 添加跳过日志
            publisher.publishEvent(new TaskLogEvent(this, null,SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), ProcessLogEventTypeEnum.JUMP, null));
            publisher.publishEvent(new TaskLogEvent(this, null,SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), ProcessLogEventTypeEnum.JUMP, new JumpData(form.getDesc())));
            // 查出该任务绑定的表单

            Map<String, Object> data = new HashMap<>(1);

 start/src/main/java/com/ycl/web/controller/system/SysRoleController.java

@@ -53,7 +53,7 @@

    private final ISysDeptService deptService;

    @PreAuthorize("@ss.hasPermi('system:role:list')")
//    @PreAuthorize("@ss.hasPermi('system:role:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysRole role) {
        startPage();

 start/src/main/java/com/ycl/web/controller/system/SysUserController.java

@@ -55,7 +55,7 @@
    /**
     * 获取用户列表
     */
    @PreAuthorize("@ss.hasPermi('system:user:list')")
//    @PreAuthorize("@ss.hasPermi('system:user:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysUser user) {
        startPage();
@@ -217,7 +217,7 @@
    /**
     * 获取部门树列表
     */
    @PreAuthorize("@ss.hasPermi('system:user:list')")
//    @PreAuthorize("@ss.hasPermi('system:user:list')")
    @GetMapping("/deptTree")
    public AjaxResult deptTree(SysDept dept) {
        return success(deptService.selectDeptTreeList(dept));