~huangh/gz-dyh.git

			@@ -22,6 +22,8 @@
			import cn.huge.module.cust.constant.UserBaseConsts;
			import cn.huge.module.cust.dto.CtUnitDTO;
			import cn.huge.module.cust.dto.CtUserDTO;
			import cn.huge.module.draft.domain.po.CasedraftInfo;
			import cn.huge.module.draft.service.CasedraftInfoService;
			import cn.huge.module.mediate.constant.AuditBaseConsts;
			import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
			import cn.huge.module.disp.constant.DispBaseConstsEnum;
			@@ -34,11 +36,13 @@
			import cn.huge.module.flow.service.FlowInfoService;
			import cn.huge.module.mediate.constant.*;
			import cn.huge.module.sys.constant.SyTimeEnum;
			import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
			import com.alibaba.fastjson.JSON;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.google.common.collect.Maps;
			import org.apache.commons.collections.CollectionUtils;
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			@@ -93,15 +97,12 @@
			private CaseReturnService caseReturnService;
			@Autowired
			private CaseEvaluateService caseEvaluateService;

			@Autowired
			private CaseWindupApplyMapper caseWindupApplyMapper;
			private CaseAssistInfoService caseAssistInfoService;
			@Autowired
			private CaseReturnMapper caseReturnMapper;
			private CaseDismissService caseDismissService;
			@Autowired
			private CaseAppearMapper caseAppearMapper;
			@Autowired
			private CaseAssistApplyMapper caseAssistApplyMapper;
			private CasedraftInfoService casedraftInfoService;

			/**
			* 更新对象
			@@ -194,14 +195,26 @@
			}

			/**
			* 根据纠纷编号查询进行中的配合部门任务
			* @param caseId
			* @return
			*/
			public List<CaseTask> listAssistTasking(String caseId){
			// 查询配合部门的任务
			QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
			caseTaskQueryWrapper.eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).eq("case_id", caseId)
			.eq("status", CaseTaskConsts.TASK_STATUS_1);
			List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
			return assistCaseTaskList;
			}

			/**
			* web端-任务出来页面-初始化tab和按钮
			* @param caseTaskId
			* @return
			*/
			public TabButtonDTO webGetTabButton(String caseTaskId, String userId){
			try{
			// 查询当前任务信息
			CaseTask caseTask = mapper.selectById(caseTaskId);
			// 定义tab
			TabButtonInfoDTO sxxq = new TabButtonInfoDTO();
			sxxq.setId("sxxq");
			@@ -212,9 +225,9 @@
			TabButtonInfoDTO sxbl = new TabButtonInfoDTO();
			sxbl.setId("sxbl");
			sxbl.setName("事项办理");
			// TabButtonInfoDTO sqjl = new TabButtonInfoDTO();
			// sqjl.setId("sqjl");
			// sqjl.setName("申请记录");
			TabButtonInfoDTO sqjl = new TabButtonInfoDTO();
			sqjl.setId("sqjl");
			sqjl.setName("申请记录");
			TabButtonInfoDTO htsh = new TabButtonInfoDTO();
			htsh.setId("htsh");
			htsh.setName("回退审核");
			@@ -233,6 +246,9 @@
			TabButtonInfoDTO daxx = new TabButtonInfoDTO();
			daxx.setId("daxx");
			daxx.setName("档案信息");
			TabButtonInfoDTO byslxq = new TabButtonInfoDTO();
			byslxq.setId("byslxq");
			byslxq.setName("详情");

			// 定义button
			TabButtonInfoDTO tjbljl = new TabButtonInfoDTO();
			@@ -262,114 +278,174 @@
			TabButtonInfoDTO sb = new TabButtonInfoDTO();
			sb.setId("sb");
			sb.setName("上报");
			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 (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			// 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())
			\|\| 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);
			buttonList.add(jb);
			buttonList.add(sb);
			}
			if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			// tabList.add(sqjl);
			sl.setName("自行受理");
			buttonList.add(sl);
			buttonList.add(jb);
			buttonList.add(bysl);
			CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId);
			if (UserBaseConsts.UNIT_GRADE_1 != ctUnitDTO.getUnitGrade()) {
			buttonList.add(sb);
			}

			buttonList.add(sl);
			buttonList.add(ht);
			}
			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);
			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			// 待受理节点
			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(zxsl);
			buttonList.add(jb);
			buttonList.add(sb);
			}
			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);

			buttonList.add(sl);
			buttonList.add(ht);
			}
			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);
			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			// 回退审核节点
			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);

			buttonList.add(zxsl);
			buttonList.add(jb);
			}
			if (FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
			tabList.add(dslxq);
			// tabList.add(sqjl);
			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			// 上报审核节点
			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);

			buttonList.add(sl);
			buttonList.add(ht);
			}
			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())) {
			tabList.add(sxxq);
			tabList.add(sxbl);
			// tabList.add(sqjl);
			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			// 办理反馈节点
			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);
			}
			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);
			buttonList.add(tjbljl);
			buttonList.add(lhczsq);
			buttonList.add(jasq);
			// buttonList.add(db);

			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			} else {
			tabList.add(sxxq);
			tabList.add(sxbl);
			tabList.add(lcdb);
			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("详情");
			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);

			// 额外单独给详情跳转查看
			daxx.setName("详情");
			tabList.add(daxx);
			}
			}
			}else {
			tabList.add(sxxq);
			// tabList.add(sqjl);
			tabList.add(lhczsh);
			// 是否是联合处置审核
			CaseAssistApply caseAssistApply = caseAssistApplyService.getById(caseTaskId);
			if (ObjectUtils.isNotEmpty(caseAssistApply)){
			tabList.add(sxxq);
			tabList.add(lhczsh);
			tabList.add(sqjl);
			}else {
			daxx.setName("详情");
			tabList.add(daxx);
			tabList.add(lcdb);
			tabList.add(sqjl);
			}
			}
			// 封装数据
			TabButtonDTO tabButtonDTO = new TabButtonDTO();
			@@ -413,66 +489,59 @@
			for (CaseTask caseTask: handleCaseTaskList){
			// 已结束节点
			if (CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){
			// 待受理并已签收的节点，需要加多一个签收节点
			// 待受理并已签收的正常任务节点，需要加多一个签收节点
			if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())){
			if (CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus()){
			if (CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus() && CaseTaskConsts.TASK_TYPE_1 == caseTask.getTaskType()){
			WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
			slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			slWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
			slWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
			slWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
			slWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
			slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
			slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
			slWebCaseFlowDTO.setHandleNotes("已签收");
			slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
			slWebCaseFlowDTO.setStatus(caseTask.getStatus());
			handleCaseFlowList.add(slWebCaseFlowDTO);
			}
			}
			// 回退审核节点，需要加多一个回退申请节点
			if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex())){
			WebCaseFlowDTO sqWebCaseFlowDTO = new WebCaseFlowDTO();
			sqWebCaseFlowDTO.setNodeShowName("事件回退");
			sqWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
			sqWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
			sqWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
			sqWebCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
			sqWebCaseFlowDTO.setStatus(caseTask.getStatus());
			CaseReturn caseReturn = caseReturnService.getByCaseTaskId(caseTask.getId());
			sqWebCaseFlowDTO.setHandleNotes("回退理由："+caseReturn.getReturnContent());
			handleCaseFlowList.add(sqWebCaseFlowDTO);
			}
			// 上报审核节点，需要加多一个上报申请节点
			if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex())){
			WebCaseFlowDTO sqWebCaseFlowDTO = new WebCaseFlowDTO();
			sqWebCaseFlowDTO.setNodeShowName("事件上报");
			sqWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
			sqWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
			sqWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
			sqWebCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_3);
			sqWebCaseFlowDTO.setStatus(caseTask.getStatus());
			CaseAppear caseAppear = caseAppearService.getByCaseTaskId(caseTask.getId());
			sqWebCaseFlowDTO.setHandleNotes("上报意见："+caseAppear.getAppearContent());
			handleCaseFlowList.add(sqWebCaseFlowDTO);
			}
			// 普通节点
			WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
			webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			webCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
			webCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
			webCaseFlowDTO.setStatus(caseTask.getStatus());
			webCaseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
			webCaseFlowDTO.setTaskType(caseTask.getTaskType());
			// 当事人评价节点，特殊处理
			if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
			webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			webCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
			// 当事人评价/结案归档节点，特殊处理
			if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JAGD.getIndex())){
			webCaseFlowDTO.setHandleUserName(null);
			webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUserName());
			}else{
			webCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
			webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
			}
			// 回退申请节点
			if(CaseTaskConsts.TASK_TYPE_2 == caseTask.getTaskType()){
			webCaseFlowDTO.setNodeShowName("事件回退");
			CaseReturn caseReturn = caseReturnService.getNewByCaseId(caseId, caseTask.getCaseTaskType());
			if (StringUtils.isNotEmpty(caseReturn.getReturnContent())) {
			webCaseFlowDTO.setHandleNotes("回退理由：" + caseReturn.getReturnContent());
			}else {
			webCaseFlowDTO.setHandleNotes("回退理由：-");

			}
			}
			// 上报申请节点
			if(CaseTaskConsts.TASK_TYPE_3 == caseTask.getTaskType()){
			webCaseFlowDTO.setNodeShowName("事件上报");
			CaseAppear caseAppear = caseAppearService.getNewByCaseId(caseId);
			if (StringUtils.isNotEmpty(caseAppear.getAppearContent())) {
			webCaseFlowDTO.setHandleNotes("上报理由：" + caseAppear.getAppearContent());
			}else {
			webCaseFlowDTO.setHandleNotes("上报意见：-" );
			}
			}
			// 审核节点要判断通过/不通过
			if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JASH.getIndex())
			@@ -486,11 +555,13 @@
			webCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_2.getIndex());
			webCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_2.getDes());
			webCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
			}else if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
			}else{
			// 处理通过
			webCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
			webCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
			}
			// 临时加上
			webCaseFlowDTO.setHandleNotes("审核结果："+webCaseFlowDTO.getAuditResultName());
			}
			// 结案申请，需要展示化解结果
			if (FlowNodeEnum.FLOW_NODE_JASQ.getIndex().equals(caseTask.getNodeId())){
			@@ -498,41 +569,195 @@
			if (ObjectUtils.isNotEmpty(caseInfoUnfold)){
			webCaseFlowDTO.setMediResult(caseInfoUnfold.getMediResult());
			webCaseFlowDTO.setMediResultName(caseInfoUnfold.getMediResultName());
			// 临时加上
			webCaseFlowDTO.setHandleNotes("化解结果："+webCaseFlowDTO.getMediResultName());
			}
			}
			// 不予受理
			if (CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
			webCaseFlowDTO.setNodeShowName("不予受理");
			webCaseFlowDTO.setHandleNotes(null);
			webCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_4);
			}
			handleCaseFlowList.add(webCaseFlowDTO);
			}else {
			// 进行中的节点
			// 待受理并已签收的正常任务节点，需要加多一个签收节点
			if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())){
			if (CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus() && CaseTaskConsts.TASK_TYPE_1 == caseTask.getTaskType()){
			WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
			slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			slWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
			slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
			slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
			slWebCaseFlowDTO.setHandleNotes("已签收");
			slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
			slWebCaseFlowDTO.setStatus(CaseTaskConsts.TASK_STATUS_2);
			handleCaseFlowList.add(slWebCaseFlowDTO);
			}
			}
			// 正常节点
			WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
			webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			webCaseFlowDTO.setStatus(caseTask.getStatus());
			// 当事人评价节点，特殊处理
			if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
			webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JAGD.getIndex())){
			webCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
			}else{
			webCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
			webCaseFlowDTO.setProcessName(caseTask.getCandeUnitName());
			}
			webCaseFlowDTO.setStatus(caseTask.getStatus());
			handleCaseFlowList.add(webCaseFlowDTO);
			}
			}
			result.put("handleCaseFlowList", handleCaseFlowList);

			// 查询配合组织流程
			LinkedList<WebCaseFlowDTO> assistCaseFlowList = new LinkedList<>();
			caseTaskQueryWrapper.clear();
			caseTaskQueryWrapper.eq("case_id", caseId).eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).orderByDesc("create_time");
			List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
			for (CaseTask caseTask: assistCaseTaskList){
			WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
			webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			webCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
			webCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
			webCaseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
			webCaseFlowDTO.setTaskType(caseTask.getTaskType());
			webCaseFlowDTO.setStatus(caseTask.getStatus());
			assistCaseFlowList.add(webCaseFlowDTO);
			List<CaseAssistInfo> caseAssistInfoList = caseAssistInfoService.listByCaseId(caseId);
			if (CollectionUtils.isNotEmpty(caseAssistInfoList)){
			LinkedList<WebAssistCaseFlowDTO> assistCaseFlowList = new LinkedList<>();
			for (CaseAssistInfo caseAssistInfo: caseAssistInfoList){
			WebAssistCaseFlowDTO webAssistCaseFlowDTO = new WebAssistCaseFlowDTO();
			webAssistCaseFlowDTO.setUnitId(caseAssistInfo.getAssistUnitId());
			if (CaseTaskConsts.ASSIST_STATUS_0 == caseAssistInfo.getAssistStatus()) {
			webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName());
			}else {
			webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName()+"（已回退）");
			}
			LinkedList<WebCaseFlowDTO> caseFlowList = new LinkedList<>();
			caseTaskQueryWrapper.clear();
			caseTaskQueryWrapper.eq("case_id", caseId).eq("cande_unit_id", caseAssistInfo.getAssistUnitId())
			.eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).orderByAsc("id");
			List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
			for (CaseTask caseTask: assistCaseTaskList){
			// 已结束节点
			if (CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){
			// 待受理并已签收的正常任务节点，需要加多一个签收节点
			if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())){
			if (CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus() && CaseTaskConsts.TASK_TYPE_1 == caseTask.getTaskType()){
			WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
			slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			slWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
			slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
			slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
			slWebCaseFlowDTO.setHandleNotes("已签收");
			slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
			slWebCaseFlowDTO.setStatus(caseTask.getStatus());
			caseFlowList.add(slWebCaseFlowDTO);
			}
			}
			// 普通节点
			WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
			webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			webCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
			webCaseFlowDTO.setStatus(caseTask.getStatus());
			webCaseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
			webCaseFlowDTO.setTaskType(caseTask.getTaskType());
			// 当事人评价/结案归档节点，特殊处理
			if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JAGD.getIndex())){
			webCaseFlowDTO.setHandleUserName(null);
			webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUserName());
			}else{
			webCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
			webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
			}
			// 回退申请节点
			if(CaseTaskConsts.TASK_TYPE_2 == caseTask.getTaskType()){
			webCaseFlowDTO.setNodeShowName("事件回退");
			CaseReturn caseReturn = caseReturnService.getNewByCaseId(caseId, caseTask.getCaseTaskType());
			if (StringUtils.isNotEmpty(caseReturn.getReturnContent())) {
			webCaseFlowDTO.setHandleNotes("回退理由：" + caseReturn.getReturnContent());
			}else {
			webCaseFlowDTO.setHandleNotes("回退理由：-");

			}
			}
			// 上报申请节点
			if(CaseTaskConsts.TASK_TYPE_3 == caseTask.getTaskType()){
			webCaseFlowDTO.setNodeShowName("事件上报");
			CaseAppear caseAppear = caseAppearService.getNewByCaseId(caseId);
			if (StringUtils.isNotEmpty(caseAppear.getAppearContent())) {
			webCaseFlowDTO.setHandleNotes("上报理由：" + caseAppear.getAppearContent());
			}else {
			webCaseFlowDTO.setHandleNotes("上报意见：-" );
			}
			}
			// 审核节点要判断通过/不通过
			if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JASH.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex())){
			// 处理不通过，任务类型就是回退
			if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
			webCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_2.getIndex());
			webCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_2.getDes());
			webCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
			}else{
			// 处理通过
			webCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
			webCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
			}
			// 临时加上
			webCaseFlowDTO.setHandleNotes("审核结果："+webCaseFlowDTO.getAuditResultName());
			}
			// 结案申请，需要展示化解结果
			if (FlowNodeEnum.FLOW_NODE_JASQ.getIndex().equals(caseTask.getNodeId())){
			CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseTask.getCaseId());
			if (ObjectUtils.isNotEmpty(caseInfoUnfold)){
			webCaseFlowDTO.setMediResult(caseInfoUnfold.getMediResult());
			webCaseFlowDTO.setMediResultName(caseInfoUnfold.getMediResultName());
			// 临时加上
			webCaseFlowDTO.setHandleNotes("化解结果："+webCaseFlowDTO.getMediResultName());
			}
			}
			caseFlowList.add(webCaseFlowDTO);
			}else {
			// 进行中的节点
			// 待受理并已签收的正常任务节点，需要加多一个签收节点
			if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())){
			if (CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus() && CaseTaskConsts.TASK_TYPE_1 == caseTask.getTaskType()){
			WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
			slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			slWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
			slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
			slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
			slWebCaseFlowDTO.setHandleNotes("已签收");
			slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
			slWebCaseFlowDTO.setStatus(CaseTaskConsts.TASK_STATUS_2);
			caseFlowList.add(slWebCaseFlowDTO);
			}
			}
			// 正常节点
			WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
			webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
			webCaseFlowDTO.setStatus(caseTask.getStatus());
			// 当事人评价节点，特殊处理
			if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())
			\|\| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JAGD.getIndex())){
			webCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
			}else{
			webCaseFlowDTO.setProcessName(caseTask.getCandeUnitName());
			}
			caseFlowList.add(webCaseFlowDTO);
			}
			}
			webAssistCaseFlowDTO.setCaseFlowList(caseFlowList);
			assistCaseFlowList.add(webAssistCaseFlowDTO);
			}
			result.put("assistCaseFlowList", assistCaseFlowList);
			}
			result.put("assistCaseFlowList", assistCaseFlowList);
			return result;
			}catch (Exception e){
			log.error("[CaseTaskService.webGetTabButton]调用失败，异常信息："+e, e);
			@@ -558,7 +783,21 @@
			long countReturnReview = caseReturnService.countReturnReview(loginUser.getUnitId());
			long countAppearReview = caseAppearService.countAppearReview(loginUser.getUnitId());
			long countAssistReview = caseAssistApplyService.countAssistReview(loginUser.getUnitId());
			frontPageCountDTO.setReturnReview(countReturnReview);
			frontPageCountDTO.setAppearReview(countAppearReview);
			frontPageCountDTO.setWindupReview(countApplyReview);
			frontPageCountDTO.setAssistReview(countAssistReview);
			frontPageCountDTO.setWaitReview(countApplyReview+countReturnReview+countAppearReview+countAssistReview);
			// 已办
			Map<String, Object> ybTerms = new HashMap<>();
			ybTerms.put("handleUnitId", loginUser.getUnitId());
			long alreadyDone = mapper.countMyTaskYb(ybTerms);
			frontPageCountDTO.setAlreadyDone(alreadyDone);
			// 已办
			Map<String, Object> cgTerms = new HashMap<>();
			cgTerms.put("inputUnitId", loginUser.getUnitId());
			long caseDraft = casedraftInfoService.countTerms(cgTerms);
			frontPageCountDTO.setCaseDraft(caseDraft);
			return frontPageCountDTO;
			}catch (Exception e) {
			log.error("[CaseTaskService.getCountList]调用失败，异常信息：" + e, e);
			@@ -567,16 +806,16 @@
			}

			/**
			* 首页-查询待办任务-受分派
			* 首页-查询待办任务-待/已分派
			* @param page 分页对象
			* @param terms 条件
			* @return Page
			*/
			public Page<FrontPageListDTO> pageMyTaskFp(PageRequest page, Map<String, Object> terms){
			public Page<FrontPageListFPDTO> pageMyTaskFp(PageRequest page, Map<String, Object> terms){
			try {
			long total = mapper.countMyTaskFp(terms);
			List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskFp(page, terms);
			return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
			List<FrontPageListFPDTO> frontPageListFPDTOList = mapper.pageMyTaskFp(page, terms);
			return new PageImpl<FrontPageListFPDTO>(frontPageListFPDTOList, page, total);
			}catch (Exception e) {
			log.error("[CaseTaskService.pageMyTaskFp]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskFp", e);
			@@ -585,16 +824,16 @@
			}

			/**
			* 首页-查询待办任务-受签收
			* 首页-查询待办任务-待/已签收
			* @param page 分页对象
			* @param terms 条件
			* @return Page
			*/
			public Page<FrontPageListDTO> pageMyTaskQs(PageRequest page, Map<String, Object> terms){
			public Page<FrontPageListQSDTO> pageMyTaskQs(PageRequest page, Map<String, Object> terms){
			try {
			long total = mapper.countMyTaskQs(terms);
			List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskQs(page, terms);
			return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
			List<FrontPageListQSDTO> frontPageListDTOList = mapper.pageMyTaskQs(page, terms);
			return new PageImpl<FrontPageListQSDTO>(frontPageListDTOList, page, total);
			}catch (Exception e) {
			log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
			@@ -602,19 +841,19 @@
			}

			/**
			* 首页-查询待办任务-受待理
			* 首页-查询待办任务-待/已受理
			* @param page 分页对象
			* @param terms 条件
			* @return Page
			*/
			public Page<FrontPageListDTO> pageMyTaskSl(PageRequest page, Map<String, Object> terms){
			public Page<FrontPageListSLDTO> pageMyTaskSl(PageRequest page, Map<String, Object> terms){
			try {
			long total = mapper.countMyTaskSl(terms);
			List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskSl(page, terms);
			return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
			List<FrontPageListSLDTO> frontPageListDTOList = mapper.pageMyTaskSl(page, terms);
			return new PageImpl<FrontPageListSLDTO>(frontPageListDTOList, page, total);
			}catch (Exception e) {
			log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
			log.error("[CaseTaskService.pageMyTaskSl]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskSl", e);
			}
			}

			@@ -624,38 +863,22 @@
			* @param terms 条件
			* @return Page
			*/
			public Page<FrontPageListDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
			public Page<FrontPageListBLZDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
			try {
			long total = mapper.countMyTaskProcessing(terms);
			List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskProcessing(page, terms);
			List<String> caseIdList = new ArrayList<>();
			long total = mapper.countMyTaskBlz(terms);
			List<FrontPageListBLZDTO> frontPageListBLZDTOList = mapper.pageMyTaskBlz(page, terms);
			Date now = DateUtils.getNowDate();
			for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
			long milliseconds1 = frontPageListDTO.getTurnaroundTime().getTime();
			for(FrontPageListBLZDTO frontPageListBLZDTO: frontPageListBLZDTOList){
			long milliseconds1 = frontPageListBLZDTO.getTurnaroundTime().getTime();
			long milliseconds2 = now.getTime();
			long diff = milliseconds2 - milliseconds1;
			long daysBetween = diff / (24 * 60 * 60 * 1000);
			frontPageListDTO.setProcessingDays(daysBetween);
			caseIdList.add(frontPageListDTO.getCaseId());
			frontPageListBLZDTO.setProcessingDays(daysBetween);
			}
			if(CollectionUtils.isNotEmpty(caseIdList)){
			QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
			unfoldQueryWrapper.in("id", caseIdList);
			List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
			for(CaseInfoUnfold unfold: unfoldList){
			for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
			if(frontPageListDTO.getCaseId().equals(unfold.getId())){
			frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
			frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
			}
			}
			}
			}

			return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
			return new PageImpl<FrontPageListBLZDTO>(frontPageListBLZDTOList, page, total);
			}catch (Exception e) {
			log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
			log.error("[CaseTaskService.pageMyTaskBlz]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskBlz", e);
			}
			}

			@@ -665,30 +888,14 @@
			* @param terms 条件
			* @return Page
			*/
			public Page<FrontPageListDTO> pageMyTaskBl(PageRequest page, Map<String, Object> terms){
			public Page<FrontPageListJADTO> pageMyTaskJa(PageRequest page, Map<String, Object> terms){
			try {
			long total = caseWindupApplyService.countMySubmitApplyReview(terms);
			List<FrontPageListDTO> frontPageListDTOList = caseWindupApplyService.listMySubmitApplyReview(page, terms);

			List<String> caseIdList = new ArrayList<>();
			caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList());
			if(CollectionUtils.isNotEmpty(caseIdList)){
			QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
			unfoldQueryWrapper.in("id", caseIdList);
			List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
			for(CaseInfoUnfold unfold: unfoldList){
			for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
			if(frontPageListDTO.getCaseId().equals(unfold.getId())){
			frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
			frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
			}
			}
			}
			}
			return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
			long total = caseWindupApplyService.countMyTaskJa(terms);
			List<FrontPageListJADTO> frontPageListJADTOList = caseWindupApplyService.listMyTaskJa(page, terms);
			return new PageImpl<FrontPageListJADTO>(frontPageListJADTOList, page, total);
			}catch (Exception e) {
			log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
			log.error("[CaseTaskService.pageMyTaskJa]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskJa", e);
			}
			}

			@@ -724,6 +931,23 @@

			/**
			* 首页-待审核分页查询
			* @param page 分页对象
			* @param terms 条件
			* @return Page
			*/
			public Page<FrontPageListWSQDDTO> pageMyTaskShWSQD(PageRequest page, Map<String, Object> terms){
			try {
			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);
			}
			}

			/**
			* 首页-待审核分页查询
			* @param caseId 事项编号
			* @return Page
			*/
			@@ -745,12 +969,33 @@
			caseAssistApplyQueryWrapper.eq("case_id", caseId);
			List<CaseAssistApply>caseAssistApplyList = caseAssistApplyService.list(caseAssistApplyQueryWrapper);
			List<SortUtilDTO> sortUtilDTOList = new ArrayList<>();

			List<String> idList = new ArrayList<>();
			String ids = new String();
			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 + "'");
			fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(terms);
			}

			for(CaseReturn caseReturn: caseReturnList){
			SortUtilDTO sortUtilDTO = new SortUtilDTO();
			sortUtilDTO.setObject(caseReturn);
			sortUtilDTO.setDate(caseReturn.getCreateTime());
			sortUtilDTO.setType("回退申请");
			sortUtilDTOList.add(sortUtilDTO);
			for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
			if(caseReturn.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
			sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
			}
			}
			}
			for(CaseAppear caseAppear: caseAppearList){
			SortUtilDTO sortUtilDTO = new SortUtilDTO();
			@@ -758,6 +1003,11 @@
			sortUtilDTO.setDate(caseAppear.getCreateTime());
			sortUtilDTO.setType("上报申请");
			sortUtilDTOList.add(sortUtilDTO);
			for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
			if(caseAppear.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
			sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
			}
			}
			}
			for(CaseWindupApply caseWindupApply: caseWindupApplyList){
			SortUtilDTO sortUtilDTO = new SortUtilDTO();
			@@ -765,6 +1015,11 @@
			sortUtilDTO.setDate(caseWindupApply.getCreateTime());
			sortUtilDTO.setType("结案申请");
			sortUtilDTOList.add(sortUtilDTO);
			for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
			if(caseWindupApply.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
			sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
			}
			}
			}
			for(CaseAssistApply caseAssistApply: caseAssistApplyList){
			SortUtilDTO sortUtilDTO = new SortUtilDTO();
			@@ -772,6 +1027,11 @@
			sortUtilDTO.setDate(caseAssistApply.getCreateTime());
			sortUtilDTO.setType("联合处置申请");
			sortUtilDTOList.add(sortUtilDTO);
			for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
			if(caseAssistApply.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
			sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
			}
			}
			}
			sortUtilDTOList.sort(Comparator.comparing(SortUtilDTO::getDate));
			List<Object> resultList = new ArrayList<>();
			@@ -780,8 +1040,8 @@
			}
			return resultList;
			}catch (Exception e) {
			log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
			log.error("[CaseTaskService.listMyApplyRecord]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.listMyApplyRecord", e);
			}
			}

			@@ -935,36 +1195,36 @@
			FlowNode secondFlowNode = flowInfoService.completeTask(dfpCaseTask.getFlowableId(), dfpCaseTask.getProcessTaskId(),
			FlowableConsts.OPERATION_jb_zszz, "系统派单");
			// 进入第2个节点-镇街级组织待受理
			CaseTask sdlCaseTask = new CaseTask();
			sdlCaseTask.setId(utilsClient.getNewTimeId());
			sdlCaseTask.setCaseId(caseInfo.getId());
			sdlCaseTask.setFlowableId(secondFlowNode.getFlowableId());
			sdlCaseTask.setProcessInstanceId(secondFlowNode.getProcessInstanceId());
			sdlCaseTask.setProcessTaskId(secondFlowNode.getProcessTaskId());
			sdlCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			sdlCaseTask.setNodeType(secondFlowNode.getNodeType());
			sdlCaseTask.setNodeId(secondFlowNode.getNodeId());
			sdlCaseTask.setNodeName(secondFlowNode.getNodeName());
			sdlCaseTask.setFlowId(secondFlowNode.getFlowId());
			sdlCaseTask.setNodeShowName(secondFlowNode.getNodeShowName());
			sdlCaseTask.setCaseTaskType(dfpCaseTask.getCaseTaskType());
			CaseTask dslCaseTask = new CaseTask();
			dslCaseTask.setId(utilsClient.getNewTimeId());
			dslCaseTask.setCaseId(caseInfo.getId());
			dslCaseTask.setFlowableId(secondFlowNode.getFlowableId());
			dslCaseTask.setProcessInstanceId(secondFlowNode.getProcessInstanceId());
			dslCaseTask.setProcessTaskId(secondFlowNode.getProcessTaskId());
			dslCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			dslCaseTask.setNodeType(secondFlowNode.getNodeType());
			dslCaseTask.setNodeId(secondFlowNode.getNodeId());
			dslCaseTask.setNodeName(secondFlowNode.getNodeName());
			dslCaseTask.setFlowId(secondFlowNode.getFlowId());
			dslCaseTask.setNodeShowName(secondFlowNode.getNodeShowName());
			dslCaseTask.setCaseTaskType(dfpCaseTask.getCaseTaskType());
			// 通过调度的，任务候选执行者类型是上一步骤选择
			sdlCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			sdlCaseTask.setCandeUnitId(caseDispBaseDTO.getTargetId());
			sdlCaseTask.setCandeUnitName(caseDispBaseDTO.getTargetName());
			dslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			dslCaseTask.setCandeUnitId(caseDispBaseDTO.getTargetId());
			dslCaseTask.setCandeUnitName(caseDispBaseDTO.getTargetName());
			// 系统调度给调解组织，需要签收
			sdlCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
			sdlCaseTask.setSignExpireTime(sysClient.getExpireTime(caseInfo.getCreateTime(), SyTimeEnum.SY_TIME_2.getIndex()));
			dslCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
			dslCaseTask.setSignExpireTime(sysClient.getExpireTime(caseInfo.getCreateTime(), SyTimeEnum.SY_TIME_2.getIndex()));
			// 任务处理时限
			if (firstFlowNode.getExpire() != 0) {
			sdlCaseTask.setExpireTime(DateUtils.addDay(caseInfo.getCreateTime(), firstFlowNode.getExpire()));
			dslCaseTask.setExpireTime(DateUtils.addDay(caseInfo.getCreateTime(), firstFlowNode.getExpire()));
			}
			sdlCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			sdlCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			sdlCaseTask.setCustId(caseInfo.getCustId());
			sdlCaseTask.setCreateTime(caseInfo.getCreateTime());
			sdlCaseTask.setUpdateTime(caseInfo.getUpdateTime());
			mapper.insert(sdlCaseTask);
			dslCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			dslCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			dslCaseTask.setCustId(caseInfo.getCustId());
			dslCaseTask.setCreateTime(caseInfo.getCreateTime());
			dslCaseTask.setUpdateTime(caseInfo.getUpdateTime());
			mapper.insert(dslCaseTask);
			// 更新纠纷信息
			CaseInfo caseInfoPO = new CaseInfo();
			caseInfoPO.setId(caseInfo.getId());
			@@ -989,7 +1249,7 @@
			* @param caseInfo
			* @param loginUser
			*/
			public void webStartFlowZXSL(CaseInfo caseInfo, CtUserDTO loginUser){
			public String webStartFlowZXSL(CaseInfo caseInfo, CtUserDTO loginUser){
			try{
			// 启动自行受理工作流，进入待受理节点
			FlowNode dslFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_ZXSL, caseInfo.getId());
			@@ -1080,9 +1340,82 @@
			caseInfoUnfoldPO.setMediateUnitId(blfkCaseTask.getCandeUnitId());
			caseInfoUnfoldPO.setMediateUnitName(blfkCaseTask.getCandeUnitName());
			caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
			return blfkCaseTask.getId();
			}catch (Exception e){
			log.error("[CaseTaskService.webStartFlowZXSL]调用失败，异常信息："+e, e);
			throw new ServiceException("CaseTaskService.webStartFlowZXSL", e);
			}
			}

			/**
			* web端任务处理-不予受理
			* @param caseDismiss 不予受理表单
			* @param userId 当前登录用户
			*/
			public void webDismiss(CaseDismiss caseDismiss, String userId){
			try{
			Date nowDate = DateUtils.getNowDate();
			// 获取当前登录用户
			CtUserDTO loginUser = custClient.clientGetUserAll(userId);
			// 查询当前任务
			CaseTask caseTask = mapper.selectById(caseDismiss.getCaseTaskId());
			// 结束当前任务
			CaseTask caseTaskPO = new CaseTask();
			caseTaskPO.setId(caseDismiss.getCaseTaskId());
			caseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
			caseTaskPO.setHandleUnitId(loginUser.getUnitId());
			caseTaskPO.setHandleUnitName(loginUser.getUnitName());
			caseTaskPO.setHandleUserId(loginUser.getId());
			caseTaskPO.setHandleUserName(loginUser.getTrueName());
			caseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_3);
			caseTaskPO.setHandleContent(caseDismiss.getDisContent());
			caseTaskPO.setHandleTime(nowDate);
			caseTaskPO.setUpdateTime(nowDate);
			mapper.updateCaseTask(caseTaskPO);
			// 结束当前工作流任务
			flowInfoService.endFlow(caseTask.getProcessInstanceId());
			// 更新纠纷信息
			CaseInfo caseInfoPO = new CaseInfo();
			caseInfoPO.setId(caseTask.getCaseId());
			caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_8.getIndex());
			caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_8.getDes());
			caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			// 有配合部门，也结束配合部门工作流程
			List<CaseTask> assistCaseTaskList = this.listAssistTasking(caseDismiss.getCaseId());
			for (CaseTask assistCaseTask: assistCaseTaskList){
			// 完成配合部门当前任务
			assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
			assistCaseTask.setHandleUnitId(loginUser.getUnitId());
			assistCaseTask.setHandleUnitName(loginUser.getUnitName());
			assistCaseTask.setHandleUserId(loginUser.getId());
			assistCaseTask.setHandleUserName(loginUser.getTrueName());
			assistCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
			assistCaseTask.setHandleTime(nowDate);
			assistCaseTask.setUpdateTime(nowDate);
			mapper.updateCaseTask(assistCaseTask);
			// 结束配合部门当前工作流任务
			flowInfoService.endFlow(assistCaseTask.getProcessInstanceId());
			}
			// 新增不予受理信息
			caseDismiss.setCaseTaskTime(caseTask.getCreateTime());
			caseDismiss.setDisUnitId(loginUser.getUnitId());
			caseDismiss.setDisUnitName(loginUser.getUnitName());
			caseDismiss.setDisUserId(loginUser.getId());
			caseDismiss.setDisUserName(loginUser.getTrueName());
			caseDismiss.setDisTime(nowDate);
			caseDismiss.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			caseDismiss.setCustId(caseTask.getCustId());
			caseDismiss.setCreateTime(nowDate);
			caseDismiss.setUpdateTime(nowDate);
			caseDismissService.save(caseDismiss);
			}catch (Exception e){
			log.error("[CaseTaskService.webAssign]调用失败，异常信息："+e, e);
			throw new ServiceException("CaseTaskService.webAssign", e);
			}
			}

			@@ -1180,66 +1513,98 @@
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			// 分派配合组织
			if (CollectionUtils.isNotEmpty(assignTaskDTO.getAssistUnitList())){
			// 拼接配合组织编号和名称
			String assistUnitId = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
			collect(Collectors.joining(BaseConsts.COMMA));
			String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
			String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitName).
			collect(Collectors.joining(BaseConsts.COMMA));
			for (AssignAssistUnitDTO assignAssistUnitDTO: assignTaskDTO.getAssistUnitList()){
			// 创建交办配合组织任务
			CaseTask jbAssistCaseTask = new CaseTask();
			jbAssistCaseTask.setId(utilsClient.getNewTimeId());
			jbAssistCaseTask.setCaseId(dfpCaseTask.getCaseId());
			jbAssistCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			jbAssistCaseTask.setNodeName("交办配合部门");
			jbAssistCaseTask.setNodeShowName("交办配合部门");
			jbAssistCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
			// 配合任务，任务候选执行者类型是上一步骤选择
			jbAssistCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			jbAssistCaseTask.setCandeUnitId(loginUser.getUnitId());
			jbAssistCaseTask.setCandeUnitName(loginUser.getUnitName());
			jbAssistCaseTask.setHandleUnitId(loginUser.getUnitId());
			jbAssistCaseTask.setHandleUnitName(loginUser.getUnitId());
			jbAssistCaseTask.setHandleUserId(loginUser.getId());
			jbAssistCaseTask.setHandleUserName(loginUser.getTrueName());
			jbAssistCaseTask.setHandleContent(assignTaskDTO.getAssignContent());
			jbAssistCaseTask.setHandleIllust("派单至："+assignTaskDTO.getHandleUnitName());
			jbAssistCaseTask.setHandleTime(nowDate);
			// 启动联合处置工作流
			FlowNode lhczdfpFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_LHCZ, dfpCaseTask.getCaseId());
			// 新建并完成配合部门待分派任务
			CaseTask lhczdfpCaseTask = new CaseTask();
			lhczdfpCaseTask.setId(utilsClient.getNewTimeId());
			lhczdfpCaseTask.setCaseId(dfpCaseTask.getCaseId());
			lhczdfpCaseTask.setFlowableId(lhczdfpFlowNode.getFlowableId());
			lhczdfpCaseTask.setProcessInstanceId(lhczdfpFlowNode.getProcessInstanceId());
			lhczdfpCaseTask.setProcessTaskId(lhczdfpFlowNode.getProcessTaskId());
			lhczdfpCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			lhczdfpCaseTask.setNodeType(lhczdfpFlowNode.getNodeType());
			lhczdfpCaseTask.setNodeId(lhczdfpFlowNode.getNodeId());
			lhczdfpCaseTask.setNodeName(lhczdfpFlowNode.getNodeName());
			lhczdfpCaseTask.setFlowId(lhczdfpFlowNode.getFlowId());
			lhczdfpCaseTask.setNodeShowName(lhczdfpFlowNode.getNodeShowName());
			lhczdfpCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
			// 通过调度的，任务候选执行者类型是上一步骤选择
			lhczdfpCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			lhczdfpCaseTask.setCandeUnitId(assignAssistUnitDTO.getUitId());
			lhczdfpCaseTask.setCandeUnitName(assignAssistUnitDTO.getUitName());
			// 不需要签收
			jbAssistCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			jbAssistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
			jbAssistCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			jbAssistCaseTask.setCustId(dfpCaseTask.getCustId());
			jbAssistCaseTask.setCreateTime(nowDate);
			jbAssistCaseTask.setUpdateTime(nowDate);
			mapper.insert(jbAssistCaseTask);
			// 创建配合组织任务
			CaseTask assistCaseTask = new CaseTask();
			assistCaseTask.setId(utilsClient.getNewTimeId());
			assistCaseTask.setCaseId(dfpCaseTask.getCaseId());
			assistCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			assistCaseTask.setNodeId(FlowNodeEnum.FLOW_NODE_BLFK.getIndex());
			assistCaseTask.setNodeName(FlowNodeEnum.FLOW_NODE_BLFK.getDes());
			assistCaseTask.setNodeShowName(FlowNodeEnum.FLOW_NODE_BLFK.getIndex());
			assistCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
			// 配合任务，任务候选执行者类型是上一步骤选择
			assistCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			assistCaseTask.setCandeUnitId(assignAssistUnitDTO.getUitId());
			assistCaseTask.setCandeUnitName(assignAssistUnitDTO.getUitName());
			assistCaseTask.setHandleUnitId(assignAssistUnitDTO.getUitId());
			assistCaseTask.setHandleUnitName(assignAssistUnitDTO.getUitName());
			// 分派的任务，需要签收
			assistCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
			assistCaseTask.setSignExpireTime(sysClient.getExpireTime(nowDate, SyTimeEnum.SY_TIME_2.getIndex()));
			assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			assistCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			assistCaseTask.setCustId(dfpCaseTask.getCustId());
			assistCaseTask.setCreateTime(nowDate);
			assistCaseTask.setUpdateTime(nowDate);
			mapper.insert(assistCaseTask);
			lhczdfpCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			lhczdfpCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
			lhczdfpCaseTask.setHandleUnitId(loginUser.getUnitId());
			lhczdfpCaseTask.setHandleUnitName(loginUser.getUnitName());
			lhczdfpCaseTask.setHandleUserId(loginUser.getId());
			lhczdfpCaseTask.setHandleUserName(loginUser.getTrueName());
			lhczdfpCaseTask.setHandleContent(assignTaskDTO.getAssignContent());
			lhczdfpCaseTask.setHandleIllust("交办至："+assistUnitName);
			// 任务处理时限
			if (lhczdfpFlowNode.getExpire() != 0) {
			lhczdfpCaseTask.setExpireTime(DateUtils.addDay(nowDate, lhczdfpFlowNode.getExpire()));
			}
			lhczdfpCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			lhczdfpCaseTask.setCustId(dfpCaseTask.getCustId());
			lhczdfpCaseTask.setCreateTime(nowDate);
			lhczdfpCaseTask.setUpdateTime(nowDate);
			mapper.insert(lhczdfpCaseTask);
			// 完成待分派任务
			FlowNode lhczdslFlowNode = flowInfoService.completeTask(lhczdfpCaseTask.getFlowableId(), lhczdfpCaseTask.getProcessTaskId(),
			FlowableConsts.OPERATION_forward, loginUser.getId());
			// 创建配合部门待受理任务
			CaseTask lhczdslCaseTask = new CaseTask();
			lhczdslCaseTask.setId(utilsClient.getNewTimeId());
			lhczdslCaseTask.setCaseId(lhczdfpCaseTask.getCaseId());
			lhczdslCaseTask.setFlowableId(lhczdslFlowNode.getFlowableId());
			lhczdslCaseTask.setProcessInstanceId(lhczdslFlowNode.getProcessInstanceId());
			lhczdslCaseTask.setProcessTaskId(lhczdslFlowNode.getProcessTaskId());
			lhczdslCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			lhczdslCaseTask.setNodeType(lhczdslFlowNode.getNodeType());
			lhczdslCaseTask.setNodeId(lhczdslFlowNode.getNodeId());
			lhczdslCaseTask.setNodeName(lhczdslFlowNode.getNodeName());
			lhczdslCaseTask.setFlowId(lhczdslFlowNode.getFlowId());
			lhczdslCaseTask.setNodeShowName(lhczdslFlowNode.getNodeShowName());
			lhczdslCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
			// 通过调度的，任务候选执行者类型是上一步骤选择
			lhczdslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			lhczdslCaseTask.setCandeUnitId(assignAssistUnitDTO.getUitId());
			lhczdslCaseTask.setCandeUnitName(assignAssistUnitDTO.getUitName());
			// 需要签收
			lhczdslCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
			lhczdslCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			// 任务处理时限
			if (lhczdslFlowNode.getExpire() != 0) {
			lhczdslCaseTask.setExpireTime(DateUtils.addDay(nowDate, lhczdslFlowNode.getExpire()));
			}
			lhczdslCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			lhczdslCaseTask.setCustId(lhczdfpCaseTask.getCustId());
			lhczdslCaseTask.setCreateTime(nowDate);
			lhczdslCaseTask.setUpdateTime(nowDate);
			mapper.insert(lhczdslCaseTask);
			// 新增联合处置信息
			CaseAssistInfo caseAssistInfoPO = new CaseAssistInfo();
			caseAssistInfoPO.setId(utilsClient.getNewTimeId());
			caseAssistInfoPO.setCaseId(dslCaseTask.getCaseId());
			caseAssistInfoPO.setAssistUnitId(assignAssistUnitDTO.getUitId());
			caseAssistInfoPO.setAssistUnitName(assignAssistUnitDTO.getUitName());
			caseAssistInfoPO.setAssistStatus(CaseTaskConsts.ASSIST_STATUS_0);
			caseAssistInfoPO.setCustId(dslCaseTask.getCustId());
			caseAssistInfoPO.setCreateTime(nowDate);
			caseAssistInfoPO.setUpdateTime(nowDate);
			caseAssistInfoService.save(caseAssistInfoPO);
			}
			// 更新纠纷扩展信息
			CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
			@@ -1264,8 +1629,6 @@
			Date nowDate = DateUtils.getNowDate();
			// 获取当前登录用户
			CtUserDTO loginUser = custClient.clientGetUserAll(userId);
			List<String> taskIdList = new ArrayList<>();
			List<String> caseIdList = new ArrayList<>();
			for (SignTaskDTO signTaskDTO: signTaskDTOList){
			CaseTask qsCaseTask = mapper.selectById(signTaskDTO.getCaseTaskId());
			// 更新纠纷任务信息
			@@ -1304,7 +1667,7 @@
			* @param acceptTaskDTO 受理任务表单
			* @param userId 当前登录用户
			*/
			public void webAccept(AcceptTaskDTO acceptTaskDTO, String userId){
			public String webAccept(AcceptTaskDTO acceptTaskDTO, String userId){
			try{
			Date nowDate = DateUtils.getNowDate();
			// 获取当前登录用户
			@@ -1325,8 +1688,13 @@
			dslCaseTaskPO.setUpdateTime(nowDate);
			mapper.updateCaseTask(dslCaseTaskPO);
			// 完成当前待受理工作流任务
			String operation = FlowableConsts.OPERATION_sl;
			// 配合部门受理条件改为通过
			if (CaseTaskConsts.CASE_TASK_TYPE_2 == dslCaseTask.getCaseTaskType()) {
			operation = FlowableConsts.OPERATION_forward;
			}
			FlowNode newFlowNode = flowInfoService.completeTask(dslCaseTask.getFlowableId(), dslCaseTask.getProcessTaskId(),
			FlowableConsts.OPERATION_sl, userId);
			operation, userId);
			// 新建办理反馈任务
			CaseTask blfkCaseTask = new CaseTask();
			blfkCaseTask.setId(utilsClient.getNewTimeId());
			@@ -1368,6 +1736,7 @@
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			// 更新纠纷扩展信息
			CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
			@@ -1376,7 +1745,17 @@
			caseInfoUnfoldPO.setMediateUnitId(blfkCaseTask.getCandeUnitId());
			caseInfoUnfoldPO.setMediateUnitName(blfkCaseTask.getCandeUnitName());
			caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
			}else {
			// 更新配合部门联合处置信息
			QueryWrapper<CaseAssistInfo> caseAssistInfoQueryWrapper = new QueryWrapper<>();
			caseAssistInfoQueryWrapper.eq("case_id", blfkCaseTask.getCaseId())
			.eq("assist_unit_id", loginUser.getUnitId()).eq("assist_status", CaseTaskConsts.ASSIST_STATUS_0);
			CaseAssistInfo caseAssistInfoPO = caseAssistInfoService.getOne(caseAssistInfoQueryWrapper);
			caseAssistInfoPO.setCaseTaskId(blfkCaseTask.getId());
			caseAssistInfoPO.setAcceptTime(nowDate);
			caseAssistInfoService.updateCaseAssistInfo(caseAssistInfoPO);
			}
			return blfkCaseTask.getId();
			}catch (Exception e){
			log.error("[CaseTaskService.webAccept]调用失败，异常信息："+e, e);
			throw new ServiceException("CaseTaskService.webAccept", e);
			@@ -1489,39 +1868,105 @@
			jashCaseTask.setCreateTime(DateUtils.addMinute(nowDate, 1));
			jashCaseTask.setUpdateTime(DateUtils.addMinute(nowDate, 1));
			mapper.insert(jashCaseTask);
			// 完成当前结案审核工作流任务，走当事人评价任务
			FlowNode dsrpjFlowNode = flowInfoService.completeTask(jashCaseTask.getFlowableId(), jashCaseTask.getProcessTaskId(),
			// 完成当前结案审核工作流任务，走下一个任务
			FlowNode nextFlowNode = flowInfoService.completeTask(jashCaseTask.getFlowableId(), jashCaseTask.getProcessTaskId(),
			FlowableConsts.OPERATION_jash_ty, userId);
			// 新建当事人评价任务
			CaseTask dsrpjCaseTask = new CaseTask();
			dsrpjCaseTask.setId(utilsClient.getNewTimeId());
			dsrpjCaseTask.setCaseId(jashCaseTask.getCaseId());
			dsrpjCaseTask.setFlowableId(dsrpjFlowNode.getFlowableId());
			dsrpjCaseTask.setProcessInstanceId(dsrpjFlowNode.getProcessInstanceId());
			dsrpjCaseTask.setProcessTaskId(dsrpjFlowNode.getProcessTaskId());
			dsrpjCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			dsrpjCaseTask.setNodeType(dsrpjFlowNode.getNodeType());
			dsrpjCaseTask.setNodeId(dsrpjFlowNode.getNodeId());
			dsrpjCaseTask.setNodeName(dsrpjFlowNode.getNodeName());
			dsrpjCaseTask.setFlowId(dsrpjFlowNode.getFlowId());
			dsrpjCaseTask.setNodeShowName(dsrpjFlowNode.getNodeShowName());
			dsrpjCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
			// 受理任务，任务候选执行者类型是上一步骤选择
			dsrpjCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			dsrpjCaseTask.setCandeUnitId(loginUser.getUnitId());
			dsrpjCaseTask.setCandeUnitName(loginUser.getUnitName());
			// 受理后的任务，不需要签收
			dsrpjCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			dsrpjCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			// 任务处理时限
			if (dsrpjFlowNode.getExpire() != 0) {
			dsrpjCaseTask.setExpireTime(DateUtils.addDay(nowDate, dsrpjFlowNode.getExpire()));
			// 走当事人评价节点
			if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(nextFlowNode.getNodeId())){
			// 新建当事人评价任务
			CaseTask dsrpjCaseTask = new CaseTask();
			dsrpjCaseTask.setId(utilsClient.getNewTimeId());
			dsrpjCaseTask.setCaseId(jashCaseTask.getCaseId());
			dsrpjCaseTask.setFlowableId(nextFlowNode.getFlowableId());
			dsrpjCaseTask.setProcessInstanceId(nextFlowNode.getProcessInstanceId());
			dsrpjCaseTask.setProcessTaskId(nextFlowNode.getProcessTaskId());
			dsrpjCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			dsrpjCaseTask.setNodeType(nextFlowNode.getNodeType());
			dsrpjCaseTask.setNodeId(nextFlowNode.getNodeId());
			dsrpjCaseTask.setNodeName(nextFlowNode.getNodeName());
			dsrpjCaseTask.setFlowId(nextFlowNode.getFlowId());
			dsrpjCaseTask.setNodeShowName(nextFlowNode.getNodeShowName());
			dsrpjCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
			// 受理任务，任务候选执行者类型是上一步骤选择
			dsrpjCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			dsrpjCaseTask.setCandeUnitId(loginUser.getUnitId());
			dsrpjCaseTask.setCandeUnitName(loginUser.getUnitName());
			// 受理后的任务，不需要签收
			dsrpjCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			dsrpjCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			// 任务处理时限
			if (nextFlowNode.getExpire() != 0) {
			dsrpjCaseTask.setExpireTime(DateUtils.addDay(nowDate, nextFlowNode.getExpire()));
			}
			dsrpjCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			dsrpjCaseTask.setCustId(jashCaseTask.getCustId());
			dsrpjCaseTask.setCreateTime(DateUtils.addMinute(nowDate, 2));
			dsrpjCaseTask.setUpdateTime(DateUtils.addMinute(nowDate, 2));
			mapper.insert(dsrpjCaseTask);
			// 更新纠纷信息
			CaseInfo caseInfoPO = new CaseInfo();
			caseInfoPO.setId(jashCaseTask.getCaseId());
			caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_6.getIndex());
			caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_6.getDes());
			caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			}
			dsrpjCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			dsrpjCaseTask.setCustId(jashCaseTask.getCustId());
			dsrpjCaseTask.setCreateTime(DateUtils.addMinute(nowDate, 2));
			dsrpjCaseTask.setUpdateTime(DateUtils.addMinute(nowDate, 2));
			mapper.insert(dsrpjCaseTask);
			// 走结案归档节点
			if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(nextFlowNode.getNodeId())){
			// 默认完成结案归档任务
			CaseTask jagdCaseTask = new CaseTask();
			jagdCaseTask.setId(utilsClient.getNewTimeId());
			jagdCaseTask.setCaseId(jashCaseTask.getCaseId());
			jagdCaseTask.setFlowableId(nextFlowNode.getFlowableId());
			jagdCaseTask.setProcessInstanceId(nextFlowNode.getProcessInstanceId());
			jagdCaseTask.setProcessTaskId(nextFlowNode.getProcessTaskId());
			jagdCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			jagdCaseTask.setNodeType(nextFlowNode.getNodeType());
			jagdCaseTask.setNodeId(nextFlowNode.getNodeId());
			jagdCaseTask.setNodeName(nextFlowNode.getNodeName());
			jagdCaseTask.setFlowId(nextFlowNode.getFlowId());
			jagdCaseTask.setNodeShowName(nextFlowNode.getNodeShowName());
			jagdCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
			// 通过调度的，任务候选执行者类型是上一步骤选择
			jagdCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			jagdCaseTask.setCandeUnitId(loginUser.getUnitId());
			jagdCaseTask.setCandeUnitName(loginUser.getUnitName());
			// 系不需要签收
			jagdCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			jagdCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
			// 任务处理时限
			if (nextFlowNode.getExpire() != 0) {
			jagdCaseTask.setExpireTime(DateUtils.addDay(nowDate, nextFlowNode.getExpire()));
			}
			jagdCaseTask.setHandleUnitId(loginUser.getUnitId());
			jagdCaseTask.setHandleUnitName(loginUser.getUnitName());
			jagdCaseTask.setHandleUserName("系统自动");
			jagdCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
			jagdCaseTask.setHandleTime(nowDate);
			jagdCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			jagdCaseTask.setCustId(jashCaseTask.getCustId());
			jagdCaseTask.setCreateTime(nowDate);
			jagdCaseTask.setUpdateTime(nowDate);
			mapper.insert(jagdCaseTask);
			// 结束工作流流程
			flowInfoService.completeTask(jagdCaseTask.getFlowableId(), jagdCaseTask.getProcessTaskId(),
			FlowableConsts.OPERATION_jb_zszz, "系统自动");
			// 更新纠纷信息
			CaseInfo caseInfoPO = new CaseInfo();
			caseInfoPO.setId(jashCaseTask.getCaseId());
			caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_7.getIndex());
			caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_7.getDes());
			caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			}
			// 更新结案申请信息
			caseWindupApply.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_1);
			caseWindupApply.setCaseTaskId(jashCaseTask.getId());
			@@ -1534,20 +1979,9 @@
			caseWindupApply.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
			caseWindupApply.setCustId(jashCaseTask.getCustId());
			caseWindupApplyService.save(caseWindupApply);
			// 更新纠纷信息
			CaseInfo caseInfoPO = new CaseInfo();
			caseInfoPO.setId(dsrpjCaseTask.getCaseId());
			caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_6.getIndex());
			caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_6.getDes());
			caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			// 更新纠纷扩展信息
			CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
			caseInfoUnfoldPO.setId(dsrpjCaseTask.getCaseId());
			caseInfoUnfoldPO.setId(jashCaseTask.getCaseId());
			caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
			caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
			caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
			@@ -1618,17 +2052,22 @@
			caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
			caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
			caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
			caseInfoUnfoldPO.setCloseTime(nowDate);
			caseInfoUnfoldPO.setUpdateTime(nowDate);
			caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
			}
			// 查询联合处置申请单，全部结束申请单
			QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
			caseAssistApplyQueryWrapper.eq("case_id", jasqCaseTask.getCaseId()).eq("apply_status", AuditBaseConsts.AUDIT_STATUS_0);
			List<CaseAssistApply> caseAssistApplyList = caseAssistApplyService.list(caseAssistApplyQueryWrapper);
			for (CaseAssistApply caseAssistApply: caseAssistApplyList){
			caseAssistApply.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_2);
			caseAssistApply.setUpdateTime(nowDate);
			caseAssistApplyService.updateCaseAssistApply(caseAssistApply);
			}
			// 查询配合部门的任务，全部结束流程
			QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
			caseTaskQueryWrapper.eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).eq("case_id", jasqCaseTask.getCaseId());
			List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
			List<CaseTask> assistCaseTaskList = this.listAssistTasking(jasqCaseTask.getCaseId());
			for (CaseTask assistCaseTask: assistCaseTaskList){
			// 完成配合部门当前办理反馈任务
			assistCaseTask.setId(caseWindupApply.getCaseTaskId());
			// 完成配合部门当前任务
			assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
			assistCaseTask.setHandleUnitId(loginUser.getUnitId());
			assistCaseTask.setHandleUnitName(loginUser.getUnitName());
			@@ -1638,10 +2077,8 @@
			assistCaseTask.setHandleTime(nowDate);
			assistCaseTask.setUpdateTime(nowDate);
			mapper.updateCaseTask(assistCaseTask);
			// 完成当前配合部门办理反馈工作流任务
			flowInfoService.completeTask(assistCaseTask.getFlowableId(), assistCaseTask.getProcessTaskId(),
			FlowableConsts.OPERATION_forward, userId);

			// 结束配合部门当前工作流任务
			flowInfoService.endFlow(assistCaseTask.getProcessInstanceId());
			}
			}catch (Exception e){
			log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e);
			@@ -1686,58 +2123,108 @@
			jashCaseTaskPO.setUpdateTime(nowDate);
			mapper.updateCaseTask(jashCaseTaskPO);
			// 完成当前结案审核工作流任务，走当事人评价任务
			FlowNode dsrpjFlowNode = flowInfoService.completeTask(jashCaseTask.getFlowableId(), jashCaseTask.getProcessTaskId(),
			FlowNode nextFlowNode = flowInfoService.completeTask(jashCaseTask.getFlowableId(), jashCaseTask.getProcessTaskId(),
			FlowableConsts.OPERATION_jash_ty, userId);
			// 新建当事人评价任务
			CaseTask dsrpjCaseTask = new CaseTask();
			dsrpjCaseTask.setId(utilsClient.getNewTimeId());
			dsrpjCaseTask.setCaseId(jashCaseTask.getCaseId());
			dsrpjCaseTask.setFlowableId(dsrpjFlowNode.getFlowableId());
			dsrpjCaseTask.setProcessInstanceId(dsrpjFlowNode.getProcessInstanceId());
			dsrpjCaseTask.setProcessTaskId(dsrpjFlowNode.getProcessTaskId());
			dsrpjCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			dsrpjCaseTask.setNodeType(dsrpjFlowNode.getNodeType());
			dsrpjCaseTask.setNodeId(dsrpjFlowNode.getNodeId());
			dsrpjCaseTask.setNodeName(dsrpjFlowNode.getNodeName());
			dsrpjCaseTask.setFlowId(dsrpjFlowNode.getFlowId());
			dsrpjCaseTask.setNodeShowName(dsrpjFlowNode.getNodeShowName());
			dsrpjCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
			// 受理任务，任务候选执行者类型是上一步骤选择
			dsrpjCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			dsrpjCaseTask.setCandeUnitId(loginUser.getUnitId());
			dsrpjCaseTask.setCandeUnitName(loginUser.getUnitName());
			// 受理后的任务，不需要签收
			dsrpjCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			dsrpjCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			// 任务处理时限
			if (dsrpjFlowNode.getExpire() != 0) {
			dsrpjCaseTask.setExpireTime(DateUtils.addDay(nowDate, dsrpjFlowNode.getExpire()));
			// 走当事人评价节点
			if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(nextFlowNode.getNodeId())){
			// 新建当事人评价任务
			CaseTask dsrpjCaseTask = new CaseTask();
			dsrpjCaseTask.setId(utilsClient.getNewTimeId());
			dsrpjCaseTask.setCaseId(jashCaseTask.getCaseId());
			dsrpjCaseTask.setFlowableId(nextFlowNode.getFlowableId());
			dsrpjCaseTask.setProcessInstanceId(nextFlowNode.getProcessInstanceId());
			dsrpjCaseTask.setProcessTaskId(nextFlowNode.getProcessTaskId());
			dsrpjCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			dsrpjCaseTask.setNodeType(nextFlowNode.getNodeType());
			dsrpjCaseTask.setNodeId(nextFlowNode.getNodeId());
			dsrpjCaseTask.setNodeName(nextFlowNode.getNodeName());
			dsrpjCaseTask.setFlowId(nextFlowNode.getFlowId());
			dsrpjCaseTask.setNodeShowName(nextFlowNode.getNodeShowName());
			dsrpjCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
			// 受理任务，任务候选执行者类型是上一步骤选择
			dsrpjCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			dsrpjCaseTask.setCandeUnitId(loginUser.getUnitId());
			dsrpjCaseTask.setCandeUnitName(loginUser.getUnitName());
			// 受理后的任务，不需要签收
			dsrpjCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			dsrpjCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			// 任务处理时限
			if (nextFlowNode.getExpire() != 0) {
			dsrpjCaseTask.setExpireTime(DateUtils.addDay(nowDate, nextFlowNode.getExpire()));
			}
			dsrpjCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			dsrpjCaseTask.setCustId(jashCaseTask.getCustId());
			dsrpjCaseTask.setCreateTime(nowDate);
			dsrpjCaseTask.setUpdateTime(nowDate);
			mapper.insert(dsrpjCaseTask);
			// 更新纠纷信息
			CaseInfo caseInfoPO = new CaseInfo();
			caseInfoPO.setId(jashCaseTask.getCaseId());
			caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_6.getIndex());
			caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_6.getDes());
			caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			}
			dsrpjCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			dsrpjCaseTask.setCustId(jashCaseTask.getCustId());
			dsrpjCaseTask.setCreateTime(nowDate);
			dsrpjCaseTask.setUpdateTime(nowDate);
			mapper.insert(dsrpjCaseTask);
			// 更新纠纷信息
			CaseInfo caseInfoPO = new CaseInfo();
			caseInfoPO.setId(dsrpjCaseTask.getCaseId());
			caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_6.getIndex());
			caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_6.getDes());
			caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			// 走结案归档节点
			if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(nextFlowNode.getNodeId())){
			// 默认完成结案归档任务
			CaseTask jagdCaseTask = new CaseTask();
			jagdCaseTask.setId(utilsClient.getNewTimeId());
			jagdCaseTask.setCaseId(jashCaseTask.getCaseId());
			jagdCaseTask.setFlowableId(nextFlowNode.getFlowableId());
			jagdCaseTask.setProcessInstanceId(nextFlowNode.getProcessInstanceId());
			jagdCaseTask.setProcessTaskId(nextFlowNode.getProcessTaskId());
			jagdCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			jagdCaseTask.setNodeType(nextFlowNode.getNodeType());
			jagdCaseTask.setNodeId(nextFlowNode.getNodeId());
			jagdCaseTask.setNodeName(nextFlowNode.getNodeName());
			jagdCaseTask.setFlowId(nextFlowNode.getFlowId());
			jagdCaseTask.setNodeShowName(nextFlowNode.getNodeShowName());
			jagdCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
			// 通过调度的，任务候选执行者类型是上一步骤选择
			jagdCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			jagdCaseTask.setCandeUnitId(loginUser.getUnitId());
			jagdCaseTask.setCandeUnitName(loginUser.getUnitName());
			// 系不需要签收
			jagdCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			jagdCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
			// 任务处理时限
			if (nextFlowNode.getExpire() != 0) {
			jagdCaseTask.setExpireTime(DateUtils.addDay(nowDate, nextFlowNode.getExpire()));
			}
			jagdCaseTask.setHandleUnitId(loginUser.getUnitId());
			jagdCaseTask.setHandleUnitName(loginUser.getUnitName());
			jagdCaseTask.setHandleUserName("系统自动");
			jagdCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
			jagdCaseTask.setHandleTime(nowDate);
			jagdCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			jagdCaseTask.setCustId(jashCaseTask.getCustId());
			jagdCaseTask.setCreateTime(nowDate);
			jagdCaseTask.setUpdateTime(nowDate);
			mapper.insert(jagdCaseTask);
			// 结束工作流流程
			flowInfoService.completeTask(jagdCaseTask.getFlowableId(), jagdCaseTask.getProcessTaskId(),
			FlowableConsts.OPERATION_jb_zszz, "系统自动");
			// 更新纠纷信息
			CaseInfo caseInfoPO = new CaseInfo();
			caseInfoPO.setId(jashCaseTask.getCaseId());
			caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_7.getIndex());
			caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_7.getDes());
			caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);

			}
			// 更新纠纷扩展信息
			CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
			caseInfoUnfoldPO.setId(dsrpjCaseTask.getCaseId());
			caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
			caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
			caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
			caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
			caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
			caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
			caseInfoUnfoldPO.setId(jashCaseTask.getCaseId());
			caseInfoUnfoldPO.setCloseTime(nowDate);
			caseInfoUnfoldPO.setUpdateTime(nowDate);
			caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
			@@ -1800,18 +2287,6 @@
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			// 更新纠纷扩展信息
			CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
			caseInfoUnfoldPO.setId(blfkCaseTask.getCaseId());
			caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
			caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
			caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
			caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
			caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
			caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
			caseInfoUnfoldPO.setCloseTime(nowDate);
			caseInfoUnfoldPO.setUpdateTime(nowDate);
			caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
			}
			}catch (Exception e){
			log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e);
			@@ -1848,6 +2323,7 @@
			// 完成当前待受理任务
			CaseTask dslCaseTaskPO = new CaseTask();
			dslCaseTaskPO.setId(caseReturn.getCaseTaskId());
			dslCaseTaskPO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
			dslCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
			dslCaseTaskPO.setHandleUnitId(loginUser.getUnitId());
			dslCaseTaskPO.setHandleUnitName(loginUser.getUnitName());
			@@ -1874,12 +2350,12 @@
			htshCaseTask.setNodeName(htshFlowNode.getNodeName());
			htshCaseTask.setFlowId(htshFlowNode.getFlowId());
			htshCaseTask.setNodeShowName(htshFlowNode.getNodeShowName());
			htshCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
			htshCaseTask.setCaseTaskType(dslCaseTask.getCaseTaskType());
			// 受理任务，任务候选执行者类型是上一步骤选择
			htshCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			CtUnitDTO ctUnitDTO = custClient.getParentZzzxUnit(loginUser.getUnitId());
			htshCaseTask.setCandeUnitId(ctUnitDTO.getId());
			htshCaseTask.setCandeUnitName(ctUnitDTO.getUnitName());
			// CtUnitDTO ctUnitDTO = custClient.getParentZzzxUnit(loginUser.getUnitId());
			htshCaseTask.setCandeUnitId(loginUser.getUnitId());
			htshCaseTask.setCandeUnitName(loginUser.getUnitName());
			// 受理后的任务，不需要签收
			htshCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			// 任务处理时限
			@@ -1894,6 +2370,7 @@
			mapper.insert(htshCaseTask);
			// 新增回退申请信息
			caseReturn.setCaseTaskId(htshCaseTask.getId());
			caseReturn.setCaseTaskType(htshCaseTask.getCaseTaskType());
			caseReturnService.save(caseReturn);
			}catch (Exception e){
			log.error("[CaseTaskService.webAppearApply]调用失败，异常信息："+e, e);
			@@ -1935,65 +2412,92 @@
			htshCaseTaskPO.setHandleTime(nowDate);
			htshCaseTaskPO.setUpdateTime(nowDate);
			mapper.updateCaseTask(htshCaseTaskPO);
			// 完成当前回退审核任务，走待分派任务
			// 完成当前回退审核任务，承办部门走待分派任务，配合部门结束流程
			FlowNode dfpFlowNode = flowInfoService.completeTask(htshCaseTask.getFlowableId(), htshCaseTask.getProcessTaskId(),
			FlowableConsts.OPERATION_htsh_ty, userId);
			// 新建待分派任务
			CaseTask dfphCaseTask = new CaseTask();
			dfphCaseTask.setId(utilsClient.getNewTimeId());
			dfphCaseTask.setCaseId(htshCaseTask.getCaseId());
			dfphCaseTask.setFlowableId(dfpFlowNode.getFlowableId());
			dfphCaseTask.setProcessInstanceId(dfpFlowNode.getProcessInstanceId());
			dfphCaseTask.setProcessTaskId(dfpFlowNode.getProcessTaskId());
			dfphCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			dfphCaseTask.setNodeType(dfpFlowNode.getNodeType());
			dfphCaseTask.setNodeId(dfpFlowNode.getNodeId());
			dfphCaseTask.setNodeName(dfpFlowNode.getNodeName());
			dfphCaseTask.setFlowId(dfpFlowNode.getFlowId());
			dfphCaseTask.setNodeShowName(dfpFlowNode.getNodeShowName());
			dfphCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
			// 受理任务，任务候选执行者类型是上一步骤选择
			dfphCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			dfphCaseTask.setCandeUnitId(loginUser.getUnitId());
			dfphCaseTask.setCandeUnitName(loginUser.getUnitName());
			// 受理后的任务，不需要签收
			dfphCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			// 任务处理时限
			if (dfpFlowNode.getExpire() != 0) {
			dfphCaseTask.setExpireTime(DateUtils.addDay(nowDate, dfpFlowNode.getExpire()));
			if (CaseTaskConsts.CASE_TASK_TYPE_1 == htshCaseTask.getCaseTaskType()) {
			// 新建待分派任务
			CaseTask dfphCaseTask = new CaseTask();
			dfphCaseTask.setId(utilsClient.getNewTimeId());
			dfphCaseTask.setCaseId(htshCaseTask.getCaseId());
			dfphCaseTask.setFlowableId(dfpFlowNode.getFlowableId());
			dfphCaseTask.setProcessInstanceId(dfpFlowNode.getProcessInstanceId());
			dfphCaseTask.setProcessTaskId(dfpFlowNode.getProcessTaskId());
			dfphCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
			dfphCaseTask.setNodeType(dfpFlowNode.getNodeType());
			dfphCaseTask.setNodeId(dfpFlowNode.getNodeId());
			dfphCaseTask.setNodeName(dfpFlowNode.getNodeName());
			dfphCaseTask.setFlowId(dfpFlowNode.getFlowId());
			dfphCaseTask.setNodeShowName(dfpFlowNode.getNodeShowName());
			dfphCaseTask.setCaseTaskType(htshCaseTask.getCaseTaskType());
			// 受理任务，任务候选执行者类型是上一步骤选择
			dfphCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			dfphCaseTask.setCandeUnitId(loginUser.getUnitId());
			dfphCaseTask.setCandeUnitName(loginUser.getUnitName());
			// 受理后的任务，不需要签收
			dfphCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			// 任务处理时限
			if (dfpFlowNode.getExpire() != 0) {
			dfphCaseTask.setExpireTime(DateUtils.addDay(nowDate, dfpFlowNode.getExpire()));
			}
			dfphCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			dfphCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			dfphCaseTask.setCustId(dfphCaseTask.getCustId());
			dfphCaseTask.setCreateTime(nowDate);
			dfphCaseTask.setUpdateTime(nowDate);
			mapper.insert(dfphCaseTask);
			// 更新纠纷信息
			CaseInfo caseInfoPO = new CaseInfo();
			caseInfoPO.setId(htshCaseTask.getCaseId());
			caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_1.getIndex());
			caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_1.getDes());
			caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			// 有配合部门，也结束配合部门工作流程
			List<CaseTask> assistCaseTaskList = this.listAssistTasking(htshCaseTask.getCaseId());
			for (CaseTask assistCaseTask: assistCaseTaskList){
			// 完成配合部门当前任务
			assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
			assistCaseTask.setHandleUnitId(loginUser.getUnitId());
			assistCaseTask.setHandleUnitName(loginUser.getUnitName());
			assistCaseTask.setHandleUserId(loginUser.getId());
			assistCaseTask.setHandleUserName(loginUser.getTrueName());
			assistCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
			assistCaseTask.setHandleTime(nowDate);
			assistCaseTask.setUpdateTime(nowDate);
			mapper.updateCaseTask(assistCaseTask);
			// 结束配合部门当前工作流任务
			flowInfoService.endFlow(assistCaseTask.getProcessInstanceId());
			}
			}else {
			// 更新联合处置信息
			QueryWrapper<CaseAssistInfo> caseAssistInfoQueryWrapper = new QueryWrapper<>();
			caseAssistInfoQueryWrapper.eq("case_id", htshCaseTask.getCaseId()).eq("assist_unit_id", htshCaseTask.getCandeUnitId()).eq("assist_status", CaseTaskConsts.ASSIST_STATUS_0);
			CaseAssistInfo caseAssistInfo = caseAssistInfoService.getOne(caseAssistInfoQueryWrapper);
			if (ObjectUtils.isNotEmpty(caseAssistInfo)){
			caseAssistInfo.setAssistStatus(CaseTaskConsts.ASSIST_STATUS_1);
			caseAssistInfoService.updateCaseAssistInfo(caseAssistInfo);
			}
			}
			dfphCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			dfphCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
			dfphCaseTask.setCustId(dfphCaseTask.getCustId());
			dfphCaseTask.setCreateTime(nowDate);
			dfphCaseTask.setUpdateTime(nowDate);
			mapper.insert(dfphCaseTask);
			// 更新纠纷信息
			CaseInfo caseInfoPO = new CaseInfo();
			caseInfoPO.setId(htshCaseTask.getCaseId());
			caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_1.getIndex());
			caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_1.getDes());
			caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
			caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
			caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
			caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
			caseInfoPO.setUpdateTime(nowDate);
			caseInfoService.updateCaseInfo(caseInfoPO);
			}else {
			// 审核不通过
			// 完成当前回退审核任务
			CaseTask sbshCaseTaskPO = new CaseTask();
			sbshCaseTaskPO.setId(caseReturn.getCaseTaskId());
			sbshCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
			sbshCaseTaskPO.setHandleUnitId(loginUser.getUnitId());
			sbshCaseTaskPO.setHandleUnitName(loginUser.getUnitName());
			sbshCaseTaskPO.setHandleUserId(loginUser.getId());
			sbshCaseTaskPO.setHandleUserName(loginUser.getTrueName());
			sbshCaseTaskPO.setHandleContent(caseReturn.getAuditContent());
			sbshCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_2);
			sbshCaseTaskPO.setHandleTime(nowDate);
			sbshCaseTaskPO.setUpdateTime(nowDate);
			mapper.updateCaseTask(sbshCaseTaskPO);
			CaseTask htshCaseTaskPO = new CaseTask();
			htshCaseTaskPO.setId(caseReturn.getCaseTaskId());
			htshCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
			htshCaseTaskPO.setHandleUnitId(loginUser.getUnitId());
			htshCaseTaskPO.setHandleUnitName(loginUser.getUnitName());
			htshCaseTaskPO.setHandleUserId(loginUser.getId());
			htshCaseTaskPO.setHandleUserName(loginUser.getTrueName());
			htshCaseTaskPO.setHandleContent(caseReturn.getAuditContent());
			htshCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_2);
			htshCaseTaskPO.setHandleTime(nowDate);
			htshCaseTaskPO.setUpdateTime(nowDate);
			mapper.updateCaseTask(htshCaseTaskPO);
			CaseReturn btyCaseReturn = caseReturnService.getById(caseReturn.getId());
			CtUnitDTO returnUnit = custClient.getUnitById(btyCaseReturn.getReturnUnitId());
			String operation = FlowableConsts.OPERATION_htsh_bty;
			@@ -2019,7 +2523,7 @@
			dslCaseTask.setNodeName(dslFlowNode.getNodeName());
			dslCaseTask.setFlowId(dslFlowNode.getFlowId());
			dslCaseTask.setNodeShowName(dslFlowNode.getNodeShowName());
			dslCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
			dslCaseTask.setCaseTaskType(htshCaseTask.getCaseTaskType());
			// 受理任务，任务候选执行者类型是上一步骤选择
			dslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			dslCaseTask.setCandeUnitId(btyCaseReturn.getReturnUnitId());
			@@ -2038,8 +2542,8 @@
			mapper.insert(dslCaseTask);
			}
			}catch (Exception e){
			log.error("[CaseTaskService.webAppearAudit]调用失败，异常信息："+e, e);
			throw new ServiceException("CaseTaskService.webAppearAudit", e);
			log.error("[CaseTaskService.webReturnAudit]调用失败，异常信息："+e, e);
			throw new ServiceException("CaseTaskService.webReturnAudit", e);
			}
			}

			@@ -2069,6 +2573,7 @@
			// 完成当前待受理任务
			CaseTask dslCaseTaskPO = new CaseTask();
			dslCaseTaskPO.setId(caseAppear.getCaseTaskId());
			dslCaseTaskPO.setTaskType(CaseTaskConsts.TASK_TYPE_3);
			dslCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
			dslCaseTaskPO.setHandleUnitId(loginUser.getUnitId());
			dslCaseTaskPO.setHandleUnitName(loginUser.getUnitName());
			@@ -2233,8 +2738,9 @@
			dfphCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
			// 受理任务，任务候选执行者类型是上一步骤选择
			dfphCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
			dfphCaseTask.setCandeUnitId(caseAppear.getAppearUnitId());
			dfphCaseTask.setCandeUnitName(caseAppear.getAppearUnitName());
			CaseAppear caseAppearBO = caseAppearService.getById(caseAppear.getId());
			dfphCaseTask.setCandeUnitId(caseAppearBO.getAppearUnitId());
			dfphCaseTask.setCandeUnitName(caseAppearBO.getAppearUnitName());
			// 受理后的任务，不需要签收
			dfphCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
			dfphCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
			@@ -2254,4 +2760,30 @@
			}
			}

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

			/**
			* web端-工作台-已办事项
			* @param page 分页对象
			* @param terms 条件
			* @return Page
			*/
			public Page<FrontPageListYBDTO> pageMyTaskYb(PageRequest page, Map<String, Object> terms){
			try {
			long total = mapper.countMyTaskYb(terms);
			List<FrontPageListYBDTO> frontPageListYBDTOList = mapper.pageMyTaskYb(page, terms);
			return new PageImpl<FrontPageListYBDTO>(frontPageListYBDTOList, page, total);
			}catch (Exception e) {
			log.error("[CaseTaskService.pageMyTaskYb]调用失败，异常信息：" + e, e);
			throw new ServiceException("CaseTaskService.pageMyTaskYb", e);
			}
			}

			}