From 52ab19a416004df10e95ee1a6a6e37cb8b3774be Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 11 Jan 2024 18:09:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=2080356=20process=5Fnode=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9EtransferFlag=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=BD=AC=E5=8A=9E=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=97=B6=E8=81=94?= =?UTF-8?q?=E6=9F=A5=E5=8F=AF=E4=BB=A5=E8=BD=AC=E5=8A=9E=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/activiti/entity/ProcessNode.java | 6 ++++++ .../laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml | 2 ++ .../service/impl/LawsTaskTransferServiceImpl.java | 2 ++ 3 files changed, 10 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java index 8cab1cf7..4e2038d4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java @@ -145,4 +145,10 @@ public class ProcessNode { @TableField(value = "is_skip") @ApiModelProperty(value = "是否可跳过节点（0否，1是）") private String isSkip; + /** + * 是否可以转办（0否，1是） + */ + @TableField(value = "transfer_flag") + @ApiModelProperty(value = "是否可以转办（0否，1是）") + private String transferFlag; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml index 275f891b..dfe473af 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml @@ -95,6 +95,8 @@ (IF(prc_status IN (2, 3) OR finish_flag = 2, FALSE, TRUE)) state FROM process_all pa LEFT JOIN process_approval_record par ON pa.process_instance_id = par.process_instance_id + LEFT JOIN process_node pn ON pa.process_definition_id = pn.process_definition_id + AND SUBSTR(par.node_id,1,LENGTH(par.node_id)-1) = SUBSTR(pn.xml_node_id,1,LENGTH(pn.xml_node_id)-1) LEFT JOIN sys_user u ON user_id = u.id ${ew.customSqlSegment} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java index 72dd39dd..c52b69c6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessStatusEnum; @@ -92,6 +93,7 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { queryWrapper.like(StringUtils.isNotBlank(lawsProcessDb.getTaskName()), "task_name", lawsProcessDb.getTaskName()); queryWrapper.like(StringUtils.isNotBlank(lawsProcessDb.getPrcName()), "pa.prc_name", lawsProcessDb.getPrcName()); queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue()); + queryWrapper.eq("pn.transfer_flag", YesOrNoEnum.YES.getValue()); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); queryWrapper.orderByDesc("par.create_time"); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();