diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java index 69655f72..e7b33356 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java @@ -132,7 +132,7 @@ public class ProcessNodeService extends ServiceImpl processNodeList, String processInstanceId) { + // 如果有标准化发起节点,但是没有人员,则删除标准化发起节点 + ProcessNode firstNode = processNodeList.get(0); + ProcessNode secondNode = processNodeList.get(1); + if (StrUtil.isNotBlank(secondNode.getLinkUserIds())) { + if (StrUtil.isBlank(firstNode.getLinkUserIds())) { + processNodeList.remove(0); + } + } + } + private void specialProcessEsInitChange(List processNodeList, String processInstanceId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId); @@ -193,6 +208,7 @@ public class ProcessNodeService extends ServiceImpl processNodeList) { @@ -217,6 +233,7 @@ public class ProcessNodeService extends ServiceImpl processNodeList) { diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java index 807f0e99..337ebe03 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java @@ -65,6 +65,12 @@ public class LawsProjectLibrary implements Serializable { @ApiModelProperty(value = "项目健康度(1-预警、2-风险、3-正常)") private String projectHealth; + /**项目级别*/ + @Dict(dicCode = "project_level") + @Excel(name = "项目级别", width = 15, dicCode = "project_level") + @ApiModelProperty(value = "项目级别") + private String projectLevel; + /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy; diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index e8d2cc34..ac9fd0b8 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -356,7 +356,12 @@ public class FileSpiltService { } } // 判断名称,如果大于10位,取十位, - String itemName = paragraphString.substring(nowStart.get(i).length()).length() > 10 ? paragraphString.substring(nowStart.get(i).length(), nowStart.get(i).length() + 10) : paragraphString.substring(nowStart.get(i).length()); + String itemName; + if (paragraphString.indexOf(nowStart.get(i)) == 0){ + itemName = paragraphString.substring(nowStart.get(i).length()).trim().length() > 10 ? paragraphString.substring(nowStart.get(i).length()).trim().substring(0,10) :paragraphString.substring(nowStart.get(i).length()).trim(); + }else { + itemName = paragraphString.substring(nowStart.get(i).length()).length() > 10 ? paragraphString.substring(nowStart.get(i).length(), nowStart.get(i).length() + 10) : paragraphString.substring(nowStart.get(i).length()); + } List clauseContent = new ArrayList<>(); clauseContent.add(paragraphString); SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), nowStart.get(i), itemName, clauseContent); diff --git a/laws-modules/src/main/java/com/jero/modules/split/util/ReadWordTable.java b/laws-modules/src/main/java/com/jero/modules/split/util/ReadWordTable.java index c3e61b93..aeaf72a2 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/util/ReadWordTable.java +++ b/laws-modules/src/main/java/com/jero/modules/split/util/ReadWordTable.java @@ -144,10 +144,7 @@ public class ReadWordTable { if (tcPr.getVMerge() == null) { return false; } - if (tcPr.getVMerge().getVal() == null){ - return false; - } - if (tcPr.getVMerge().getVal().toString().equalsIgnoreCase("continue")) { + if (tcPr.getVMerge().getVal() == null) { return true; } return false;