diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java index df3408e1..874e2433 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java @@ -177,4 +177,9 @@ public class StandardInterpretCommon { * 是否下发:1:是 2:否 0:驳回 */ public static final Integer IS_DISTRIBUTE_0 = 0; + + /** + * 分解单来源:不带入 + */ + public static final String NONCARRY = "noncarry"; } 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 84c2a3a4..dd37df8b 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 @@ -1375,8 +1375,21 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe processStandardInterpret.setSplitInfoId(sarFileSplitInfoEO.getId()); } processStandardInterpretService.saveOrUpdate(processStandardInterpret); - // 如果没选择条款 - if (CollectionUtils.isEmpty(processStandardInterpretClauseList)){ + + // 如果选择了不带入 + if (StandardInterpretCommon.NONCARRY.equals(processStandardInterpret.getDecompositionSource()) + && CollectionUtils.isEmpty(processStandardInterpretClauseList)){ + processStandardInterpret.setChooseClause(YesOrNoEnum.YES.getValue()); + + ProcessStandardInterpretClause processStandardInterpretClause = + new ProcessStandardInterpretClause(); + processStandardInterpretClause.setClauseId(processStandardInterpret.getStandardId()); + processStandardInterpretClause.setItemNum(processStandardInterpret.getStandardNumber()); + processStandardInterpretClause.setItemTitle(processStandardInterpret.getStandardName()); + processStandardInterpretClause.setItemTitle(processStandardInterpret.getStandardName()); + processStandardInterpretClauseList.add(processStandardInterpretClause); + }else if (CollectionUtils.isEmpty(processStandardInterpretClauseList)){ + // 如果没选择条款 processStandardInterpret.setChooseClause(YesOrNoEnum.NO.getValue()); // 自动保存所有条款 processStandardInterpretClauseList =