diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java index fe435b02..74353c65 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java @@ -20,11 +20,14 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat; import cn.jyjz.xiaoyao.oa.from.dataobject.Category; +import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove; +import cn.jyjz.xiaoyao.oa.from.service.UserapproveService; import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo; import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import com.alanpoi.common.util.StringUtils; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.*; @@ -44,6 +47,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Api(tags="ocr_流程接口") @RestController @@ -65,6 +69,9 @@ public class FlowTaskController extends BaseController { @Resource private OcrTaskchildPictureService ocrTaskchildPictureService; + + @Resource + private UserapproveService userapproveService; // /** // * 查询我的待办任务 // * @return @@ -168,10 +175,6 @@ public class FlowTaskController extends BaseController { if(!this.ocrTaskchildPictureService.validateApprove(formid)){ return ResultVoUtil.error("存在已经审批的任务。"); } - - if(!this.ocrTaskchildPictureService.validateBoole(formid)){ - return ResultVoUtil.error("存在未判真假数据。"); - } //TODO 判断taskid是否为非法，空置、taskid是否存在 @@ -253,6 +256,7 @@ public class FlowTaskController extends BaseController { //租户主键，由前端页面传送 String tenantId = request.getHeader("X-Tenant-Id"); String taskid = request.getParameter("taskid"); + String taskname = request.getParameter("taskname"); String states = request.getParameter("states"); String fromprojectid = request.getParameter("fromprojectid"); String fromuserid = request.getParameter("fromuserid"); @@ -264,6 +268,9 @@ public class FlowTaskController extends BaseController { if(StringUtils.isNotBlank(taskid)){ searchQuery.addEqual("taskid",taskid); } + if(StringUtils.isNotBlank(taskname)){ + searchQuery.addLike("taskname",taskname); + } if(StringUtils.isNotBlank(states)){ searchQuery.addEqual("states",states); } @@ -276,9 +283,10 @@ public class FlowTaskController extends BaseController { if(StringUtils.isNotBlank(fromplanid)){ searchQuery.addEqual("fromplanid",fromplanid); } - //查询判过真假的 - searchQuery.addNotEqual("iztrueorfalse",null); User user = this.userService.getSessionUser(request); +// List userApprove = userapproveService.list(new LambdaQueryWrapper().eq(Userapprove::getUserid, user.getId())); +// List collect = userApprove.stream().map(Userapprove::getFormid).map(Object::toString).collect(Collectors.toList()); +// searchQuery.addIn("formid",collect); if(user.isUserIsSys(xiaoyaoConfig.getWebconfig().getSysLoginUser().split(","))){ flowTaskService.getMyProcessInstances(searchQuery.getQuery(),pageUtils); @@ -293,7 +301,6 @@ public class FlowTaskController extends BaseController { } searchQuery.addEqual("tenantid",tenantId); flowTaskService.getMyProcessInstances(searchQuery.getQuery(),pageUtils); - //待办信息，增加是否查看标记 if(StringUtils.isNotBlank(assigneeId) && assigneeId.equals(user.getId().toString())){ 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 459f5f40..a4945993 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 @@ -61,6 +61,12 @@ public class FlowUnionVo { @ApiModelProperty(value ="租户主键") private Long tenantid; + @ApiModelProperty(value ="当前节点id") + private String nodeName; + + @ApiModelProperty(value ="任务名称") + private String taskName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonSerialize(using = DateSerializer.class) @ApiModelProperty(value ="创建时间") @@ -79,6 +85,8 @@ public class FlowUnionVo { @ApiModelProperty(value = "项目对象") private Category categoryDto; + + @ApiModelProperty(value = "任务id") private String taskId; //是否查看，true：未查看，false：已查看 diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml index 0409bc08..b9e8f8bb 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml @@ -48,6 +48,8 @@ PROCESSINSTANCEID AS processinstanceid, CREATEUSERNAME AS createusername, TENANTID AS tenantid, + TASKNAME AS TASKNAME, + NODENAME AS NODENAME, PACKAGEID as packageid @@ -116,9 +118,10 @@ and FROMUSERID ${fromuserid.dataOp} ${fromuserid.likestar}#{fromuserid.value}${fromuserid.likeend} and FROMPLANID ${fromplanid.dataOp} ${fromplanid.likestar}#{fromplanid.value}${fromplanid.likeend} and IZTRUEORFALSE ${iztrueorfalse.dataOp} ${iztrueorfalse.likestar}#{iztrueorfalse.value}${iztrueorfalse.likeend} + and TASKNAME ${taskname.dataOp} ${taskname.likestar}#{taskname.value}${taskname.likeend} and ID in - + #{item} @@ -127,6 +130,12 @@ select uapo.FORMID from OA_USERAPPROVE_T uapo where uapo.USERID = #{approveUserid.value} ) + + or ID in + + #{item} + +