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 d88b76c..e277997 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 @@ -34,9 +34,11 @@ import cn.jyjz.xiaoyao.oa.from.service.*; import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo; import cn.jyjz.xiaoyao.ocr.dataobject.*; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService; import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -107,6 +109,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask @Resource private OcrUsersearchService ocrUsersearchService; + @Resource + private OcrPictureService ocrPictureService; + @Override public void myTodoTaskList(PageUtils vo, HttpServletRequest request) { @@ -1119,6 +1124,32 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask // flowableccIPage.setRecords(list); for(FlowUnionVo flowUnionVo:list){ + if(flowUnionVo.getStates() != null){ + String stateText; + switch (flowUnionVo.getStates()) { + case 1: + stateText = "撤销"; + break; + case 2: + stateText = "审批中"; + break; + case 3: + stateText = "审批通过"; + break; + case 5: + stateText = "审批未通过"; + break; + default: + stateText = "未知状态"; + break; + } + // 将中文状态赋值给 flowUnionVo 的状态属性 + flowUnionVo.setStatesText(stateText); + + }else { + //暂定，后期会修改 + flowUnionVo.setStatesText("审批中"); + } //查询对应的流程分类 Category category = categoryService.selectDtoById(flowUnionVo.getCategoryid()); flowUnionVo.setCategoryDto(category); @@ -1211,7 +1242,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask pageUtils.setList(list); } - /** * 查询我的待办、已经办理任务 * @@ -1250,6 +1280,39 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask List list = ocrTaskchildPictureService.listmytask(query); for(OcrTaskchildPictureAppro taskchildPicture:list){ + + 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()); + LambdaQueryWrapper ocrPictureLambdaQueryWrapper = new LambdaQueryWrapper<>(); + ocrPictureLambdaQueryWrapper.eq(OcrPicture::getId,pictureId); + OcrPicture ocrPictureOne = ocrPictureService.getOne(ocrPictureLambdaQueryWrapper); + taskchildPicture.setFromUserName(ocrPictureOne.getField1()); + } + //查询对应的流程分类 Category category = categoryService.selectDtoById(Long.parseLong(taskchildPicture.getCategoryid())); taskchildPicture.setCategoryDto(category); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/FlowUnionVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/FlowUnionVo.java index a494599..1587197 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/FlowUnionVo.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/FlowUnionVo.java @@ -44,7 +44,10 @@ public class FlowUnionVo { private String category; @ApiModelProperty(value ="状态，审批状态 1:撤销 2:审批中 3:审批通过 5：审批未通过 ") private Integer states; - + + @ApiModelProperty(value ="状态，审批状态 1:撤销 2:审批中 3:审批通过 5：审批未通过 ") + private String statesText; + @ApiModelProperty(value ="流程定义id") private String processdefinitionid; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java index 1533f7e..d2f647a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java @@ -122,9 +122,12 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable { @ApiModelProperty(value = "任务名称,来源于图片表") private String fromtaskname; - @ApiModelProperty(value = "提报人") + @ApiModelProperty(value = "提报人ID") private String fromuserid; + @ApiModelProperty(value = "提报人") + private String fromUserName; + @ApiModelProperty(value = "所属项目") private String fromprojectid; @@ -149,6 +152,9 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable { @ApiModelProperty(value = "历史-审批状态，记录当前节点审批状态，1：.待审批 (只针对前端返回 库中逻辑上不存在) 2.通过 3.不通过") private Integer statshis; + @ApiModelProperty(value = "历史-审批状态，记录当前节点审批状态，1：.待审批 (只针对前端返回 库中逻辑上不存在) 2.通过 3.不通过") + private String statshisText; + @ApiModelProperty(value = "历史-审批意见") private String commenthis;