~huangh/gz-dyh.git

			@@ -215,8 +215,6 @@
			*/
			public TabButtonDTO webGetTabButton(String caseTaskId, String userId){
			try{
			// 查询当前任务信息
			CaseTask caseTask = mapper.selectById(caseTaskId);
			// 定义tab
			TabButtonInfoDTO sxxq = new TabButtonInfoDTO();
			sxxq.setId("sxxq");
			@@ -283,97 +281,84 @@
			TabButtonInfoDTO bysl = new TabButtonInfoDTO();
			bysl.setId("bysl");
			bysl.setName("不予受理");

			// 根据流程显示tab
			List<TabButtonInfoDTO> tabList = new LinkedList<>();
			// 根据流程显示button
			List<TabButtonInfoDTO> buttonList = new LinkedList<>();
			// 查询当前任务信息
			CaseTask caseTask = mapper.selectById(caseTaskId);
			if (ObjectUtils.isNotEmpty(caseTask)) {
			// 不予受理
			if (ObjectUtils.isNotEmpty(caseTask.getHandleResult()) && CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
			tabList.add(byslxq);
			tabList.add(sqjl);

			// 任务已完成
			if (CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){
			// 不予受理
			if (ObjectUtils.isNotEmpty(caseTask.getHandleResult()) && CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
			tabList.add(byslxq);
			tabList.add(sqjl);
			}else {
			CaseInfo caseInfo = caseInfoService.getById(caseTask.getCaseId());
			if (CaseProcessBaseConstsEnum.CASE_PROCESS_6.getIndex() != caseInfo.getProcess()){
			daxx.setName("详情");
			}
			tabList.add(daxx);
			tabList.add(lcdb);
			tabList.add(sqjl);
			}
			}else {
			// 正常流程
			if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
			// 进行中任务
			if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())
			\|\| FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())
			\|\| FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(zxsl);
			sl.setName("自行受理");
			buttonList.add(sl);
			buttonList.add(jb);
			buttonList.add(sb);
			buttonList.add(bysl);

			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
			if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())
			\|\| FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())
			\|\| FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			tabList.add(sqjl);

			buttonList.add(sl);
			buttonList.add(ht);
			buttonList.add(bysl);

			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
			if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())
			\|\| FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex().equals(caseTask.getNodeId())
			\|\| FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex().equals(caseTask.getNodeId())
			\|\| FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
			sxxq.setName("详情");
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(htsh);

			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
			if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())
			\|\| FlowNodeEnum.FLOW_NODE_SJ_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);
			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
			if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
			@@ -386,6 +371,10 @@
			buttonList.add(lhczsq);
			buttonList.add(jasq);
			buttonList.add(db);

			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			} else {
			tabList.add(sxxq);
			tabList.add(sxbl);
			@@ -393,15 +382,23 @@
			tabList.add(sqjl);

			buttonList.add(tjbljl);

			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			}
			if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(sxxq);
			tabList.add(sqjl);
			tabList.add(jash);

			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
			daxx.setName("信息");
			daxx.setName("详情");
			tabList.add(daxx);
			tabList.add(lcdb);
			tabList.add(sqjl);
			@@ -417,12 +414,10 @@

			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);

			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			}
			}else {