~huangh/gz-dyh.git

			@@ -897,14 +897,11 @@
			* @param terms 条件
			* @return Page
			*/
			public Page<FrontPageListDTO> pageMyTaskShWSQD(PageRequest page, int type, Map<String, Object> terms){
			public Page<FrontPageListWSQDDTO> pageMyTaskShWSQD(PageRequest page, Map<String, Object> terms){
			try {
			long total = 0;
			List<FrontPageListDTO> frontPageListDTOList = new ArrayList<>();
			total = mapper.countMyTaskShWSQD(terms);
			frontPageListDTOList = mapper.pageMyTaskShWSQD(page,terms);

			return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
			long total = mapper.countMyTaskShWSQD(terms);
			List<FrontPageListWSQDDTO> frontPageListWSQDDTOList = mapper.pageMyTaskShWSQD(page,terms);
			return new PageImpl<FrontPageListWSQDDTO>(frontPageListWSQDDTOList, page, total);
			}catch (Exception e) {
			log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
			@@ -935,16 +932,18 @@
			List<CaseAssistApply>caseAssistApplyList = caseAssistApplyService.list(caseAssistApplyQueryWrapper);
			List<SortUtilDTO> sortUtilDTOList = new ArrayList<>();

			List<String> idList = new ArrayList<>();
			String ids = new String();
			ids += caseReturnList.stream().map(CaseReturn:: getId).collect(Collectors.joining(","));
			ids += caseAppearList.stream().map(CaseAppear:: getId).collect(Collectors.joining(","));
			ids += caseWindupApplyList.stream().map(CaseWindupApply:: getId).collect(Collectors.joining(","));
			ids += caseAssistApplyList.stream().map(CaseAssistApply:: getId).collect(Collectors.joining(","));
			idList.addAll(caseReturnList.stream().map(CaseReturn:: getId).collect(Collectors.toList()));
			idList.addAll(caseAppearList.stream().map(CaseAppear:: getId).collect(Collectors.toList()));
			idList.addAll(caseWindupApplyList.stream().map(CaseWindupApply:: getId).collect(Collectors.toList()));
			idList.addAll(caseAssistApplyList.stream().map(CaseAssistApply:: getId).collect(Collectors.toList()));
			ids = idList.stream().map(String::valueOf).collect(Collectors.joining("','"));
			List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = new ArrayList<>();
			if(StringUtils.isNotBlank(ids)){
			Map terms = new HashMap();
			terms.put("mainId", caseId);
			terms.put("ownerIds", "," + ids + ",");
			terms.put("ownerIds", "'" + ids + "'");
			fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(terms);
			}

			@@ -2602,4 +2601,12 @@
			}
			}

			/**
			* 按条件查询
			* @param terms 条件
			* @return List
			*/
			public List<SignTaskDTO> listIdByTerms(Map<String, Object> terms){
			return mapper.listIdByTerms(terms);
			}
			}