|
|
@ -376,6 +376,8 @@ public class FlowTaskController extends BaseController {
|
|
|
|
public ResultVo<OcrTaskchildPicture> listFinalData(PageUtils<OcrTaskchildPicture> pageUtils,
|
|
|
|
public ResultVo<OcrTaskchildPicture> listFinalData(PageUtils<OcrTaskchildPicture> pageUtils,
|
|
|
|
@RequestParam(name = "izupuser", defaultValue = "", required = false) String izupuser,
|
|
|
|
@RequestParam(name = "izupuser", defaultValue = "", required = false) String izupuser,
|
|
|
|
@RequestParam(name = "taskName", defaultValue = "", required = false) String taskName,
|
|
|
|
@RequestParam(name = "taskName", defaultValue = "", required = false) String taskName,
|
|
|
|
|
|
|
|
@RequestParam(name = "taskId", defaultValue = "", required = false) String taskId,
|
|
|
|
|
|
|
|
@RequestParam(name = "pictureId", defaultValue = "", required = false) String pictureId,
|
|
|
|
@RequestParam(name = "izproject", defaultValue = "", required = false) String izproject,
|
|
|
|
@RequestParam(name = "izproject", defaultValue = "", required = false) String izproject,
|
|
|
|
@RequestParam(name = "izplan", defaultValue = "", required = false) String izplan,
|
|
|
|
@RequestParam(name = "izplan", defaultValue = "", required = false) String izplan,
|
|
|
|
@RequestParam(name = "izstatus", defaultValue = "", required = false) String izstatus,
|
|
|
|
@RequestParam(name = "izstatus", defaultValue = "", required = false) String izstatus,
|
|
|
@ -396,6 +398,12 @@ public class FlowTaskController extends BaseController {
|
|
|
|
if(StringUtils.isNotBlank(taskName)){
|
|
|
|
if(StringUtils.isNotBlank(taskName)){
|
|
|
|
searchQuery.addLike("fromtaskname",taskName);
|
|
|
|
searchQuery.addLike("fromtaskname",taskName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(StringUtils.isNotBlank(taskId)){
|
|
|
|
|
|
|
|
searchQuery.addLike("fromtaskid",taskId);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(StringUtils.isNotBlank(pictureId)){
|
|
|
|
|
|
|
|
searchQuery.addLike("pictureid",pictureId);
|
|
|
|
|
|
|
|
}
|
|
|
|
if (org.springframework.util.StringUtils.hasText(izproject)) {
|
|
|
|
if (org.springframework.util.StringUtils.hasText(izproject)) {
|
|
|
|
if (izproject.contains(",")) {
|
|
|
|
if (izproject.contains(",")) {
|
|
|
|
String[] projectIds = izproject.split(","); // 以逗号拆分字符串
|
|
|
|
String[] projectIds = izproject.split(","); // 以逗号拆分字符串
|
|
|
|