From b60ecf40efa981d8731497d6eeb9b8b3005ecf1d Mon Sep 17 00:00:00 2001 From: liyj <15602261488@163.com> Date: Thu, 10 Oct 2024 10:22:19 +0800 Subject: [PATCH] 1、自行排查的来访方式显示错误修复 --- dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java | 205 +++++++-------------------------------------------- 1 files changed, 29 insertions(+), 176 deletions(-) diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java index cc1c79e..b7fb04f 100644 --- a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java +++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java @@ -1,8 +1,8 @@ package cn.huge.module.mediate.constant; /** - * @title: 调解相关常量枚举类 - * @description: 调解相关常量枚举类 + * @title: 纠纷信息相关常量枚举类 + * @description: 纠纷信息相关常量枚举类 * @company: hugeinfo * @author: liyj * @time: 2021-11-05 16:51:48 @@ -11,51 +11,27 @@ public enum CaseBaseConstsEnum { /** - * 纠纷来源,22_00036-1:地方政府委托移送,22_00036-2:依申请调解,22_00036-3:主动调解,22_00036-4:法援委托移送, - * 22_00036-5:检察院委托移送,22_00036-6:公安机关委托移送,22_00036-7:信访记录委托移送,22_00036-8:劳动站移交, - * 22_00036-9:派出所移交,22_00036-10:其他部门委托移送 + * 事项来源,22_00001-1:大厅来访,22_00001-2:线上来访,22_00001-3:自行排查,22_00001-4:协同推送 */ - CASE_SOURCE_1("22_00036-1", "地方政府委托移送"), - CASE_SOURCE_2("22_00036-2", "依申请调解"), - CASE_SOURCE_3("22_00036-3", "主动调解"), - CASE_SOURCE_4("22_00036-4", "法援委托移送"), - CASE_SOURCE_5("22_00036-5", "检察院委托移送"), - CASE_SOURCE_6("22_00036-6", "公安机关委托移送"), - CASE_SOURCE_7("22_00036-7", "信访记录委托移送"), - CASE_SOURCE_8("22_00036-8", "劳动站移交"), - CASE_SOURCE_9("22_00036-9", "派出所移交"), - CASE_SOURCE_10("22_00036-10", "其他部门委托移送"), - CASE_SOURCE_11("22_00036-11", "接受委托移送调解"), + CASE_CANAL_1("22_00001-1", "大厅来访"), + CASE_CANAL_2("22_00001-2", "线上来访"), + CASE_CANAL_3("22_00001-3", "自行排查"), + CASE_CANAL_4("22_00001-4", "协同推送"), /** - * 申请渠道,22_00001-1:机构登记,22_00001-2:小程序,22_00001-3:其他渠道,22_00001-4:市人民调解系统,22_00001-5:网格联动 + * 来访形式,24_00002-1:来访,24_00002-2:线上,24_00002-3:排查 */ - CASE_CANAL_1("22_00001-1", "机构登记"), - CASE_CANAL_2("22_00001-2", "小程序"), - CASE_CANAL_3("22_00001-3", "其他"), - CASE_CANAL_4("22_00001-4", "市人民调解系统"), - CASE_CANAL_5("22_00001-5", "网格联动"), - - /** - * 签收意见,22_00010-1:同意签收,22_00010-2:拒绝签收 - */ - SIGN_RESULT_1("22_00010-1", "签收受理"), - SIGN_RESULT_2("22_00010-2", "拒绝签收"), - - /** - * 纠纷审查结果,22_00037-1:签收受理,22_00037-2:拒绝签收,22_00037-3:退回申请人,22_00037-4:不予受理 - */ - AUDIT_RESULT_1("22_00037-1", "签收受理"), - AUDIT_RESULT_2("22_00037-2", "拒绝签收"), - AUDIT_RESULT_3("22_00037-3", "退回申请人"), - AUDIT_RESULT_4("22_00037-3", "不予受理"), + VISIT_WAY_1("24_00002-1", "来访"), + VISIT_WAY_2("24_00002-2", "线上"), + VISIT_WAY_3("24_00002-3", "排查"), /** * 当事人地位 */ - PERSON_TYPE_1("15_020008-1", "申请人"), - PERSON_TYPE_2("15_020008-2", "被申请人"), - PERSON_TYPE_5("15_020008-5", "第三人"), + PERSON_TYPE_1("15_020008-1", "申请方当事人"), + PERSON_TYPE_2("15_020008-2", "被申请方当事人"), + PERSON_TYPE_3("24_00006-1", "申请方代理人"), + PERSON_TYPE_4("24_00006-2", "被申请方代理人"), /** * 当事人类型类型 @@ -91,60 +67,8 @@ CARD_TYPE_14("09_00015-14", "港澳居民来往内陆通行证"), CARD_TYPE_16("09_00015-16", "台湾居民来往大陆通行证"), CARD_TYPE_255("09_00015-255", "其他"), - CARD_TYPE_17("09_00015-17", "当事人未提供证件信息"), + CARD_TYPE_17("09_00015-17", "当事人未提供证件信息"); - /** - * 纠纷进度,22_00006-1:待受理,22_00006-2:待调解,22_00006-3:调解中,22_00006-4:调解结束,22_00006-5:退回申请人,22_00006-6:不予受理,22_00006-7:申请人撤回 - */ - CASE_PROCESS_1("22_00006-1", "待受理"), - CASE_PROCESS_2("22_00006-2", "待调解"), - CASE_PROCESS_3("22_00006-3", "调解中"), - CASE_PROCESS_4("22_00006-4", "调解结束"), - CASE_PROCESS_5("22_00006-5", "退回申请人"), - CASE_PROCESS_6("22_00006-6", "不予受理"), - CASE_PROCESS_7("22_00006-7", "申请人撤回"), - - /** - * 调解结果 - */ - MEDI_RESULT_1("22_00025-1", "调解成功"), - MEDI_RESULT_2("22_00025-2", "调解不成功"), - - /** - * 履行情况,22_00008-1:未履行,22_00008-2:当场履行,22_00008-3:分期履行 - */ - FULFIL_STATUS_1("22_00008-1", "未履行"), - FULFIL_STATUS_2("22_00008-2", "当场履行"), - FULFIL_STATUS_3("22_00008-3", "分期履行"), - - /** - * 调解不成功原因,22_00019-1:当事人未能就调解协议达成一致,22_00019-2:当事人拒绝调解,22_00019-3:提前终止调解,22_00019-9:其他 - */ - MEDI_FALSE_1("22_00019-1", "当事人未能就调解协议达成一致"), - MEDI_FALSE_2("22_00019-2", "当事人拒绝调解"), - MEDI_FALSE_3("22_00019-3", "提前终止调解"), - MEDI_FALSE_4("22_00019-4", "当事人撤销调解请求"), - MEDI_FALSE_9("22_00019-9", "其他"), - - /** - * 司法确认申请情况 - */ - JUDGE_APPLY_1("1", "未申请"), - JUDGE_APPLY_2("2", "已申请"), - - /** - * 归档状态 - */ - CASE_FILE_STATUS_1("1", "未归档"), - CASE_FILE_STATUS_2("2", "已归档"), - - /** - * 调解类型 - */ - MEDI_TYPE_1("22_00002-1", "人民调解"), - MEDI_TYPE_2("22_00002-2", "司法调解"), - MEDI_TYPE_3("22_00002-3", "诉讼调解"), - MEDI_TYPE_4("22_00002-4", "行政调解"); /** * 代码编号 @@ -211,93 +135,22 @@ } /** - * 静态方法4 - * @param index + * 静态方法 + * @param canal * @return */ - public static String getCaseWxProcess(String index) { - // 微信纠纷进度,1:待受理,2:待调解,3:调解中,4:调解结束,5:退回申请人,6:不予受理,7:申请人撤回 - String WX_PROCESS_1 = "1"; - String WX_PROCESS_2 = "2"; - String WX_PROCESS_3 = "3"; - String WX_PROCESS_4 = "4"; - String WX_PROCESS_5 = "5"; - String WX_PROCESS_6 = "6"; - String WX_PROCESS_7 = "7"; - if (CASE_PROCESS_1.index.equals(index)){ - return WX_PROCESS_1; + public static CaseBaseConstsEnum getVisitWayByCanal(String canal) { + if (CASE_CANAL_1.getIndex().equals(canal)) { + return VISIT_WAY_1; + }else if (CASE_CANAL_2.getIndex().equals(canal)) { + return VISIT_WAY_2; + }else if (CASE_CANAL_3.getIndex().equals(canal)) { + return VISIT_WAY_3; + }else if (CASE_CANAL_4.getIndex().equals(canal)) { + return VISIT_WAY_3; + }else { + return null; } - if (CASE_PROCESS_2.index.equals(index)){ - return WX_PROCESS_2; - } - if (CASE_PROCESS_3.index.equals(index)){ - return WX_PROCESS_3; - } - if (CASE_PROCESS_4.index.equals(index)){ - return WX_PROCESS_4; - } - if (CASE_PROCESS_5.index.equals(index)){ - return WX_PROCESS_5; - } - if (CASE_PROCESS_6.index.equals(index)){ - return WX_PROCESS_6; - } - if (CASE_PROCESS_7.index.equals(index)){ - return WX_PROCESS_7; - } - return null; } - /** - * 静态方法4 - * @param index - * @return - */ - public static String getCaseProcess(String index) { - // 微信纠纷进度,1:待受理,2:待调解,3:调解中,4:调解结束,5:退回申请人,6:不予受理,7:申请人撤回 - String WX_PROCESS_1 = "1"; - String WX_PROCESS_2 = "2"; - String WX_PROCESS_3 = "3"; - String WX_PROCESS_4 = "4"; - String WX_PROCESS_5 = "5"; - String WX_PROCESS_6 = "6"; - String WX_PROCESS_7 = "7"; - if (WX_PROCESS_1.equals(index)){ - return CASE_PROCESS_1.index; - } - if (WX_PROCESS_2.equals(index)){ - return CASE_PROCESS_2.index; - } - if (WX_PROCESS_3.equals(index)){ - return CASE_PROCESS_3.index; - } - if (WX_PROCESS_4.equals(index)){ - return CASE_PROCESS_4.index; - } - if (WX_PROCESS_5.equals(index)){ - return CASE_PROCESS_5.index; - } - if (WX_PROCESS_6.equals(index)){ - return CASE_PROCESS_6.index; - } - if (WX_PROCESS_7.equals(index)){ - return CASE_PROCESS_7.index; - } - return null; - } - - /** - * 静态方法4 - * @param index - * @return - */ - public static String getFileStatusDes(String index) { - if (CASE_FILE_STATUS_1.index.equals(index)){ - return CASE_FILE_STATUS_1.des; - } - if (CASE_FILE_STATUS_2.index.equals(index)){ - return CASE_FILE_STATUS_2.des; - } - return null; - } } -- Gitblit v1.8.0