Merge remote-tracking branch 'origin/master'

fuliqi

2025-01-20 9e28453dba6ecf93c6c2234ba38def7c41cf12f0

 flowable/src/main/resources/mapper/ProcessLogMapper.xml

File was renamed from flowable/src/main/resources/mapper/FlowLogMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.mapper.FlowLogMapper">
<mapper namespace="com.ycl.mapper.ProcessLogMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.domain.vo.FlowLogVO">
    <resultMap id="BaseResultMap" type="com.ycl.domain.vo.ProcessLogVO">
        <result column="task_id" property="taskId" />
        <result column="event_type" property="eventType" />
        <result column="project_id" property="projectId" />
@@ -28,7 +28,7 @@
            TFL.event_data_json,
            TFL.id
        FROM
            t_flow_log TFL
            t_process_log TFL
        WHERE
            TFL.id = #{id} AND TFL.deleted = 0
    </select>
@@ -44,7 +44,7 @@
            TFL.event_data_json,
            TFL.id
        FROM
            t_flow_log TFL
            t_process_log TFL
        WHERE
            TFL.deleted = 0
    </select>