From ce0469b591e2d0bd4f14bba4e5613113b95a8b7e Mon Sep 17 00:00:00 2001 From: DELL Date: Wed, 20 Mar 2024 13:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8C=85=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BF=AE=E5=A4=8D=EF=BC=8C=E7=BB=88=E5=AE=A1=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlowTaskController.java | 4 +- .../flowable/service/IFlowTaskService.java | 2 + .../service/impl/FlowTaskServiceImpl.java | 43 +++++++++++++------ .../controller/OcrPackagetaskController.java | 5 ++- 4 files changed, 39 insertions(+), 15 deletions(-) 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 f27a4798..2aca5df1 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 @@ -484,7 +484,7 @@ public class FlowTaskController extends BaseController { /** - * 终审列表 + * 终审列表(高级检索) * @return */ @ApiOperation(value="图片分页列表查询-根据用户预设检索条件查询", notes="") @@ -492,7 +492,7 @@ public class FlowTaskController extends BaseController { @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true), @ApiImplicitParam(paramType = "path",name = "userSearchId", value = "预设检索条件id", required = true), }) - @GetMapping(value = "/listfinal1") + @GetMapping(value = "/listfinalAdvanced") public ResultVo> queryPageByUserSearchId( @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java index 9bbb04cf..5ea0aa58 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java @@ -15,6 +15,7 @@ import cn.jyjz.xiaoyao.oa.from.dataobject.Category; import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.task.api.Task; @@ -35,6 +36,7 @@ public interface IFlowTaskService { Boolean complete(FlowTaskVO taskVO, HttpServletRequest request); + /** * 获取当前任务的可回退的流程集合 * 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 a570cf4a..f972b2a9 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 @@ -38,6 +38,7 @@ 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.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -1064,28 +1065,46 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask @Override public IPage queryPageByUserSearchId(Integer pageNo, Integer pageSize, String userSearchId) { OcrUsersearch ocrUsersearch = ocrUsersearchService.selectByUserSearchId(userSearchId); + List ocrUsersearchchildList = ocrUsersearch.getOcrUsersearchchildList(); + for(OcrUsersearchchild ocrUsersearchchild : ocrUsersearchchildList){ + String searchfield = ocrUsersearchchild.getSearchfield(); + switch (searchfield) { + case "izupuser": + ocrUsersearchchild.setSearchfield("FROMUSERID"); + break; + case "izproject": + ocrUsersearchchild.setSearchfield("FROMPROJECTID"); + break; + case "izplan": + ocrUsersearchchild.setSearchfield("FROMPLANID"); + break; + case "izstatus": + ocrUsersearchchild.setSearchfield("STATES"); + break; + case "iztaskrrom": + ocrUsersearchchild.setSearchfield("FROMSOURCEID"); + break; + case "izuptime": + ocrUsersearchchild.setSearchfield("FROMUPTIME"); + break; + default: + break; + } + ocrUsersearch.setOcrUsersearchchildList(ocrUsersearchchildList); + } QueryWrapper queryWrapper = new QueryWrapper(); - - for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) { this.formattingSearchChild(queryWrapper, usersearchchild); - } //分页查询并组装子集数据 Page page = new Page<>(pageNo, pageSize); -// IPage pageList = this.page(page, queryWrapper); -// for (OcrTaskchildPicture ocrPicture1 : pageList.getRecords()) { -// if (org.apache.commons.lang3.StringUtils.isNotBlank(ocrPicture1.getPictureclassid())) { -// OcrPictureclass ocrPictureclass = ocrPictureclassService.getById(ocrPicture1.getPictureclassid()); -// ocrPicture1.setOcrPictureclass(ocrPictureclass); -// } -// } -// return pageList; - return null; + IPage pageList = ocrTaskchildPictureService.page(page, queryWrapper); + return pageList; } + /** * 查询我发起的流程实例 * diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java index e1d7ce94..506fc9be 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java @@ -129,7 +129,10 @@ public class OcrPackagetaskController extends BaseController{ ocrPackagetaskVoList.add(ocrPackagetaskVo); } - return ResultVoUtil.success(ocrPackagetaskVoList); + IPage newPageList = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal()); + newPageList.setRecords(ocrPackagetaskVoList); + + return ResultVoUtil.success(newPageList); } /**