From ca34af9442b1bfc127210640d0a311c18757c2ab Mon Sep 17 00:00:00 2001 From: DELL Date: Mon, 22 Apr 2024 12:39:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E7=BB=88=E5=AE=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug=EF=BC=8C=E5=8E=9F=E5=9B=A0=E7=9A=84?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=98=AF?= =?UTF-8?q?=E6=95=B0=E5=AD=97=EF=BC=8C=E7=BB=88=E5=AE=A1=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=8F=98=E4=B8=BAfinale=5Fjudgment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OcrSearchHistoryServiceImpl.java | 36 +++++++++++++++---- .../jyjz/xiaoyao/ocr/vo/OaUserApproveVo.java | 2 +- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java index 077f3200..7351d5e8 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java @@ -127,19 +127,31 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl ocrTaskchildPictureApproList = new ArrayList<>(); //定义第一审批节点 String taskNodeOne = ""; + Integer taskNode = null; if (oaUserApproveVoList.size() > 0) { Map formIdToVoMap = new HashMap<>(); for (OaUserApproveVo vo : oaUserApproveVoList) { Long formId = vo.getFormId(); - Integer taskNode = vo.getTaskNode(); - if (!formIdToVoMap.containsKey(formId) || taskNode < formIdToVoMap.get(formId).getTaskNode()) { + String taskNodeStr = vo.getTaskNode(); + if ("finale_judgment".equals(taskNodeStr)) { + // 如果taskNode字段是"finale_judgment"字符串，将其转换为一个很大的数字 + vo.setTaskNode("100"); + taskNode = 100; + } else { + // 否则将其转换为Integer类型 + taskNode = Integer.parseInt(taskNodeStr); + } + if (!formIdToVoMap.containsKey(formId) || taskNode < Integer.parseInt(formIdToVoMap.get(formId).getTaskNode())) { formIdToVoMap.put(formId, vo); } } //获取该用户第一节点 Iterator> iterator = formIdToVoMap.entrySet().iterator(); Map.Entry firstEntry = iterator.next(); - taskNodeOne = Integer.toString(firstEntry.getValue().getTaskNode()); + taskNodeOne = firstEntry.getValue().getTaskNode(); + if("100".equals(taskNodeOne)){ + taskNodeOne = "finale_judgment"; + } //获取已经审批的任务ID List formIdList = new ArrayList<>(formIdToVoMap.keySet()); //查询该用户第一节点所有待审任务列表 @@ -221,19 +233,31 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl ocrTaskchildPictureApproList = new ArrayList<>(); //定义第一审批节点 String taskNodeOne = ""; + Integer taskNode = null; if (oaUserApproveVoList.size() > 0) { Map formIdToVoMap = new HashMap<>(); for (OaUserApproveVo vo : oaUserApproveVoList) { Long formId = vo.getFormId(); - Integer taskNode = vo.getTaskNode(); - if (!formIdToVoMap.containsKey(formId) || taskNode < formIdToVoMap.get(formId).getTaskNode()) { + String taskNodeStr = vo.getTaskNode(); + if ("finale_judgment".equals(taskNodeStr)) { + // 如果taskNode字段是"finale_judgment"字符串，将其转换为一个很大的数字 + vo.setTaskNode("100"); + taskNode = 100; + } else { + // 否则将其转换为Integer类型 + taskNode = Integer.parseInt(taskNodeStr); + } + if (!formIdToVoMap.containsKey(formId) || taskNode < Integer.parseInt(formIdToVoMap.get(formId).getTaskNode())) { formIdToVoMap.put(formId, vo); } } //获取该用户第一节点 Iterator> iterator = formIdToVoMap.entrySet().iterator(); Map.Entry firstEntry = iterator.next(); - taskNodeOne = Integer.toString(firstEntry.getValue().getTaskNode()); + taskNodeOne = firstEntry.getValue().getTaskNode(); + if("100".equals(taskNodeOne)){ + taskNodeOne = "finale_judgment"; + } //获取已经审批的任务ID List formIdList = new ArrayList<>(formIdToVoMap.keySet()); //查询该用户第一节点所有待审任务列表 diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OaUserApproveVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OaUserApproveVo.java index 262def60..d5a18891 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OaUserApproveVo.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OaUserApproveVo.java @@ -27,7 +27,7 @@ public class OaUserApproveVo implements Serializable { private Long formId; @Schema(description = "审批节点") - private Integer taskNode; + private String taskNode; @Schema(description = "审批节点名称") private String taskName;