From 327efce893aebf9f0a5787052070708489a99291 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 24 Jan 2024 16:27:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=A4=8D=E5=AE=A1=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=90=8E=E7=AB=AF=E6=8E=A7=E5=88=B6=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/service/ProcessNodeService.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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) { From 5bc2abef71be092759d32f44adead57ed350b9f8 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 24 Jan 2024 16:34:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=BA=93?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/projectLibrary/entity/LawsProjectLibrary.java | 6 ++++++ 1 file changed, 6 insertions(+) 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; From 935b49c1d45d42aa0fb5582a020cf7ed25868d76 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 24 Jan 2024 16:37:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=2078375=20=E6=96=87=E6=A1=A3=E6=8B=86?= =?UTF-8?q?=E5=88=86--=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/split/util/ReadWordTable.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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; From 11f1a3216988e4490791a94ae974e4b6a76e5775 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 24 Jan 2024 16:38:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=2078450=20=E6=96=87=E6=A1=A3=E6=8B=86?= =?UTF-8?q?=E5=88=86--=E6=8B=86=E5=88=86=E5=B7=B2=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=96=87=E6=9C=AC--=E6=9D=A1=E6=96=87=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E7=9A=84=EF=BC=8C=E6=8C=91=E5=89=94=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=AD=97=E6=95=B0=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/split/service/impl/FileSpiltService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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);