From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期五, 21 三月 2025 10:57:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- flowable/src/main/resources/mapper/FlowDeployMapper.xml | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/flowable/src/main/resources/mapper/FlowDeployMapper.xml b/flowable/src/main/resources/mapper/FlowDeployMapper.xml index f8e81fd..632bb71 100644 --- a/flowable/src/main/resources/mapper/FlowDeployMapper.xml +++ b/flowable/src/main/resources/mapper/FlowDeployMapper.xml @@ -53,4 +53,37 @@ order by rd.deploy_time_ desc </select> + <select id="selectDeployListWithConfigPage" resultType="com.ycl.domain.dto.FlowProcDefWithConfigDto"> + SELECT + rp.id_ as id, + rp.deployment_id_ as deploymentId, + rd.name_ as name, + rd.category_ as category, + rp.key_ as flowKey, + rp.version_ as version, + rp.suspension_state_ as suspensionState, + rd.deploy_time_ as deploymentTime, + pc.project_type, + pc.fund_type, + pc.invest_type, + pc.importance_type, + pc.process_def_id, + pc.process_def_version, + pc.deploy_id + FROM + act_re_procdef rp + LEFT JOIN act_re_deployment rd ON rp.deployment_id_ = rd.id_ + LEFT JOIN t_process_config_info pc ON pc.process_def_id = rp.id_ AND pc.process_def_version = rp.version_ + <where> + <if test="query.name != null and query.name != ''"> + AND rd.name_ like concat('%', #{query.name}, '%') + </if> + </where> + order by rd.deploy_time_ desc + </select> + + <update id="updateProcess"> + UPDATE act_ge_bytearray SET BYTES_ = #{bytes, jdbcType=BLOB} WHERE DEPLOYMENT_ID_ = #{deployId} AND GENERATED_ = 0 + </update> + </mapper> -- Gitblit v1.8.0