From ed6f8262c6e511edd72f87c667b70eb35b01c6f2 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 09 十二月 2024 12:39:27 +0800 Subject: [PATCH] update 优化 代码生成 创建更新时间被覆盖问题 --- ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml index 6801a8e..3641900 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml @@ -41,8 +41,7 @@ FROM ACT_RU_TASK RES INNER JOIN ACT_HI_PROCINST AHP ON RES.PROC_INST_ID_ = AHP.PROC_INST_ID_ INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = RES.PROC_DEF_ID_ - WHERE RES.PARENT_TASK_ID_ IS NULL - ORDER BY RES.CREATE_TIME_ DESC) t ${ew.getCustomSqlSegment} + WHERE RES.PARENT_TASK_ID_ IS NULL) t ${ew.getCustomSqlSegment} </select> <select id="getTaskFinishByPage" resultMap="TaskVoResult"> @@ -56,8 +55,8 @@ FROM ACT_HI_TASKINST HTI INNER JOIN ACT_HI_PROCINST AHP ON HTI.PROC_INST_ID_ = AHP.PROC_INST_ID_ INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = HTI.PROC_DEF_ID_ - WHERE HTI.PARENT_TASK_ID_ IS NULL - ORDER BY HTI.START_TIME_ DESC) t ${ew.getCustomSqlSegment} + WHERE HTI.PARENT_TASK_ID_ IS NULL AND HTI.END_TIME_ IS NOT NULL + ) t ${ew.getCustomSqlSegment} </select> <select id="getTaskCopyByPage" resultMap="TaskVoResult"> @@ -71,8 +70,8 @@ FROM ACT_HI_TASKINST AHT INNER JOIN ACT_HI_PROCINST AHP ON AHT.PROC_INST_ID_ = AHP.PROC_INST_ID_ INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = AHT.PROC_DEF_ID_ - WHERE AHT.PARENT_TASK_ID_ is not null + WHERE AHT.PARENT_TASK_ID_ IS NOT NULL and AHT.scope_type_ = 'copy' - ORDER BY AHT.START_TIME_ DESC) t ${ew.getCustomSqlSegment} + ) t ${ew.getCustomSqlSegment} </select> </mapper> -- Gitblit v1.9.3