任务包列表接口返回数据结构修复，终审高级检索接口实现

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<IPage<OcrTaskchildPicture>> queryPageByUserSearchId(
             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,

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);
 
+
     /**
      * 获取当前任务的可回退的流程集合
      *

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<OcrTaskchildPicture> queryPageByUserSearchId(Integer pageNo, Integer pageSize, String userSearchId) {
         OcrUsersearch ocrUsersearch = ocrUsersearchService.selectByUserSearchId(userSearchId);
+        List<OcrUsersearchchild> 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<OcrTaskchildPicture> queryWrapper = new QueryWrapper();
-
-
         for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) {
             this.formattingSearchChild(queryWrapper, usersearchchild);
-
         }
         //分页查询并组装子集数据
         Page<OcrTaskchildPicture> page = new Page<>(pageNo, pageSize);
-//        IPage<OcrTaskchildPicture> pageList = this.page(page, queryWrapper);
+        IPage<OcrTaskchildPicture> pageList = ocrTaskchildPictureService.page(page, queryWrapper);
-//        for (OcrTaskchildPicture ocrPicture1 : pageList.getRecords()) {
+        return pageList;
-//            if (org.apache.commons.lang3.StringUtils.isNotBlank(ocrPicture1.getPictureclassid())) {
-//                OcrPictureclass ocrPictureclass = ocrPictureclassService.getById(ocrPicture1.getPictureclassid());
-//                ocrPicture1.setOcrPictureclass(ocrPictureclass);
-//            }
-//        }
-//        return pageList;
-        return null;
     }
 
 
+
     /**
      * 查询我发起的流程实例
      *

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<OcrPackagetaskVo> newPageList = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal());
+		newPageList.setRecords(ocrPackagetaskVoList);
+
+		return ResultVoUtil.success(newPageList);
 	}
 	
 	/**