diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java index 520fd82d..a570cf4a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java @@ -1281,34 +1281,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask for(OcrTaskchildPictureAppro taskchildPicture:list){ - //审批节点 当前如果没有历史操作,则将当前节点赋值到历史审批节点中. - if(StringUtils.isBlank(taskchildPicture.getTasknamehis())){ - taskchildPicture.setTasknamehis(taskchildPicture.getTaskname()); - } - - if(taskchildPicture.getStatshis() != null){ - String stateText; - switch (taskchildPicture.getStatshis()) { - case 1: - stateText = "待审批"; - break; - case 2: - stateText = "通过"; - break; - case 3: - stateText = "不通过"; - break; - default: - stateText = "未知状态"; - break; - } - // 将中文状态赋值给 flowUnionVo 的状态属性 - taskchildPicture.setStatshisText(stateText); - - }else { - //暂定,后期修改 - taskchildPicture.setStatshisText("待审批"); - } if(taskchildPicture.getPictureid() != null && !taskchildPicture.getPictureid().isEmpty()){ Long pictureId = Long.parseLong(taskchildPicture.getPictureid()); @@ -1405,6 +1377,38 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } pageUtils.setTotalCount(count.intValue()); + + //补充历史状态名称,检查补充节点信息 + for (OcrTaskchildPictureAppro ocrTaskchildPictureAppro : list) { + //审批节点 当前如果没有历史操作,则将当前节点赋值到历史审批节点中. + if(StringUtils.isBlank(ocrTaskchildPictureAppro.getTasknamehis())){ + ocrTaskchildPictureAppro.setTasknamehis(ocrTaskchildPictureAppro.getTaskname()); + } + + if(ocrTaskchildPictureAppro.getStatshis() != null){ + String stateText; + switch (ocrTaskchildPictureAppro.getStatshis()) { + case 1: + stateText = "待审批"; + break; + case 2: + stateText = "通过"; + break; + case 3: + stateText = "不通过"; + break; + default: + stateText = "未知状态"; + break; + } + // 将中文状态赋值给 flowUnionVo 的状态属性 + ocrTaskchildPictureAppro.setStatshisText(stateText); + + }else { + //暂定,后期修改 + ocrTaskchildPictureAppro.setStatshisText("待审批"); + } + } pageUtils.setList(list); }