From 2014734f83f03cdc050e3cac1a8659f988735aa8 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 11 Jul 2024 15:17:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E4=B8=BB=E8=A7=A3=E8=AF=BB=E4=BA=BA?= =?UTF-8?q?=E5=88=86=E6=89=B9=E5=88=86=E5=8F=91=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ProcessStandardInterpretClauseMapper.xml | 3 ++- .../impl/ProcessStandardInterpretClauseServiceImpl.java | 3 +++ .../service/impl/StandardInterpretFlowServiceImpl.java | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml index c1e3254f..2b881774 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml @@ -9,7 +9,8 @@ IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle, IF(lds.id is not null, null, lds2.item_content) itemContent, standard_interpret_id, - psic.clause_id + psic.clause_id, + interpret_person_ids from laws_chery_dev.process_standard_interpret_clause psic left join laws_domestic_standard lds on psic.clause_id = lds.id and lds.del_flag = 0 left join laws_document_split lds2 on psic.clause_id = lds2.id and lds2.del_flag = 0 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseServiceImpl.java index 25834f1b..738d7fb6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseServiceImpl.java @@ -36,6 +36,9 @@ public class ProcessStandardInterpretClauseServiceImpl QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(StringUtils.isNotBlank(processStandardInterpretClause.getStandardInterpretId()), "standard_interpret_id", processStandardInterpretClause.getStandardInterpretId()); + // 标准主解读人分发 节点查询未分发数据 + queryWrapper.isNull("null".equals(processStandardInterpretClause.getInterpretPersonIds()), + "interpret_person_ids"); queryWrapper.orderByAsc("id"); return processStandardInterpretClauseMapper.queryList(queryWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index 2e7396dc..62189f64 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -179,7 +179,6 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe StandardInterpretDTO data = standardInterpretFlowDTO.getData(); // 根据流程key启动流程,设置流程变量,更新流程总表信息,更新流程审批信息，返回任务信息 startProcessInstanceByKey(StandardInterpretCommon.KEY_3, map, processAll, processApprovalRecord, data); - } @Override @@ -487,6 +486,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe ProcessStandardInterpretClause processStandardInterpretClause = new ProcessStandardInterpretClause(); processStandardInterpretClause.setStandardInterpretId(processStandardInterpret.getId()); + // 标准主解读人分发 + if (StandardInterpretCommon.MASTER_INTERPRET_DISTRIBUTE.equals(node)){ + processStandardInterpretClause.setInterpretPersonIds("null"); + } processStandardInterpretClauseList = processStandardInterpretClauseService.queryList(processStandardInterpretClause); }