~huangh/gz-dyh.git

			@@ -281,134 +281,142 @@
			// 根据流程显示button
			List<TabButtonInfoDTO> buttonList = new LinkedList<>();
			if (ObjectUtils.isNotEmpty(caseTask)) {
			if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			// 不予受理
			if (CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
			tabList.add(daxx);
			tabList.add(sqjl);

			buttonList.add(zxsl);
			buttonList.add(jb);
			buttonList.add(sb);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(sl);
			buttonList.add(ht);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(htsh);
			}
			if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(sbsh);
			}
			if (FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(zxsl);
			buttonList.add(jb);
			buttonList.add(sb);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(sl);
			buttonList.add(ht);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(htsh);
			}
			if (FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(sbsh);
			}
			if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(zxsl);
			buttonList.add(jb);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(sl);
			buttonList.add(ht);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(htsh);
			}
			if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
			if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
			tabList.add(sxxq);
			tabList.add(sxbl);
			tabList.add(lcdb);
			}else {
			// 正常流程
			if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(tjbljl);
			buttonList.add(lhczsq);
			buttonList.add(jasq);
			buttonList.add(db);
			}else {
			tabList.add(sxxq);
			tabList.add(sxbl);
			tabList.add(lcdb);
			tabList.add(sqjl);

			buttonList.add(tjbljl);
			buttonList.add(zxsl);
			buttonList.add(jb);
			buttonList.add(sb);
			buttonList.add(bysl);
			}
			}
			if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(jash);
			}
			if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
			daxx.setName("信息");
			tabList.add(daxx);
			tabList.add(lcdb);
			tabList.add(sqjl);
			}
			if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(daxx);
			tabList.add(lcdb);
			tabList.add(sqjl);
			}
			if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);
			if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(sl);
			buttonList.add(ht);
			}
			if (FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(htsh);
			buttonList.add(sl);
			buttonList.add(ht);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(htsh);
			}
			if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(sbsh);
			}
			if (FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(zxsl);
			buttonList.add(jb);
			buttonList.add(sb);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(sl);
			buttonList.add(ht);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(htsh);
			}
			if (FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(sbsh);
			}
			if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(zxsl);
			buttonList.add(jb);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(sl);
			buttonList.add(ht);
			buttonList.add(bysl);
			}
			if (FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(htsh);
			}
			if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
			if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
			tabList.add(sxxq);
			tabList.add(sxbl);
			tabList.add(lcdb);
			tabList.add(sqjl);

			buttonList.add(tjbljl);
			buttonList.add(lhczsq);
			buttonList.add(jasq);
			buttonList.add(db);
			} else {
			tabList.add(sxxq);
			tabList.add(sxbl);
			tabList.add(lcdb);
			tabList.add(sqjl);

			buttonList.add(tjbljl);
			}
			}
			if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(jash);
			}
			if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
			daxx.setName("信息");
			tabList.add(daxx);
			tabList.add(lcdb);
			tabList.add(sqjl);
			}
			if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(daxx);
			tabList.add(lcdb);
			tabList.add(sqjl);
			}
			if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(sl);
			buttonList.add(ht);
			}
			if (FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(htsh);
			}
			}
			}else {
			tabList.add(sxxq);
			@@ -543,6 +551,8 @@
			// 不予受理
			if (CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
			webCaseFlowDTO.setNodeShowName("不予受理");
			webCaseFlowDTO.setHandleNotes(null);
			webCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_4);
			}
			handleCaseFlowList.add(webCaseFlowDTO);
			}else {
			@@ -887,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);
			@@ -925,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);
			}

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

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