dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAppearWebController.java
@@ -129,9 +129,9 @@ terms.put("auditResultName", auditResultName); } // 上报审核理由 String audit_content = request.getParameter("audit_content"); if (StringUtils.isNotBlank(audit_content)){ terms.put("audit_content", audit_content); String auditContent = request.getParameter("auditContent"); if (StringUtils.isNotBlank(auditContent)){ terms.put("auditContent", auditContent); } // 删除状态，0：未删除，1：已删除 String deleteStatus = request.getParameter("deleteStatus"); dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAssistApplyWebController.java
@@ -133,9 +133,9 @@ terms.put("auditResultName", auditResultName); } // 审核理由 String audit_content = request.getParameter("audit_content"); if (StringUtils.isNotBlank(audit_content)){ terms.put("audit_content", audit_content); String auditContent = request.getParameter("auditContent"); if (StringUtils.isNotBlank(auditContent)){ terms.put("auditContent", auditContent); } // 删除状态，0：未删除，1：已删除 String deleteStatus = request.getParameter("deleteStatus"); dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseReturnWebController.java
@@ -129,9 +129,9 @@ terms.put("auditResultName", auditResultName); } // 回退审核理由 String audit_content = request.getParameter("audit_content"); if (StringUtils.isNotBlank(audit_content)){ terms.put("audit_content", audit_content); String auditContent = request.getParameter("auditContent"); if (StringUtils.isNotBlank(auditContent)){ terms.put("auditContent", auditContent); } // 删除状态，0：未删除，1：已删除 String deleteStatus = request.getParameter("deleteStatus"); dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
@@ -185,6 +185,7 @@ @PostMapping("/returnApply") public Object returnApply(@RequestBody CaseReturn caseReturn, @CurrentUser String userId) { try { service.webReturnApply(caseReturn, userId); return ReturnSucUtils.getRepInfo(); } catch (Exception e) { return ReturnFailUtils.getRepInfo(); @@ -223,6 +224,7 @@ @PostMapping("/returnAudit") public Object returnAudit(@RequestBody CaseReturn caseReturn, @CurrentUser String userId) { try { service.webReturnAudit(caseReturn, userId); return ReturnSucUtils.getRepInfo(); } catch (Exception e) { return ReturnFailUtils.getRepInfo(); @@ -238,6 +240,7 @@ @PostMapping("/appearApply") public Object appearApply(@RequestBody CaseAppear caseAppear, @CurrentUser String userId) { try { service.webAppearApply(caseAppear, userId); return ReturnSucUtils.getRepInfo(); } catch (Exception e) { return ReturnFailUtils.getRepInfo(); @@ -268,6 +271,7 @@ @PostMapping("/appearAudit") public Object appearAudit(@RequestBody CaseAppear caseAppear, @CurrentUser String userId) { try { service.webAppearAudit(caseAppear, userId); return ReturnSucUtils.getRepInfo(); } catch (Exception e) { return ReturnFailUtils.getRepInfo(); dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseWindupApplyWebController.java
@@ -159,9 +159,9 @@ terms.put("auditResultName", auditResultName); } // 结案审核理由 String audit_content = request.getParameter("audit_content"); if (StringUtils.isNotBlank(audit_content)){ terms.put("audit_content", audit_content); String auditContent = request.getParameter("auditContent"); if (StringUtils.isNotBlank(auditContent)){ terms.put("auditContent", auditContent); } // 删除状态，0：未删除，1：已删除 String deleteStatus = request.getParameter("deleteStatus"); dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
@@ -28,7 +28,7 @@ <result property="auditTime" column="audit_time"/> <result property="auditResult" column="audit_result"/> <result property="auditResultName" column="audit_result_name"/> <result property="audit_content" column="audit__content"/> <result property="auditContent" column="audit_content"/> <result property="deleteStatus" column="delete_status"/> <result property="custId" column="cust_id"/> <result property="createTime" column="create_time"/> @@ -55,7 +55,7 @@ audit_time, audit_result, audit_result_name, audit__content, audit_content, delete_status, cust_id, create_time, @@ -79,7 +79,7 @@ <if test="entity.auditTime != null">audit_time = #{entity.auditTime},</if> <if test="entity.auditResult != null">audit_result = #{entity.auditResult},</if> <if test="entity.auditResultName != null">audit_result_name = #{entity.auditResultName},</if> <if test="entity.audit_content != null">audit__content = #{entity.audit_content},</if> <if test="entity.auditContent != null">audit_content = #{entity.auditContent},</if> <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if> <if test="entity.custId != null">cust_id = #{entity.custId},</if> <if test="entity.createTime != null">create_time = #{entity.createTime},</if> @@ -140,8 +140,8 @@ <if test="terms.auditResultName != null and terms.auditResultName !=''"> and audit_result_name = #{terms.auditResultName} </if> <if test="terms.audit_content != null and terms.audit_content !=''"> and audit__content = #{terms.audit_content} <if test="terms.auditContent != null and terms.auditContent !=''"> and audit_content = #{terms.auditContent} </if> <if test="terms.deleteStatus = null and terms.deleteStatus =''"> and delete_status = 0 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
@@ -29,7 +29,7 @@ <result property="auditTime" column="audit_time"/> <result property="auditResult" column="audit_result"/> <result property="auditResultName" column="audit_result_name"/> <result property="audit_content" column="audit__content"/> <result property="auditContent" column="audit_content"/> <result property="deleteStatus" column="delete_status"/> <result property="custId" column="cust_id"/> <result property="createTime" column="create_time"/> @@ -57,7 +57,7 @@ audit_time, audit_result, audit_result_name, audit__content, audit_content, delete_status, cust_id, create_time, @@ -82,7 +82,7 @@ <if test="entity.auditTime != null">audit_time = #{entity.auditTime},</if> <if test="entity.auditResult != null">audit_result = #{entity.auditResult},</if> <if test="entity.auditResultName != null">audit_result_name = #{entity.auditResultName},</if> <if test="entity.audit_content != null">audit__content = #{entity.audit_content},</if> <if test="entity.auditContent != null">audit_content = #{entity.auditContent},</if> <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if> <if test="entity.custId != null">cust_id = #{entity.custId},</if> <if test="entity.createTime != null">create_time = #{entity.createTime},</if> @@ -146,8 +146,8 @@ <if test="terms.auditResultName != null and terms.auditResultName !=''"> and audit_result_name = #{terms.auditResultName} </if> <if test="terms.audit_content != null and terms.audit_content !=''"> and audit__content = #{terms.audit_content} <if test="terms.auditContent != null and terms.auditContent !=''"> and audit_content = #{terms.auditContent} </if> <if test="terms.deleteStatus = null and terms.deleteStatus =''"> and delete_status = 0 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
@@ -28,7 +28,7 @@ <result property="auditTime" column="audit_time"/> <result property="auditResult" column="audit_result"/> <result property="auditResultName" column="audit_result_name"/> <result property="audit_content" column="audit__content"/> <result property="auditContent" column="audit_content"/> <result property="deleteStatus" column="delete_status"/> <result property="custId" column="cust_id"/> <result property="createTime" column="create_time"/> @@ -55,7 +55,7 @@ audit_time, audit_result, audit_result_name, audit__content, audit_content, delete_status, cust_id, create_time, @@ -79,7 +79,7 @@ <if test="entity.auditTime != null">audit_time = #{entity.auditTime},</if> <if test="entity.auditResult != null">audit_result = #{entity.auditResult},</if> <if test="entity.auditResultName != null">audit_result_name = #{entity.auditResultName},</if> <if test="entity.audit_content != null">audit__content = #{entity.audit_content},</if> <if test="entity.auditContent != null">audit_content = #{entity.auditContent},</if> <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if> <if test="entity.custId != null">cust_id = #{entity.custId},</if> <if test="entity.createTime != null">create_time = #{entity.createTime},</if> @@ -140,8 +140,8 @@ <if test="terms.auditResultName != null and terms.auditResultName !=''"> and audit_result_name = #{terms.auditResultName} </if> <if test="terms.audit_content != null and terms.audit_content !=''"> and audit__content = #{terms.audit_content} <if test="terms.auditContent != null and terms.auditContent !=''"> and audit_content = #{terms.auditContent} </if> <if test="terms.deleteStatus = null and terms.deleteStatus =''"> and delete_status = 0 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
@@ -34,7 +34,7 @@ <result property="auditTime" column="audit_time"/> <result property="auditResult" column="audit_result"/> <result property="auditResultName" column="audit_result_name"/> <result property="audit_content" column="audit__content"/> <result property="auditContent" column="audit_content"/> <result property="deleteStatus" column="delete_status"/> <result property="custId" column="cust_id"/> <result property="createTime" column="create_time"/> @@ -67,7 +67,7 @@ audit_time, audit_result, audit_result_name, audit__content, audit_content, delete_status, cust_id, create_time, @@ -97,7 +97,7 @@ <if test="entity.auditTime != null">audit_time = #{entity.auditTime},</if> <if test="entity.auditResult != null">audit_result = #{entity.auditResult},</if> <if test="entity.auditResultName != null">audit_result_name = #{entity.auditResultName},</if> <if test="entity.audit_content != null">audit__content = #{entity.audit_content},</if> <if test="entity.auditContent != null">audit_content = #{entity.auditContent},</if> <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if> <if test="entity.custId != null">cust_id = #{entity.custId},</if> <if test="entity.createTime != null">create_time = #{entity.createTime},</if> @@ -176,8 +176,8 @@ <if test="terms.auditResultName != null and terms.auditResultName !=''"> and audit_result_name = #{terms.auditResultName} </if> <if test="terms.audit_content != null and terms.audit_content !=''"> and audit__content = #{terms.audit_content} <if test="terms.auditContent != null and terms.auditContent !=''"> and audit_content = #{terms.auditContent} </if> <if test="terms.deleteStatus = null and terms.deleteStatus =''"> and delete_status = 0 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseAppear.java
@@ -125,8 +125,8 @@ /** * 上报审核理由 */ @TableField(value = "audit__content") private String audit_content; @TableField(value = "audit_content") private String auditContent; /** * 删除状态，0：未删除，1：已删除 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseAssistApply.java
@@ -133,8 +133,8 @@ /** * 审核理由 */ @TableField(value = "audit__content") private String audit_content; @TableField(value = "audit_content") private String auditContent; /** * 删除状态，0：未删除，1：已删除 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseReturn.java
@@ -111,7 +111,7 @@ * 回退审核时间 */ @TableField(value = "audit_time") private String auditTime; private Date auditTime; /** * 回退审核结果 @@ -128,8 +128,8 @@ /** * 回退审核理由 */ @TableField(value = "audit__content") private String audit_content; @TableField(value = "audit_content") private String auditContent; /** * 删除状态，0：未删除，1：已删除 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseWindupApply.java
@@ -161,8 +161,8 @@ /** * 结案审核理由 */ @TableField(value = "audit__content") private String audit_content; @TableField(value = "audit_content") private String auditContent; /** * 删除状态，0：未删除，1：已删除 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -90,21 +90,21 @@ private CaseInfoUnfoldService caseInfoUnfoldService; @Autowired private CaseWindupApplyService caseWindupApplyService; @Autowired private CaseAssistApplyService assistApplyService; @Autowired private CaseAppearService caseAppearService; @Autowired private CaseReturnService caseReturnService; @Autowired private CaseWindupApplyMapper caseWindupApplyMapper; @Autowired private CaseReturnMapper caseReturnMapper; @Autowired private CaseAppearMapper caseAppearMapper; @Autowired private CaseAssistApplyMapper caseAssistApplyMapper; @Autowired private CaseAssistApplyService assistApplyService; /** * 更新对象 @@ -444,11 +444,12 @@ caseFlowDTO.setStatus(caseTask.getStatus()); } handleCaseFlowList.add(caseFlowDTO); // 待受理节点，已签收的，需要加多一个受理节点 // 待受理节点，已签收的并处理完，需要加多一个受理节点 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())){ if(CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus()){ if(CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus() && CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){ CaseFlowDTO slCaseFlowDTO = new CaseFlowDTO(); if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){ if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){ @@ -895,7 +896,48 @@ */ public void webStartFlowZXSL(CaseInfo caseInfo, CtUserDTO loginUser){ try{ // 启动自行手里工作流 FlowNode firstFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_ZXSL, caseInfo.getId()); // 进入第1个节点-办理反馈 CaseTask blfkCaseTask = new CaseTask(); blfkCaseTask.setId(utilsClient.getNewTimeId()); blfkCaseTask.setCaseId(caseInfo.getId()); blfkCaseTask.setFlowableId(firstFlowNode.getFlowableId()); blfkCaseTask.setProcessInstanceId(firstFlowNode.getProcessInstanceId()); blfkCaseTask.setProcessTaskId(firstFlowNode.getProcessTaskId()); blfkCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1); blfkCaseTask.setNodeType(firstFlowNode.getNodeType()); blfkCaseTask.setNodeId(firstFlowNode.getNodeId()); blfkCaseTask.setNodeName(firstFlowNode.getNodeName()); blfkCaseTask.setFlowId(firstFlowNode.getFlowId()); blfkCaseTask.setNodeShowName(firstFlowNode.getNodeShowName()); blfkCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1); // 通过调度的，任务候选执行者类型是上一步骤选择 blfkCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1); blfkCaseTask.setCandeUnitId(loginUser.getUnitId()); blfkCaseTask.setCandeUnitName(loginUser.getUnitName()); // 系统给综治中心分派，不需要签收 blfkCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0); blfkCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1); // 任务处理时限 if (firstFlowNode.getExpire() != 0) { blfkCaseTask.setExpireTime(DateUtils.addDay(caseInfo.getCreateTime(), firstFlowNode.getExpire())); } blfkCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0); blfkCaseTask.setCustId(caseInfo.getCustId()); blfkCaseTask.setCreateTime(caseInfo.getCreateTime()); blfkCaseTask.setUpdateTime(caseInfo.getUpdateTime()); mapper.insert(blfkCaseTask); // 更新纠纷信息 CaseInfo caseInfoPO = new CaseInfo(); caseInfoPO.setId(caseInfo.getId()); caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_4.getIndex()); caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_4.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()); caseInfoService.updateCaseInfo(caseInfoPO); }catch (Exception e){ log.error("[CaseTaskService.webStartFlowZXSL]调用失败，异常信息："+e, e); throw new ServiceException("CaseTaskService.webStartFlowZXSL", e); @@ -1248,6 +1290,7 @@ jasqCaseTask.setHandleUnitName(loginUser.getUnitName()); jasqCaseTask.setHandleUserId(loginUser.getId()); jasqCaseTask.setHandleUserName(loginUser.getTrueName()); jasqCaseTask.setHandleContent(caseWindupApply.getWindupContent()); jasqCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1); jasqCaseTask.setHandleTime(nowDate); jasqCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0); @@ -1445,6 +1488,8 @@ caseWindupApply.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_1); caseWindupApply.setAuditUserId(loginUser.getId()); caseWindupApply.setAuditUserName(loginUser.getTrueName()); caseWindupApply.setDeleteStatus(BaseConsts.DELETE_STATUS_0); caseWindupApply.setCustId(loginUser.getCustId()); caseWindupApply.setAuditTime(nowDate); caseWindupApply.setUpdateTime(nowDate); caseWindupApplyService.updateCaseWindupApply(caseWindupApply); @@ -1460,6 +1505,7 @@ jashCaseTaskPO.setHandleUnitName(loginUser.getUnitName()); jashCaseTaskPO.setHandleUserId(loginUser.getId()); jashCaseTaskPO.setHandleUserName(loginUser.getTrueName()); jashCaseTaskPO.setHandleContent(caseWindupApply.getAuditContent()); jashCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1); jashCaseTaskPO.setHandleTime(nowDate); jashCaseTaskPO.setUpdateTime(nowDate); @@ -1530,6 +1576,7 @@ jashCaseTaskPO.setHandleUnitName(loginUser.getUnitName()); jashCaseTaskPO.setHandleUserId(loginUser.getId()); jashCaseTaskPO.setHandleUserName(loginUser.getTrueName()); jashCaseTaskPO.setHandleContent(caseWindupApply.getAuditContent()); jashCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_2); jashCaseTaskPO.setHandleTime(nowDate); jashCaseTaskPO.setUpdateTime(nowDate); @@ -1599,15 +1646,432 @@ /** * web端任务处理-上报 * @param caseReturn 回退申请表单 * @param userId 当前登录用户 */ public void webReturnApply(CaseReturn caseReturn, String userId){ try{ Date nowDate = DateUtils.getNowDate(); // 获取当前登录用户 CtUserDTO loginUser = custClient.clientGetUserAll(userId); // 创建回退申请信息 caseReturn.setReturnUnitId(loginUser.getUnitId()); caseReturn.setReturnUnitName(loginUser.getUnitName()); caseReturn.setReturnUserId(loginUser.getId()); caseReturn.setReturnUserName(loginUser.getTrueName()); caseReturn.setReturnTime(nowDate); caseReturn.setReturnStatus(AuditBaseConsts.AUDIT_STATUS_0); caseReturn.setDeleteStatus(BaseConsts.DELETE_STATUS_0); caseReturn.setCustId(loginUser.getCustId()); caseReturn.setCreateTime(nowDate); caseReturn.setUpdateTime(nowDate); // 查询待受理任务 CaseTask dslCaseTask = mapper.selectById(caseReturn.getCaseTaskId()); // 完成当前待受理任务 CaseTask dslCaseTaskPO = new CaseTask(); dslCaseTaskPO.setId(caseReturn.getCaseTaskId()); dslCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2); dslCaseTaskPO.setHandleUnitId(loginUser.getUnitId()); dslCaseTaskPO.setHandleUnitName(loginUser.getUnitName()); dslCaseTaskPO.setHandleUserId(loginUser.getId()); dslCaseTaskPO.setHandleUserName(loginUser.getTrueName()); dslCaseTaskPO.setHandleContent(caseReturn.getReturnContent()); dslCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1); dslCaseTaskPO.setHandleTime(nowDate); dslCaseTaskPO.setUpdateTime(nowDate); mapper.updateCaseTask(dslCaseTaskPO); // 完成当前待受理工作流任务，走回退审核任务 FlowNode htshFlowNode = flowInfoService.completeTask(dslCaseTask.getFlowableId(), dslCaseTask.getProcessTaskId(), FlowableConsts.OPERATION_htsq, userId); // 新建回退审核任务 CaseTask htshCaseTask = new CaseTask(); htshCaseTask.setId(utilsClient.getNewTimeId()); htshCaseTask.setCaseId(dslCaseTaskPO.getCaseId()); htshCaseTask.setFlowableId(htshFlowNode.getFlowableId()); htshCaseTask.setProcessInstanceId(htshFlowNode.getProcessInstanceId()); htshCaseTask.setProcessTaskId(htshFlowNode.getProcessTaskId()); htshCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_2); htshCaseTask.setNodeType(htshFlowNode.getNodeType()); htshCaseTask.setNodeId(htshFlowNode.getNodeId()); htshCaseTask.setNodeName(htshFlowNode.getNodeName()); htshCaseTask.setFlowId(htshFlowNode.getFlowId()); htshCaseTask.setNodeShowName(htshFlowNode.getNodeShowName()); htshCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1); // 受理任务，任务候选执行者类型是上一步骤选择 htshCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1); CtUnitDTO ctUnitDTO = custClient.getParentZzzxUnit(loginUser.getUnitId()); htshCaseTask.setCandeUnitId(ctUnitDTO.getId()); htshCaseTask.setCandeUnitName(ctUnitDTO.getUnitName()); // 受理后的任务，不需要签收 htshCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0); // 任务处理时限 if (htshFlowNode.getExpire() != 0) { htshCaseTask.setExpireTime(DateUtils.addDay(nowDate, htshFlowNode.getExpire())); } htshCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1); htshCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0); htshCaseTask.setCustId(htshCaseTask.getCustId()); htshCaseTask.setCreateTime(nowDate); htshCaseTask.setUpdateTime(nowDate); mapper.insert(htshCaseTask); // 新增回退申请信息 caseReturn.setCaseTaskId(htshCaseTask.getId()); caseReturnService.save(caseReturn); }catch (Exception e){ log.error("[CaseTaskService.webAppearApply]调用失败，异常信息："+e, e); throw new ServiceException("CaseTaskService.webAppearApply", e); } } /** * web端任务处理-回退审核 * @param caseReturn 回退审核表单 * @param userId 当前登录用户 */ public void webReturnAudit(CaseReturn caseReturn, String userId){ try{ Date nowDate = DateUtils.getNowDate(); // 获取当前登录用户 CtUserDTO loginUser = custClient.clientGetUserAll(userId); // 更新回退申请信息 caseReturn.setReturnStatus(AuditBaseConsts.AUDIT_STATUS_1); caseReturn.setAuditUserId(loginUser.getId()); caseReturn.setAuditUserName(loginUser.getTrueName()); caseReturn.setAuditTime(nowDate); caseReturn.setUpdateTime(nowDate); caseReturnService.updateCaseReturn(caseReturn); // 查询回退审核任务 CaseTask htshCaseTask = mapper.selectById(caseReturn.getCaseTaskId()); // 审核通过 if (AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex().equals(caseReturn.getAuditResult())){ // 完成当前回退审核任务 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.setHandleContent(caseReturn.getAuditContent()); htshCaseTaskPO.setHandleUserName(loginUser.getTrueName()); htshCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1); 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(dfphCaseTask.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())); } 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(dfphCaseTask.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); CtUnitDTO returnUnit = custClient.getUnitById(caseReturn.getReturnUnitId()); String operation = FlowableConsts.OPERATION_htsh_bty; if (UserBaseConsts.UNIT_GRADE_2 == returnUnit.getUnitGrade()){ operation = FlowableConsts.OPERATION_htsh_bty_qj; } if(UserBaseConsts.UNIT_GRADE_1 == returnUnit.getUnitGrade()){ operation = FlowableConsts.OPERATION_htsh_bty_sj; } // 完成当前上报审核任务，走待受理任务 FlowNode dslFlowNode = flowInfoService.completeTask(htshCaseTask.getFlowableId(), htshCaseTask.getProcessTaskId(), operation, userId); // 新建待分派任务 CaseTask dslCaseTask = new CaseTask(); dslCaseTask.setId(utilsClient.getNewTimeId()); dslCaseTask.setCaseId(dslCaseTask.getCaseId()); dslCaseTask.setFlowableId(dslFlowNode.getFlowableId()); dslCaseTask.setProcessInstanceId(dslFlowNode.getProcessInstanceId()); dslCaseTask.setProcessTaskId(dslFlowNode.getProcessTaskId()); dslCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1); dslCaseTask.setNodeType(dslFlowNode.getNodeType()); dslCaseTask.setNodeId(dslFlowNode.getNodeId()); dslCaseTask.setNodeName(dslFlowNode.getNodeName()); dslCaseTask.setFlowId(dslFlowNode.getFlowId()); dslCaseTask.setNodeShowName(dslFlowNode.getNodeShowName()); dslCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1); // 受理任务，任务候选执行者类型是上一步骤选择 dslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1); dslCaseTask.setCandeUnitId(caseReturn.getReturnUnitId()); dslCaseTask.setCandeUnitName(caseReturn.getReturnUnitName()); // 受理后的任务，不需要签收 dslCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0); // 任务处理时限 if (dslFlowNode.getExpire() != 0) { dslCaseTask.setExpireTime(DateUtils.addDay(nowDate, dslFlowNode.getExpire())); } dslCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1); dslCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0); dslCaseTask.setCustId(dslCaseTask.getCustId()); dslCaseTask.setCreateTime(nowDate); dslCaseTask.setUpdateTime(nowDate); mapper.insert(dslCaseTask); } }catch (Exception e){ log.error("[CaseTaskService.webAppearAudit]调用失败，异常信息："+e, e); throw new ServiceException("CaseTaskService.webAppearAudit", e); } } /** * web端任务处理-上报 * @param caseAppear 上报表单 * @param userId 当前登录用户 */ public void webAppearApply(CaseAppear caseAppear, String userId){ try{ Date nowDate = DateUtils.getNowDate(); // 获取当前登录用户 CtUserDTO loginUser = custClient.clientGetUserAll(userId); // 创建上报信息 caseAppear.setAppearUnitId(loginUser.getUnitId()); caseAppear.setAppearUnitName(loginUser.getUnitName()); caseAppear.setAppearUserId(loginUser.getId()); caseAppear.setAppearUserName(loginUser.getTrueName()); caseAppear.setAppearTime(nowDate); caseAppear.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_0); caseAppear.setDeleteStatus(BaseConsts.DELETE_STATUS_0); caseAppear.setCustId(loginUser.getCustId()); caseAppear.setCreateTime(nowDate); caseAppear.setUpdateTime(nowDate); // 查询待受理任务 CaseTask dslCaseTask = mapper.selectById(caseAppear.getCaseTaskId()); // 完成当前待受理任务 CaseTask dslCaseTaskPO = new CaseTask(); dslCaseTaskPO.setId(caseAppear.getCaseTaskId()); dslCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2); dslCaseTaskPO.setHandleUnitId(loginUser.getUnitId()); dslCaseTaskPO.setHandleUnitName(loginUser.getUnitName()); dslCaseTaskPO.setHandleUserId(loginUser.getId()); dslCaseTaskPO.setHandleUserName(loginUser.getTrueName()); dslCaseTaskPO.setHandleContent(caseAppear.getAppearContent()); dslCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1); dslCaseTaskPO.setHandleTime(nowDate); dslCaseTaskPO.setUpdateTime(nowDate); mapper.updateCaseTask(dslCaseTaskPO); // 完成当前待受理工作流任务，走上报审核任务 FlowNode sbshFlowNode = flowInfoService.completeTask(dslCaseTask.getFlowableId(), dslCaseTask.getProcessTaskId(), FlowableConsts.OPERATION_sb, userId); // 新建上报审核任务 CaseTask sbshCaseTask = new CaseTask(); sbshCaseTask.setId(utilsClient.getNewTimeId()); sbshCaseTask.setCaseId(dslCaseTaskPO.getCaseId()); sbshCaseTask.setFlowableId(sbshFlowNode.getFlowableId()); sbshCaseTask.setProcessInstanceId(sbshFlowNode.getProcessInstanceId()); sbshCaseTask.setProcessTaskId(sbshFlowNode.getProcessTaskId()); sbshCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_3); sbshCaseTask.setNodeType(sbshFlowNode.getNodeType()); sbshCaseTask.setNodeId(sbshFlowNode.getNodeId()); sbshCaseTask.setNodeName(sbshFlowNode.getNodeName()); sbshCaseTask.setFlowId(sbshFlowNode.getFlowId()); sbshCaseTask.setNodeShowName(sbshFlowNode.getNodeShowName()); sbshCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1); // 受理任务，任务候选执行者类型是上一步骤选择 sbshCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1); sbshCaseTask.setCandeUnitId(caseAppear.getAuditUnitId()); sbshCaseTask.setCandeUnitName(caseAppear.getAuditUnitName()); // 受理后的任务，不需要签收 sbshCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0); // 任务处理时限 if (sbshFlowNode.getExpire() != 0) { sbshCaseTask.setExpireTime(DateUtils.addDay(nowDate, sbshFlowNode.getExpire())); } sbshCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1); sbshCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0); sbshCaseTask.setCustId(sbshCaseTask.getCustId()); sbshCaseTask.setCreateTime(nowDate); sbshCaseTask.setUpdateTime(nowDate); mapper.insert(sbshCaseTask); // 新增上报申请信息 caseAppear.setCaseTaskId(sbshCaseTask.getId()); caseAppearService.save(caseAppear); }catch (Exception e){ log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e); throw new ServiceException("CaseTaskService.webWindupApply", e); log.error("[CaseTaskService.webAppearApply]调用失败，异常信息："+e, e); throw new ServiceException("CaseTaskService.webAppearApply", e); } } /** * web端任务处理-上报审核 * @param caseAppear 上报审核表单 * @param userId 当前登录用户 */ public void webAppearAudit(CaseAppear caseAppear, String userId){ try{ Date nowDate = DateUtils.getNowDate(); // 获取当前登录用户 CtUserDTO loginUser = custClient.clientGetUserAll(userId); // 更新上报信息 caseAppear.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_1); caseAppear.setAuditUserId(loginUser.getId()); caseAppear.setAuditUserName(loginUser.getTrueName()); caseAppear.setAuditTime(nowDate); caseAppear.setUpdateTime(nowDate); caseAppearService.updateCaseAppear(caseAppear); // 查询上报审核任务 CaseTask sbshCaseTask = mapper.selectById(caseAppear.getCaseTaskId()); // 审核通过 if (AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex().equals(caseAppear.getAuditResult())){ // 完成当前上报审核任务 CaseTask sbshCaseTaskPO = new CaseTask(); sbshCaseTaskPO.setId(caseAppear.getCaseTaskId()); sbshCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2); sbshCaseTaskPO.setHandleUnitId(loginUser.getUnitId()); sbshCaseTaskPO.setHandleUnitName(loginUser.getUnitName()); sbshCaseTaskPO.setHandleUserId(loginUser.getId()); sbshCaseTaskPO.setHandleContent(caseAppear.getAuditContent()); sbshCaseTaskPO.setHandleUserName(loginUser.getTrueName()); sbshCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1); sbshCaseTaskPO.setHandleTime(nowDate); sbshCaseTaskPO.setUpdateTime(nowDate); mapper.updateCaseTask(sbshCaseTaskPO); // 完成当前上报审核任务，走待分派任务 FlowNode dfpFlowNode = flowInfoService.completeTask(sbshCaseTask.getFlowableId(), sbshCaseTask.getProcessTaskId(), FlowableConsts.OPERATION_sbsh_ty, userId); // 新建待分派任务 CaseTask dfphCaseTask = new CaseTask(); dfphCaseTask.setId(utilsClient.getNewTimeId()); dfphCaseTask.setCaseId(dfphCaseTask.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); dfphCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1); // 任务处理时限 if (dfpFlowNode.getExpire() != 0) { dfphCaseTask.setExpireTime(DateUtils.addDay(nowDate, dfpFlowNode.getExpire())); } 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(dfphCaseTask.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(caseAppear.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(caseAppear.getAuditContent()); sbshCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_2); sbshCaseTaskPO.setHandleTime(nowDate); sbshCaseTaskPO.setUpdateTime(nowDate); mapper.updateCaseTask(sbshCaseTaskPO); // 完成当前上报审核任务，走待分派任务 FlowNode dfpFlowNode = flowInfoService.completeTask(sbshCaseTask.getFlowableId(), sbshCaseTask.getProcessTaskId(), FlowableConsts.OPERATION_sbsh_bty, userId); // 新建待分派任务 CaseTask dfphCaseTask = new CaseTask(); dfphCaseTask.setId(utilsClient.getNewTimeId()); dfphCaseTask.setCaseId(dfphCaseTask.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(caseAppear.getAppearUnitId()); dfphCaseTask.setCandeUnitName(caseAppear.getAppearUnitName()); // 受理后的任务，不需要签收 dfphCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0); dfphCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1); // 任务处理时限 if (dfpFlowNode.getExpire() != 0) { dfphCaseTask.setExpireTime(DateUtils.addDay(nowDate, dfpFlowNode.getExpire())); } dfphCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0); dfphCaseTask.setCustId(dfphCaseTask.getCustId()); dfphCaseTask.setCreateTime(nowDate); dfphCaseTask.setUpdateTime(nowDate); mapper.insert(dfphCaseTask); } }catch (Exception e){ log.error("[CaseTaskService.webAppearAudit]调用失败，异常信息："+e, e); throw new ServiceException("CaseTaskService.webAppearAudit", e); } }
@@ -13,7 +13,7 @@ /** * 节点 */ FLOW_NODE_ZXSL("ZXSL", "自行受理"), FLOW_NODE_DSL("DSL", "待受理"), FLOW_NODE_BLFK("BLFK", "办理反馈"), FLOW_NODE_JASQ("JASQ", "结案申请"), FLOW_NODE_JASH("JASH", "结案审核"), @@ -100,8 +100,8 @@ */ public static FlowNodeEnum getByIndex(final String index) { switch (index) { case "ZXSL": return FLOW_NODE_ZXSL; case "DSL": return FLOW_NODE_DSL; case "BLFK": return FLOW_NODE_BLFK; case "JASQ": dyh-service/dyh-mediate/src/main/java/cn/huge/module/flow/consts/FlowableConsts.java
@@ -29,7 +29,7 @@ * 自行受理：zxsl * 交办给直属组织：jb_zszz，交办给综治中心：jb_zzzx * 受理：sl * 回退申请：htsq，回退审核同意：htsh_ty，回退审核不同意：htsh_bty * 回退申请：htsq，回退审核同意：htsh_ty，回退审核不同意：htsh_bty，htsh_bty_zj，htsh_bty_qj * 上报：sb，上报审核同意：htsq_ty，上报审核不同意：htsq_bty * 结案审核同意：jash_ty，结案审核不同意：jash_bty，htsh_bty_zj，htsh_bty_qj */ @@ -39,8 +39,8 @@ public static final String OPERATION_htsq = "htsq"; public static final String OPERATION_htsh_ty = "htsh_ty"; public static final String OPERATION_htsh_bty = "htsh_bty"; public static final String OPERATION_htsh_bty_zj = "htsh_bty_zj"; public static final String OPERATION_htsh_bty_qj = "htsh_bty_qj"; public static final String OPERATION_htsh_bty_sj = "htsh_bty_sj"; public static final String OPERATION_sb = "sb"; public static final String OPERATION_sbsh_ty = "sbsh_ty"; public static final String OPERATION_sbsh_bty = "sbsh_bty"; dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LFDJ_3LEVEL_V1.bpmn20.xml
@@ -83,17 +83,11 @@ <sequenceFlow id="sid-8E3D0F8C-693B-4AE9-9D12-A97EC477C082" name="区交办回退审核同意" sourceRef="QJ_HTSH" targetRef="QJ_DFP"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_ty'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-3009265B-2E06-4F4D-9C49-E09F706A8E23" name="区交办区级组织回退审核不同意" sourceRef="QJ_HTSH" targetRef="QJ_DSL"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_bty'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-0553BC77-9DD8-4E22-857A-7ECD4C467398" name="镇街上报审核同意" sourceRef="QJ_SBSH" targetRef="QJ_DFP"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='sbsh_ty'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-E5D28687-1705-499F-B14D-93BE28258667" name="区上报审核不同意" sourceRef="SJ_SBSH" targetRef="QJ_DFP"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='sbsh_bty'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-5A452188-7F4A-4160-A8E1-7426B2E324E5" name="区交办镇街综治中心回退审核不同意" sourceRef="QJ_HTSH" targetRef="ZJ_DFP"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_bty_zj'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-84E57742-F82B-4B9B-A71B-ABF25770A9CC" name="市交办区综治中心回退申请" sourceRef="QJ_DFP" targetRef="SJ_HTSH"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsq'}]]></conditionExpression> @@ -107,12 +101,6 @@ <sequenceFlow id="sid-4CA7C483-75FE-48C0-90C3-7FB895B04DC7" name="区上报" sourceRef="QJ_DFP" targetRef="SJ_SBSH"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='sb'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-04A5C662-116F-469A-B85F-4947C7330970" name="市交办区综治中心回退审核不同意" sourceRef="SJ_HTSH" targetRef="QJ_DFP"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_bty_qj'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-F8079D11-8A61-4AF1-89B4-194FE609610C" name="市交办市级组织回退审核不同意" sourceRef="SJ_HTSH" targetRef="SJ_DSL"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_bty'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-4DC80088-03E0-4790-9A32-5F0361EF0583" name="市交办市级组织回退申请" sourceRef="SJ_DSL" targetRef="SJ_HTSH"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsq'}]]></conditionExpression> </sequenceFlow> @@ -124,6 +112,18 @@ </sequenceFlow> <sequenceFlow id="sid-0B45B4F0-4106-4B5E-A8F4-EFC9832072F8" name="受理" sourceRef="SJ_DFP" targetRef="BLFK"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='sl'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-5A452188-7F4A-4160-A8E1-7426B2E324E5" name="区交办镇街综治中心回退审核不同意" sourceRef="QJ_HTSH" targetRef="ZJ_DFP"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_bty'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-3009265B-2E06-4F4D-9C49-E09F706A8E23" name="区交办区级组织回退审核不同意" sourceRef="QJ_HTSH" targetRef="QJ_DSL"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_bty_qj'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-04A5C662-116F-469A-B85F-4947C7330970" name="市交办区综治中心回退审核不同意" sourceRef="SJ_HTSH" targetRef="QJ_DFP"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_bty'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-F8079D11-8A61-4AF1-89B4-194FE609610C" name="市交办市级组织回退审核不同意" sourceRef="SJ_HTSH" targetRef="SJ_DSL"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_bty_sj'}]]></conditionExpression> </sequenceFlow> </process> <bpmndi:BPMNDiagram id="BPMNDiagram_GZDYH_LFDJ_3LEVEL_V1"> @@ -138,10 +138,10 @@ <omgdc:Bounds height="80.0" width="100.0" x="529.9999853968624" y="29.999998658895528"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="BLFK" id="BPMNShape_BLFK"> <omgdc:Bounds height="80.0" width="99.99999999999977" x="922.4999754503378" y="134.99999597668656"/> <omgdc:Bounds height="80.0" width="99.99999999999977" x="922.4999617040172" y="134.99999597668656"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="JASQ" id="BPMNShape_JASQ"> <omgdc:Bounds height="80.0" width="100.0" x="1067.4999891966586" y="134.99999798834327"/> <omgdc:Bounds height="80.0" width="100.0" x="1064.9999841302636" y="134.99999798834327"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="JASH" id="BPMNShape_JASH"> <omgdc:Bounds height="80.0" width="100.0" x="1212.4999891966586" y="134.99999798834327"/> @@ -150,28 +150,28 @@ <omgdc:Bounds height="80.0" width="100.00000000000009" x="239.999978542329" y="29.999998658895528"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="QJ_SBSH" id="BPMNShape_QJ_SBSH"> <omgdc:Bounds height="80.00000000000006" width="99.99999999999996" x="89.99999731779103" y="459.99998420476953"/> <omgdc:Bounds height="80.00000000000006" width="99.99999999999996" x="89.99999731779106" y="459.9999773502357"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="QJ_DFP" id="BPMNShape_QJ_DFP"> <omgdc:Bounds height="80.00000000000006" width="100.0" x="314.99998591840307" y="459.9999773502357"/> <omgdc:Bounds height="80.00000000000006" width="100.0" x="314.99998591840307" y="459.99997049570203"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="QJ_DSL" id="BPMNShape_QJ_DSL"> <omgdc:Bounds height="80.0" width="100.0" x="539.9999839067463" y="269.9999879300598"/> <omgdc:Bounds height="80.0" width="100.0" x="539.9999758601195" y="269.9999839067465"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="QJ_HTSH" id="BPMNShape_QJ_HTSH"> <omgdc:Bounds height="80.0" width="99.99999999999994" x="314.9999906122686" y="269.9999879300598"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="SJ_SBSH" id="BPMNShape_SJ_SBSH"> <omgdc:Bounds height="80.00000000000011" width="99.99999999999999" x="89.9999986588955" y="689.9999897181989"/> <omgdc:Bounds height="80.00000000000011" width="99.99999999999999" x="89.99999731779103" y="689.9999794363981"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="SJ_DFP" id="BPMNShape_SJ_DFP"> <omgdc:Bounds height="80.00000000000011" width="100.0" x="314.9999906122686" y="689.9999794363981"/> <omgdc:Bounds height="80.00000000000011" width="100.0" x="314.99998591840307" y="689.9999691545975"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="SJ_HTSH" id="BPMNShape_SJ_HTSH"> <omgdc:Bounds height="80.0" width="99.99999999999989" x="624.9999861419203" y="569.9999636411679"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="SJ_DSL" id="BPMNShape_SJ_DSL"> <omgdc:Bounds height="80.0" width="100.0" x="897.4999653175485" y="569.9999551475067"/> <omgdc:Bounds height="80.0" width="100.0" x="897.499951943757" y="569.9999551475067"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="DSRPJ" id="BPMNShape_DSRPJ"> <omgdc:Bounds height="80.0" width="100.0" x="1212.4999728053817" y="279.99999895691855"/> @@ -187,8 +187,8 @@ <omgdi:waypoint x="89.99999731779103" y="174.9999958073552"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-F8079D11-8A61-4AF1-89B4-194FE609610C" id="BPMNEdge_sid-F8079D11-8A61-4AF1-89B4-194FE609610C"> <omgdi:waypoint x="724.9499861417911" y="589.9999635924937"/> <omgdi:waypoint x="897.4999653175485" y="589.9999551937473"/> <omgdi:waypoint x="724.9499861416448" y="589.9999635924936"/> <omgdi:waypoint x="897.499951943757" y="589.9999551937473"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-92A3C4E4-5675-4099-BD6C-E0E0D9742620" id="BPMNEdge_sid-92A3C4E4-5675-4099-BD6C-E0E0D9742620"> <omgdi:waypoint x="1262.499984674927" y="214.94999798834328"/> @@ -199,34 +199,34 @@ <omgdi:waypoint x="189.94999731779103" y="195.62073459326655"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-A06559C9-EAA5-4878-80EE-8E7BE802E321" id="BPMNEdge_sid-A06559C9-EAA5-4878-80EE-8E7BE802E321"> <omgdi:waypoint x="139.9999985196551" y="459.99998420476953"/> <omgdi:waypoint x="139.99999851965512" y="459.9999773502357"/> <omgdi:waypoint x="139.9999973224324" y="214.94999597668658"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-97B79C3A-867D-4057-86E1-58626E22F7E3" id="BPMNEdge_sid-97B79C3A-867D-4057-86E1-58626E22F7E3"> <omgdi:waypoint x="1167.4499891966586" y="174.99999798834327"/> <omgdi:waypoint x="1212.4999891966393" y="174.99999798834327"/> <omgdi:waypoint x="1164.9499841302636" y="174.99999798834327"/> <omgdi:waypoint x="1212.4999891966586" y="174.99999798834327"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-B38ABFCE-C643-449F-8AE3-058FE0997A12" id="BPMNEdge_sid-B38ABFCE-C643-449F-8AE3-058FE0997A12"> <omgdi:waypoint x="1262.4999891966586" y="134.99999798834327"/> <omgdi:waypoint x="1262.4999891966586" y="68.00000020861626"/> <omgdi:waypoint x="972.4999754503377" y="68.00000020861626"/> <omgdi:waypoint x="972.4999754503377" y="134.99999597668656"/> <omgdi:waypoint x="972.4999617040171" y="68.00000020861626"/> <omgdi:waypoint x="972.4999617040171" y="134.99999597668656"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-84E57742-F82B-4B9B-A71B-ABF25770A9CC" id="BPMNEdge_sid-84E57742-F82B-4B9B-A71B-ABF25770A9CC"> <omgdi:waypoint x="367.7237370172767" y="539.9499773502358"/> <omgdi:waypoint x="624.9999861419203" y="629.6513046901603"/> <omgdi:waypoint x="367.723736812224" y="539.9499704957021"/> <omgdi:waypoint x="624.99998614192" y="629.6513046638977"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-7D5F25D3-BFF5-4CCC-BBEE-988340FDBBDC" id="BPMNEdge_sid-7D5F25D3-BFF5-4CCC-BBEE-988340FDBBDC"> <omgdi:waypoint x="539.9999839066169" y="329.99998483066406"/> <omgdi:waypoint x="414.9499906122686" y="329.99998790547113"/> <omgdi:waypoint x="539.9999758599869" y="329.9999817312685"/> <omgdi:waypoint x="414.9499906122686" y="329.9999878808825"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-3009265B-2E06-4F4D-9C49-E09F706A8E23" id="BPMNEdge_sid-3009265B-2E06-4F4D-9C49-E09F706A8E23"> <omgdi:waypoint x="414.9499906122686" y="289.9999879300598"/> <omgdi:waypoint x="539.9999839066215" y="289.9999879300598"/> <omgdi:waypoint x="414.9499899904659" y="289.99998789838014"/> <omgdi:waypoint x="539.9999758601195" y="289.9999839368421"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-0DE15696-ADC0-4E8B-A261-B5B5645FF355" id="BPMNEdge_sid-0DE15696-ADC0-4E8B-A261-B5B5645FF355"> <omgdi:waypoint x="339.9999903617707" y="689.9999794363981"/> <omgdi:waypoint x="339.999990165234" y="540.6698992893806"/> <omgdi:waypoint x="339.9999862331806" y="689.9999691545975"/> <omgdi:waypoint x="339.999990165234" y="540.6698924348469"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-27E60A97-AC85-4978-AC3F-3D1A52A2B3A8" id="BPMNEdge_sid-27E60A97-AC85-4978-AC3F-3D1A52A2B3A8"> <omgdi:waypoint x="1262.4999674899245" y="359.94999895691853"/> @@ -237,76 +237,76 @@ <omgdi:waypoint x="1262.4999686641738" y="564.9999905377625"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-C180B358-6A35-4378-8CA9-5BAB85FE89F4" id="BPMNEdge_sid-C180B358-6A35-4378-8CA9-5BAB85FE89F4"> <omgdi:waypoint x="189.94999724572128" y="729.9999874333544"/> <omgdi:waypoint x="314.99998880685246" y="729.9999817189581"/> <omgdi:waypoint x="189.94999731740805" y="729.9999771515533"/> <omgdi:waypoint x="314.9999859179656" y="729.9999714371572"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-6F8353BD-DBF4-405E-9CAD-B2CFFD70804C" id="BPMNEdge_sid-6F8353BD-DBF4-405E-9CAD-B2CFFD70804C"> <omgdi:waypoint x="337.0279577189482" y="459.9999773502357"/> <omgdi:waypoint x="165.6643329875281" y="214.94999597668658"/> <omgdi:waypoint x="337.0279570485453" y="459.99997049570203"/> <omgdi:waypoint x="165.66433300345017" y="214.94999597668658"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-BB5A459C-B054-420A-923C-066CEB37F080" id="BPMNEdge_sid-BB5A459C-B054-420A-923C-066CEB37F080"> <omgdi:waypoint x="639.9499839067461" y="292.35292976823126"/> <omgdi:waypoint x="922.4999754503378" y="192.62940708035316"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-04A5C662-116F-469A-B85F-4947C7330970" id="BPMNEdge_sid-04A5C662-116F-469A-B85F-4947C7330970"> <omgdi:waypoint x="624.9999861419201" y="592.2580303812292"/> <omgdi:waypoint x="414.94998591840306" y="517.7241686769145"/> <omgdi:waypoint x="639.9499758601194" y="292.3529260078797"/> <omgdi:waypoint x="922.4999617040171" y="192.62940681765448"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-E51C86AA-C90E-4CB1-8D6E-776DADCBFE49" id="BPMNEdge_sid-E51C86AA-C90E-4CB1-8D6E-776DADCBFE49"> <omgdi:waypoint x="414.94999061226815" y="722.1286382139056"/> <omgdi:waypoint x="897.4999653175482" y="646.1623280576964"/> <omgdi:waypoint x="414.94998591840243" y="722.1286287571146"/> <omgdi:waypoint x="897.4999519437561" y="646.1623279295275"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-04A5C662-116F-469A-B85F-4947C7330970" id="BPMNEdge_sid-04A5C662-116F-469A-B85F-4947C7330970"> <omgdi:waypoint x="624.9999861419201" y="592.2580292756593"/> <omgdi:waypoint x="414.9499859184029" y="517.7241629268451"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-8719B46B-46EE-4612-95D2-3BEF182D783A" id="BPMNEdge_sid-8719B46B-46EE-4612-95D2-3BEF182D783A"> <omgdi:waypoint x="414.9499859180182" y="499.9999773502358"/> <omgdi:waypoint x="947.4999754503378" y="499.9999773502358"/> <omgdi:waypoint x="947.4999754503378" y="214.94999597668658"/> <omgdi:waypoint x="414.9499859178056" y="499.9999704957021"/> <omgdi:waypoint x="947.4999617040171" y="499.9999704957021"/> <omgdi:waypoint x="947.4999617040171" y="214.94999597668658"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-13C1AC7D-ACE2-45AE-8B02-D9A6E5ADF777" id="BPMNEdge_sid-13C1AC7D-ACE2-45AE-8B02-D9A6E5ADF777"> <omgdi:waypoint x="1022.4499754503375" y="174.99999666966758"/> <omgdi:waypoint x="1067.4999891966297" y="174.99999729466862"/> <omgdi:waypoint x="1022.4499608251098" y="174.99999668182505"/> <omgdi:waypoint x="1064.9999841302545" y="174.99999728249892"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-E5D28687-1705-499F-B14D-93BE28258667" id="BPMNEdge_sid-E5D28687-1705-499F-B14D-93BE28258667"> <omgdi:waypoint x="177.67079992478847" y="689.9999897181989"/> <omgdi:waypoint x="319.1602666546586" y="539.9499773502358"/> <omgdi:waypoint x="177.6707995205303" y="689.9999794363981"/> <omgdi:waypoint x="319.1602665374066" y="539.9499704957021"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-0B45B4F0-4106-4B5E-A8F4-EFC9832072F8" id="BPMNEdge_sid-0B45B4F0-4106-4B5E-A8F4-EFC9832072F8"> <omgdi:waypoint x="414.9499906111769" y="749.9999794363982"/> <omgdi:waypoint x="1021.4999754503376" y="749.9999794363982"/> <omgdi:waypoint x="1021.4999754503376" y="214.94999597668658"/> <omgdi:waypoint x="414.94998591697043" y="749.9999691545976"/> <omgdi:waypoint x="1021.4999617040171" y="749.9999691545976"/> <omgdi:waypoint x="1021.499961704017" y="214.94999597668658"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-A8908233-78BC-453D-B685-D4482C4A844D" id="BPMNEdge_sid-A8908233-78BC-453D-B685-D4482C4A844D"> <omgdi:waypoint x="529.9999853968442" y="49.99999865889553"/> <omgdi:waypoint x="339.9499785422963" y="49.99999865889553"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-4CA7C483-75FE-48C0-90C3-7FB895B04DC7" id="BPMNEdge_sid-4CA7C483-75FE-48C0-90C3-7FB895B04DC7"> <omgdi:waypoint x="314.99998591840307" y="520.8081864151441"/> <omgdi:waypoint x="116.11666517401628" y="689.9999897181989"/> <omgdi:waypoint x="314.99998591840307" y="520.8081795390193"/> <omgdi:waypoint x="116.11666386274314" y="689.9999794363981"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-080C79C3-4D90-407B-8451-F88A2C4D9F7A" id="BPMNEdge_sid-080C79C3-4D90-407B-8451-F88A2C4D9F7A"> <omgdi:waypoint x="645.1884919069653" y="649.9499636411679"/> <omgdi:waypoint x="414.94999061226855" y="697.8413389092494"/> <omgdi:waypoint x="645.1884908582078" y="649.9499636411679"/> <omgdi:waypoint x="414.9499859184025" y="697.8413292388901"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-9E45208D-BE9B-4656-887D-DD5B989C8072" id="BPMNEdge_sid-9E45208D-BE9B-4656-887D-DD5B989C8072"> <omgdi:waypoint x="414.94998591840306" y="479.9999773502357"/> <omgdi:waypoint x="589.9999839067463" y="479.9999773502357"/> <omgdi:waypoint x="589.9999839067463" y="349.9499879300598"/> <omgdi:waypoint x="414.94998591840306" y="479.99997049570203"/> <omgdi:waypoint x="589.9999758601195" y="479.99997049570203"/> <omgdi:waypoint x="589.9999758601195" y="349.9499839067465"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-D4784E91-83A1-4B03-8A65-218763D689D9" id="BPMNEdge_sid-D4784E91-83A1-4B03-8A65-218763D689D9"> <omgdi:waypoint x="629.9499853968623" y="69.99999865889552"/> <omgdi:waypoint x="947.4999754503378" y="69.99999865889552"/> <omgdi:waypoint x="947.4999754503378" y="134.99999597668656"/> <omgdi:waypoint x="629.9499853968215" y="69.99999865889552"/> <omgdi:waypoint x="947.4999617040171" y="69.99999865889552"/> <omgdi:waypoint x="947.4999617040171" y="134.99999597668656"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-4DC80088-03E0-4790-9A32-5F0361EF0583" id="BPMNEdge_sid-4DC80088-03E0-4790-9A32-5F0361EF0583"> <omgdi:waypoint x="897.4999653170802" y="629.9999551937474"/> <omgdi:waypoint x="724.9499830196238" y="629.9999635924936"/> <omgdi:waypoint x="897.499951943757" y="629.9999551937474"/> <omgdi:waypoint x="724.9499852824806" y="629.9999635924935"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-4E2FBB65-5E57-4536-8F84-A754A1E0A546" id="BPMNEdge_sid-4E2FBB65-5E57-4536-8F84-A754A1E0A546"> <omgdi:waypoint x="972.4999653418569" y="569.9999551475067"/> <omgdi:waypoint x="972.4999744268235" y="214.94999597668658"/> <omgdi:waypoint x="972.4999519671717" y="569.9999551475067"/> <omgdi:waypoint x="972.4999607181321" y="214.94999597668658"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-8E3D0F8C-693B-4AE9-9D12-A97EC477C082" id="BPMNEdge_sid-8E3D0F8C-693B-4AE9-9D12-A97EC477C082"> <omgdi:waypoint x="364.9999896240863" y="349.9499879300598"/> <omgdi:waypoint x="364.9999869053501" y="459.9999773502357"/> <omgdi:waypoint x="364.99998962408625" y="349.9499879300598"/> <omgdi:waypoint x="364.9999869053501" y="459.99997049570203"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-B4976622-2E0D-4FB5-8DDC-077B9B556183" id="BPMNEdge_sid-B4976622-2E0D-4FB5-8DDC-077B9B556183"> <omgdi:waypoint x="186.64687813794717" y="214.94999597668658"/> @@ -328,15 +328,15 @@ </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-8A779264-9E58-495C-A1E3-118D4099F5FB" id="BPMNEdge_sid-8A779264-9E58-495C-A1E3-118D4099F5FB"> <omgdi:waypoint x="114.99999731779104" y="214.94999597668658"/> <omgdi:waypoint x="114.99999731779101" y="459.99998420476953"/> <omgdi:waypoint x="114.99999731779104" y="459.9999773502357"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-A4FC5FA9-BF8D-473C-A082-3C57FE12D4F8" id="BPMNEdge_sid-A4FC5FA9-BF8D-473C-A082-3C57FE12D4F8"> <omgdi:waypoint x="189.94999731771603" y="174.99999597668656"/> <omgdi:waypoint x="922.499975450157" y="174.99999597668656"/> <omgdi:waypoint x="189.94999731779103" y="174.99999597668656"/> <omgdi:waypoint x="922.4999617040172" y="174.99999597668656"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-0553BC77-9DD8-4E22-857A-7ECD4C467398" id="BPMNEdge_sid-0553BC77-9DD8-4E22-857A-7ECD4C467398"> <omgdi:waypoint x="189.94999731779097" y="499.99998268153973"/> <omgdi:waypoint x="314.99998591792496" y="499.99997887194235"/> <omgdi:waypoint x="189.94999731779103" y="499.9999758270059"/> <omgdi:waypoint x="314.99998591840307" y="499.9999720174086"/> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml
@@ -3,7 +3,6 @@ <process id="GZDYH_ZXSL_3LEVEL_V1" name="GZDYH_ZXSL_3LEVEL_V1" isExecutable="true"> <documentation>GZDYH_ZXSL_3LEVEL_V1</documentation> <startEvent id="ZXSL_START" name="开始"/> <userTask id="ZXSL" name="自行受理"/> <userTask id="BLFK" name="办理反馈"/> <userTask id="DSRPJ" name="当事人评价"/> <userTask id="JAGD" name="结案归档"/> @@ -12,10 +11,6 @@ <userTask id="JASQ" name="结案申请"/> <sequenceFlow id="sid-03DCE158-DCD9-4C4F-803A-FA2795072196" name="结案审核不同意不同意" sourceRef="JASH" targetRef="BLFK"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='jash_bty'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" sourceRef="ZXSL_START" targetRef="ZXSL"/> <sequenceFlow id="sid-6032A3F4-92DC-4CFE-BCE7-404BB56C66C5" name="通过" sourceRef="ZXSL" targetRef="BLFK"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-A0580378-38E0-44D8-981B-9D048ED42E97" name="通过" sourceRef="BLFK" targetRef="JASQ"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression> @@ -30,14 +25,12 @@ <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression> </sequenceFlow> <sequenceFlow id="sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5" sourceRef="JAGD" targetRef="ZXSL_END"/> <sequenceFlow id="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" sourceRef="ZXSL_START" targetRef="BLFK"/> </process> <bpmndi:BPMNDiagram id="BPMNDiagram_GZDYH_ZXSL_3LEVEL_V1"> <bpmndi:BPMNPlane bpmnElement="GZDYH_ZXSL_3LEVEL_V1" id="BPMNPlane_GZDYH_ZXSL_3LEVEL_V1"> <bpmndi:BPMNShape bpmnElement="ZXSL_START" id="BPMNShape_ZXSL_START"> <omgdc:Bounds height="30.0" width="30.0" x="75.0" y="160.00001244246837"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="ZXSL" id="BPMNShape_ZXSL"> <omgdc:Bounds height="80.0" width="99.99999999999997" x="150.0" y="134.99998591840347"/> <omgdc:Bounds height="30.0" width="30.0" x="195.0" y="160.00001244246837"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape bpmnElement="BLFK" id="BPMNShape_BLFK"> <omgdc:Bounds height="80.0" width="100.0" x="314.9999953061343" y="134.99999798834327"/> @@ -64,8 +57,8 @@ <omgdi:waypoint x="389.9999953061343" y="134.99999798834327"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" id="BPMNEdge_sid-E2A63ACD-76CD-4419-A771-C082334A3A11"> <omgdi:waypoint x="104.94999849155933" y="175.00000882555042"/> <omgdi:waypoint x="150.0" y="174.99999796274022"/> <omgdi:waypoint x="224.94999837483869" y="175.00001039707323"/> <omgdi:waypoint x="314.9999950161384" y="174.99999811788496"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-A0580378-38E0-44D8-981B-9D048ED42E97" id="BPMNEdge_sid-A0580378-38E0-44D8-981B-9D048ED42E97"> <omgdi:waypoint x="414.94999530600165" y="174.9999943307857"/> @@ -78,10 +71,6 @@ <bpmndi:BPMNEdge bpmnElement="sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5" id="BPMNEdge_sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5"> <omgdi:waypoint x="1059.9499856948855" y="175.00000415177684"/> <omgdi:waypoint x="1109.999983378599" y="175.0000103275493"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-6032A3F4-92DC-4CFE-BCE7-404BB56C66C5" id="BPMNEdge_sid-6032A3F4-92DC-4CFE-BCE7-404BB56C66C5"> <omgdi:waypoint x="249.94999986861848" y="174.99998957230352"/> <omgdi:waypoint x="314.9999953060815" y="174.99999433078568"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge bpmnElement="sid-15046AD2-218B-4567-B05A-26B2D0069DE2" id="BPMNEdge_sid-15046AD2-218B-4567-B05A-26B2D0069DE2"> <omgdi:waypoint x="894.9499881534662" y="174.99999798834327"/>
