Merge pull request 'fix:解决终审统计bug，原因的审批节点字段类型修改，不再是数字，终审节点变为finale_judgment' (#142) from fix/Approval_node_adjustment into test

Reviewed-on: #142

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<OcrSearchHistoryMap
             List<OcrTaskchildPictureAppro> ocrTaskchildPictureApproList = new ArrayList<>();
             //定义第一审批节点
             String taskNodeOne = "";
+            Integer taskNode = null;
             if (oaUserApproveVoList.size() > 0) {
                 Map<Long, OaUserApproveVo> 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<Map.Entry<Long, OaUserApproveVo>> iterator = formIdToVoMap.entrySet().iterator();
                 Map.Entry<Long, OaUserApproveVo> firstEntry = iterator.next();
-                taskNodeOne = Integer.toString(firstEntry.getValue().getTaskNode());
+                taskNodeOne = firstEntry.getValue().getTaskNode();
+                if("100".equals(taskNodeOne)){
+                    taskNodeOne = "finale_judgment";
+                }
                 //获取已经审批的任务ID
                 List<Long> formIdList = new ArrayList<>(formIdToVoMap.keySet());
                 //查询该用户第一节点所有待审任务列表
@@ -221,19 +233,31 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
             List<OcrTaskchildPictureAppro> ocrTaskchildPictureApproList = new ArrayList<>();
             //定义第一审批节点
             String taskNodeOne = "";
+            Integer taskNode = null;
             if (oaUserApproveVoList.size() > 0) {
                 Map<Long, OaUserApproveVo> 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<Map.Entry<Long, OaUserApproveVo>> iterator = formIdToVoMap.entrySet().iterator();
                 Map.Entry<Long, OaUserApproveVo> firstEntry = iterator.next();
-                taskNodeOne = Integer.toString(firstEntry.getValue().getTaskNode());
+                taskNodeOne = firstEntry.getValue().getTaskNode();
+                if("100".equals(taskNodeOne)){
+                    taskNodeOne = "finale_judgment";
+                }
                 //获取已经审批的任务ID
                 List<Long> formIdList = new ArrayList<>(formIdToVoMap.keySet());
                 //查询该用户第一节点所有待审任务列表

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;