From 11e1f13850b2a38c10fe9597b73639aed4000886 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 15 Aug 2024 10:10:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/entity/ProcessApprovalRecord.java | 7 +++++++ .../mapper/ProcessApprovalRecordMapper.java | 5 +++++ .../mapper/xml/ProcessApprovalRecordMapper.xml | 8 ++++++++ .../service/ProcessApprovalRecordService.java | 18 ++++++++++++------ 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java index 8a0324c4..51bfe12e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java @@ -213,4 +213,11 @@ public class ProcessApprovalRecord { @TableField(exist = false) @ApiModelProperty(value = "快照Id") private String snapshotId; + + /** + * 任务受理人组织机构 + */ + @TableField(exist = false) + @ApiModelProperty(value = "任务受理人组织机构") + private String taskAcceptorDept; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessApprovalRecordMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessApprovalRecordMapper.java index 33186fb4..f37ed819 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessApprovalRecordMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessApprovalRecordMapper.java @@ -1,7 +1,11 @@ package com.jero.modules.activiti.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.activiti.entity.ProcessApprovalRecord; +import org.apache.ibatis.annotations.Param; /** * @@ -9,4 +13,5 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord; *@date 2023-10-16 15:49 */ public interface ProcessApprovalRecordMapper extends BaseMapper { + Page pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper wrapper); } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessApprovalRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessApprovalRecordMapper.xml index 99dc5d98..920cb4c0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessApprovalRecordMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessApprovalRecordMapper.xml @@ -25,4 +25,12 @@ id, task_id, task_name, process_instance_id, msg_type, user_id, mesg, finish_flag, project_id, commit_flag, commit_text, prc_name, create_time, update_time, end_time + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java index ec76cbb9..4c80f204 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java @@ -53,6 +53,9 @@ public class ProcessApprovalRecordService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessApprovalRecord::getTaskId,taskId); @@ -71,13 +74,16 @@ public class ProcessApprovalRecordService extends ServiceImpl wrapper = new QueryWrapper<>(); if (StringUtils.isNotBlank(processApprovalRecord.getFinishFlagSearch())){ - wrapper.in("finish_flag", Arrays.asList(processApprovalRecord.getFinishFlagSearch().split(","))); + wrapper.in("par.finish_flag", Arrays.asList(processApprovalRecord.getFinishFlagSearch().split(","))); } - wrapper.eq(processApprovalRecord.getFinishFlag() != null, "finish_flag", processApprovalRecord.getFinishFlag()); - wrapper.eq("over_due", YesOrNoEnum.NO.getValue()); - wrapper.eq("process_instance_id", processApprovalRecord.getProcessInstanceId()); - wrapper.last("ORDER BY IF(ISNULL(create_time), 1, 0) DESC ,create_time DESC, end_time DESC"); - Page pageList = this.page(page, wrapper); + wrapper.eq(processApprovalRecord.getFinishFlag() != null, "par.finish_flag", processApprovalRecord.getFinishFlag()); + wrapper.eq("par.over_due", YesOrNoEnum.NO.getValue()); + wrapper.eq("par.process_instance_id", processApprovalRecord.getProcessInstanceId()); + wrapper.like(StrUtil.isNotBlank(processApprovalRecord.getTaskName()), "par.task_name", processApprovalRecord.getTaskName()); + wrapper.like(StrUtil.isNotBlank(processApprovalRecord.getTaskAcceptor()), "CONCAT(u.realname, '(', u.username, ')')", processApprovalRecord.getTaskAcceptor()); + wrapper.eq(StrUtil.isNotBlank(processApprovalRecord.getTaskAcceptorDept()), "ud.dep_id", processApprovalRecord.getTaskAcceptorDept()); + wrapper.last("ORDER BY IF(ISNULL(par.create_time), 1, 0) DESC , par.create_time DESC, par.end_time DESC"); + Page pageList = baseMapper.pageList(page, wrapper); List records = pageList.getRecords(); if (CollUtil.isEmpty(records)) { return pageList;