From 25cf02be9f813de87bc1e43c18a6ba057602c512 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Mon, 09 Sep 2024 11:14:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/backEnd/gz-dyh
---
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/AuditBaseConstsEnum.java | 84 ++++++
dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java | 3
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfoUnfold.java | 8
dyh-service/dyh-base/src/main/java/cn/huge/module/disp/dto/CaseDispBaseDTO.java | 10
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/MediResultBaseConstsEnum.java | 84 ++++++
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/AuditBaseConsts.java | 40 +++
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseProcessBaseConstsEnum.java | 88 ++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 6
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileBaseConsts.java | 28 --
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java | 4
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseStatusBaseConstsEnum.java | 89 ++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/consts/CaseTaskConsts.java | 75 +++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java | 14
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java | 12
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java | 14
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java | 2
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java | 114 ++++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml | 6
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/SyTimeEnum.java | 49 ---
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java | 5
20 files changed, 621 insertions(+), 114 deletions(-)
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java
index 4df6c42..7a2a991 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java
@@ -68,8 +68,9 @@
*/
/**
- * 组织级别，1：市级，2：区级，3：镇街级，4：村居级
+ * 组织级别，0：政法委，1：市级，2：区级，3：镇街级，4：村居级
*/
+ public static final int UNIT_GRADE_0 = 0;
public static final int UNIT_GRADE_1 = 1;
public static final int UNIT_GRADE_2 = 2;
public static final int UNIT_GRADE_3 = 3;
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/disp/dto/CaseDispBaseDTO.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/disp/dto/CaseDispBaseDTO.java
index 437802f..037e953 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/disp/dto/CaseDispBaseDTO.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/disp/dto/CaseDispBaseDTO.java
@@ -90,6 +90,16 @@
private String targetName;
/**
+ * 调度目标组织级别，1：市级，2：区级，3：镇街级，4：村居级
+ */
+ private Integer targetUnitGrade;
+
+ /**
+ * 调度目标组织类型，0：政法委，1：综治中心，2：直属部门，3：法院，4：行专业调委会，5：企事业调委会，6：演示测试，9：其他
+ */
+ private Integer targetUnitType;
+
+ /**
* 调度时间
*/
private Date dispTime;
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/AuditBaseConsts.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/AuditBaseConsts.java
new file mode 100644
index 0000000..5c25dab
--- /dev/null
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/AuditBaseConsts.java
@@ -0,0 +1,40 @@
+package cn.huge.module.mediate.constant;
+
+/**
+ * @title: 通用审核相关常量类
+ * @description: 通用审核相关常量类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public class AuditBaseConsts {
+
+ /**
+ * 通用审核状态，0：未审核，1：已审核
+ */
+ public static final int AUDIT_STATUS_0 = 0;
+ public static final int AUDIT_STATUS_1 = 1;
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/AuditBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/AuditBaseConstsEnum.java
new file mode 100644
index 0000000..f2d062d
--- /dev/null
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/AuditBaseConstsEnum.java
@@ -0,0 +1,84 @@
+package cn.huge.module.mediate.constant;
+
+/**
+ * @title: 通用审核相关常量枚举类
+ * @description: 通用审核相关常量枚举类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public enum AuditBaseConstsEnum {
+
+ /**
+ * 通用审核结果，1：审核同意，2：审核不同意
+ */
+ AUDIT_RESULT_1("24_00004-1", "同意"),
+ AUDIT_RESULT_2("24_00004-2", "不同意");
+
+
+ /**
+ * 代码编号
+ */
+ private String index;
+
+ /**
+ * 描述
+ */
+ private String des;
+
+ public String getIndex() {
+ return index;
+ }
+
+ public void setIndex(String index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String desc) {
+ this.des = desc;
+ }
+
+ /**
+ * 构造方法
+ * @param index
+ * @param des
+ */
+ AuditBaseConstsEnum(String index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(String index) {
+ for (AuditBaseConstsEnum constantEnum : AuditBaseConstsEnum.values()) {
+ if (constantEnum.getIndex().equals(index)) {
+ return constantEnum.des;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法
+ * @param des
+ * @return
+ */
+ public static String getIndex(String des) {
+ for (AuditBaseConstsEnum constantEnum : AuditBaseConstsEnum.values()) {
+ if (constantEnum.getDes().equals(des)) {
+ return constantEnum.index;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java
index c7dc585..59f3087 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.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
@@ -17,10 +17,14 @@
public static final int INPUT_WAY_2 = 2;
/**
- * 登记方式，1：审核同意，2：审核不同意
+ * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
*/
- public static final String AUDIT_RESULT_1 = "24_00004-1";
- public static final String AUDIT_RESULT_2 = "24_00004-2";
+ public static final int CASE_STATUS_1 = 1;
+ public static final int CASE_STATUS_2 = 2;
+ public static final int CASE_STATUS_3 = 3;
+ public static final int CASE_STATUS_4 = 4;
+ public static final int CASE_STATUS_5 = 5;
+ public static final int CASE_STATUS_6 = 6;
}
/**
* -------------------_ooOoo_-------------------
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 4993ed2..3468a2f 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
@@ -58,13 +58,7 @@
CARD_TYPE_14("09_00015-14", "港澳居民来往内陆通行证"),
CARD_TYPE_16("09_00015-16", "台湾居民来往大陆通行证"),
CARD_TYPE_255("09_00015-255", "其他"),
- CARD_TYPE_17("09_00015-17", "当事人未提供证件信息"),
-
- /**
- * 调解结果
- */
- MEDI_RESULT_1("22_00025-1", "调解成功"),
- MEDI_RESULT_2("22_00025-2", "调解不成功");
+ CARD_TYPE_17("09_00015-17", "当事人未提供证件信息");
/**
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java
new file mode 100644
index 0000000..3f6fcc1
--- /dev/null
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java
@@ -0,0 +1,114 @@
+package cn.huge.module.mediate.constant;
+
+/**
+ * @title: 事项进度常量枚举类
+ * @description: 事项进度常量枚举类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public enum CaseInfoProcessBaseConstsEnum {
+
+ /**
+ * 对外展示事项进度，1：待受理，2：办理中，3：已结案
+ */
+ CASE_INFO_PROCESS_1(1, "待受理"),
+ CASE_INFO_PROCESS_2(2, "办理中"),
+ CASE_INFO_PROCESS_3(3, "已结案");
+
+
+ /**
+ * 代码编号
+ */
+ private int index;
+
+ /**
+ * 描述
+ */
+ private String des;
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String desc) {
+ this.des = desc;
+ }
+
+ /**
+ * 构造方法
+ * @param index
+ * @param des
+ */
+ CaseInfoProcessBaseConstsEnum(int index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(int index) {
+ for (CaseInfoProcessBaseConstsEnum constantEnum : CaseInfoProcessBaseConstsEnum.values()) {
+ if (constantEnum.getIndex() == index) {
+ return constantEnum.des;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法
+ * @param des
+ * @return
+ */
+ public static int getIndex(String des) {
+ for (CaseInfoProcessBaseConstsEnum constantEnum : CaseInfoProcessBaseConstsEnum.values()) {
+ if (constantEnum.getDes().equals(des)) {
+ return constantEnum.index;
+ }
+ }
+ return 0;
+ }
+
+ /**
+ * 根据事项进度获取对外展示事项进度
+ * @param caseProcess 事项进度
+ * @return
+ */
+ public static CaseInfoProcessBaseConstsEnum getByProcess(int caseProcess) {
+ if (CaseProcessBaseConstsEnum.CASE_PROCESS_1.getIndex() == caseProcess){
+ return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_1;
+
+ }else if (CaseProcessBaseConstsEnum.CASE_PROCESS_2.getIndex() == caseProcess){
+ return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_1;
+
+ }if (CaseProcessBaseConstsEnum.CASE_PROCESS_3.getIndex() == caseProcess){
+ return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2;
+
+ }if (CaseProcessBaseConstsEnum.CASE_PROCESS_4.getIndex() == caseProcess){
+ return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2;
+
+ }if (CaseProcessBaseConstsEnum.CASE_PROCESS_5.getIndex() == caseProcess){
+ return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_3;
+
+ }if (CaseProcessBaseConstsEnum.CASE_PROCESS_6.getIndex() == caseProcess){
+ return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_3;
+
+ }else {
+ return null;
+ }
+ }
+
+}
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseProcessBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseProcessBaseConstsEnum.java
new file mode 100644
index 0000000..7c50ae0
--- /dev/null
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseProcessBaseConstsEnum.java
@@ -0,0 +1,88 @@
+package cn.huge.module.mediate.constant;
+
+/**
+ * @title: 事项进度常量枚举类
+ * @description: 事项进度常量枚举类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public enum CaseProcessBaseConstsEnum {
+
+ /**
+ * 事项进度，1：来访登记，2：事件流转，3：办理反馈，4：结案审核，5：当事人评价，6：结案归档
+ */
+ CASE_PROCESS_1(1, "来访登记"),
+ CASE_PROCESS_2(2, "事件流转"),
+ CASE_PROCESS_3(3, "办理反馈"),
+ CASE_PROCESS_4(4, "结案审核"),
+ CASE_PROCESS_5(5, "当事人评价"),
+ CASE_PROCESS_6(6, "结案归档");
+
+
+ /**
+ * 代码编号
+ */
+ private int index;
+
+ /**
+ * 描述
+ */
+ private String des;
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String desc) {
+ this.des = desc;
+ }
+
+ /**
+ * 构造方法
+ * @param index
+ * @param des
+ */
+ CaseProcessBaseConstsEnum(int index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(int index) {
+ for (CaseProcessBaseConstsEnum constantEnum : CaseProcessBaseConstsEnum.values()) {
+ if (constantEnum.getIndex() == index) {
+ return constantEnum.des;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法
+ * @param des
+ * @return
+ */
+ public static int getIndex(String des) {
+ for (CaseProcessBaseConstsEnum constantEnum : CaseProcessBaseConstsEnum.values()) {
+ if (constantEnum.getDes().equals(des)) {
+ return constantEnum.index;
+ }
+ }
+ return 0;
+ }
+
+}
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseStatusBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseStatusBaseConstsEnum.java
new file mode 100644
index 0000000..296c388
--- /dev/null
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseStatusBaseConstsEnum.java
@@ -0,0 +1,89 @@
+package cn.huge.module.mediate.constant;
+
+/**
+ * @title: 事项状态常量枚举类
+ * @description: 事项状态常量枚举类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public enum CaseStatusBaseConstsEnum {
+
+ /**
+ * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
+ */
+ CASE_STATUS_1(1, "待分派"),
+ CASE_STATUS_2(2, "待签收"),
+ CASE_STATUS_3(3, "待受理"),
+ CASE_STATUS_4(4, "办理中"),
+ CASE_STATUS_5(5, "结案审核"),
+ CASE_STATUS_6(6, "待评价"),
+ CASE_STATUS_7(7, "已归档");
+
+
+ /**
+ * 代码编号
+ */
+ private int index;
+
+ /**
+ * 描述
+ */
+ private String des;
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String desc) {
+ this.des = desc;
+ }
+
+ /**
+ * 构造方法
+ * @param index
+ * @param des
+ */
+ CaseStatusBaseConstsEnum(int index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(int index) {
+ for (CaseStatusBaseConstsEnum constantEnum : CaseStatusBaseConstsEnum.values()) {
+ if (constantEnum.getIndex() == index) {
+ return constantEnum.des;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法
+ * @param des
+ * @return
+ */
+ public static int getIndex(String des) {
+ for (CaseStatusBaseConstsEnum constantEnum : CaseStatusBaseConstsEnum.values()) {
+ if (constantEnum.getDes().equals(des)) {
+ return constantEnum.index;
+ }
+ }
+ return 0;
+ }
+
+}
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/MediResultBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/MediResultBaseConstsEnum.java
new file mode 100644
index 0000000..927f931
--- /dev/null
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/MediResultBaseConstsEnum.java
@@ -0,0 +1,84 @@
+package cn.huge.module.mediate.constant;
+
+/**
+ * @title: 调解结果相关常量枚举类
+ * @description: 调解结果相关常量枚举类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public enum MediResultBaseConstsEnum {
+
+ /**
+ * 调解结果，22_00025-1：化解成功， 22_00025-2：化解不成功
+ */
+ MEDI_RESULT_1("22_00025-1", "化解成功"),
+ MEDI_RESULT_2("22_00025-2", "化解不成功");
+
+
+ /**
+ * 代码编号
+ */
+ private String index;
+
+ /**
+ * 描述
+ */
+ private String des;
+
+ public String getIndex() {
+ return index;
+ }
+
+ public void setIndex(String index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String desc) {
+ this.des = desc;
+ }
+
+ /**
+ * 构造方法
+ * @param index
+ * @param des
+ */
+ MediResultBaseConstsEnum(String index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(String index) {
+ for (MediResultBaseConstsEnum constantEnum : MediResultBaseConstsEnum.values()) {
+ if (constantEnum.getIndex().equals(index)) {
+ return constantEnum.des;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法
+ * @param des
+ * @return
+ */
+ public static String getIndex(String des) {
+ for (MediResultBaseConstsEnum constantEnum : MediResultBaseConstsEnum.values()) {
+ if (constantEnum.getDes().equals(des)) {
+ return constantEnum.index;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileBaseConsts.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileBaseConsts.java
index ce6ff69..f877dd0 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileBaseConsts.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileBaseConsts.java
@@ -16,34 +16,6 @@
public static final int UPLOADER_TYPE_1 = 1;
public static final int UPLOADER_TYPE_2 = 2;
- /**
- * 工作流通用任务条件，
- * 前进：forward，退回：back，
- */
- public static final String OPERATION_forward = "forward";
- public static final String OPERATION_back = "back";
- /**
- * 工作流业务任务条件，
- * 自行受理：zxsl
- * 交办给直属组织：jb_zszz，交办给综治中心：jb_zzzx
- * 受理：sl
- * 回退申请：htsq，回退审核同意：htsh_ty，回退审核不同意：htsh_bty
- * 上报：sb，上报审核同意：htsq_ty，上报审核不同意：htsq_bty
- * 结案审核同意：jash_ty，结案审核不同意：jash_bty
- */
- public static final String OPERATION_zxsl = "zxsl";
- public static final String OPERATION_jb_zszz = "jb_zszz";
- public static final String OPERATION_jb_zzzx = "jb_zzzx";
- public static final String OPERATION_sl = "sl";
- 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_sb = "sb";
- public static final String OPERATION_sbsh_ty = "sbsh_ty";
- public static final String OPERATION_sbsh_bty = "sbsh_bty";
- public static final String OPERATION_jash_ty = "jash_ty";
- public static final String OPERATION_jash_bty = "jash_bty";
-
}
/**
* -------------------_ooOoo_-------------------
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java
index 6a4b28c..d9ab1b4 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java
@@ -91,6 +91,7 @@
OWNER_TYPE_511("22_00018-511", "回退审核附件"),
OWNER_TYPE_512("22_00018-512", "上报申请附件"),
OWNER_TYPE_513("22_00018-513", "上报审核附件"),
+ OWNER_TYPE_514("22_00018-514", "结案审核附件"),
/**
* 系统材料
@@ -250,6 +251,8 @@
return OWNER_CAT_7.getIndex();
case "22_00018-513":
return OWNER_CAT_7.getIndex();
+ case "22_00018-514":
+ return OWNER_CAT_7.getIndex();
case "22_00018-502":
return OWNER_CAT_9.getIndex();
@@ -394,6 +397,8 @@
return OWNER_TYPE_512;
case "22_00018-513":
return OWNER_TYPE_513;
+ case "22_00018-514":
+ return OWNER_TYPE_514;
case "22_00018-502":
return OWNER_TYPE_502;
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/SyTimeEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/SyTimeEnum.java
index 33c58f5..333b4db 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/SyTimeEnum.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/SyTimeEnum.java
@@ -1,11 +1,12 @@
package cn.huge.module.sys.constant;
public enum SyTimeEnum {
- SY_TIME_00("", "未分类"),
- SY_TIME_01("24_00011-1", "受理时限"),
- SY_TIME_02("24_00011-2", "办理时限"),
- SY_TIME_03("24_00011-3", "督办回复时限"),
- SY_TIME_04("24_00011-4", "评价时限");
+ SY_TIME_1("24_00011-1", "分派时限"),
+ SY_TIME_2("24_00011-2", "签收时限"),
+ SY_TIME_3("24_00011-3", "受理时限"),
+ SY_TIME_4("24_00011-4", "办理时限"),
+ SY_TIME_5("24_00011-5", "督办回复时限"),
+ SY_TIME_6("24_00011-6", "当事人评价时限");
/**
* 代码编号
@@ -51,43 +52,5 @@
}
return null;
}
- /**
- * 静态方法
- * @param ownerType
- * @return
- */
- public static String getCat(String ownerType) {
- switch (ownerType) {
- case "22_00018-101":
- return SY_TIME_01.getIndex();
- case "22_00018-102":
- return SY_TIME_02.getIndex();
- case "22_00018-103":
- return SY_TIME_03.getIndex();
- case "22_00018-104":
- return SY_TIME_04.getIndex();
- default:
- return SY_TIME_00.getIndex();
- }
- }
- /**
- * 静态方法
- * @param index
- * @return
- */
- public static SyTimeEnum getByIndex(final String index) {
- switch (index) {
- case "24_00011-1":
- return SY_TIME_01;
- case "24_00011-2":
- return SY_TIME_02;
- case "24_00011-3":
- return SY_TIME_03;
- case "24_00011-4":
- return SY_TIME_04;
- default:
- return SY_TIME_00;
- }
- }
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/consts/CaseTaskConsts.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/consts/CaseTaskConsts.java
new file mode 100644
index 0000000..0c35092
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/consts/CaseTaskConsts.java
@@ -0,0 +1,75 @@
+package cn.huge.module.cases.consts;
+
+/**
+ * @title: 用户相关常量类
+ * @description: 用户相关常量
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public class CaseTaskConsts {
+
+ /**
+ * 任务类型，1：正常任务，2：回退审核任务，3：上报审核任务
+ */
+ public static final int TASK_TYPE_1 = 1;
+ public static final int TASK_TYPE_2 = 2;
+ public static final int TASK_TYPE_3 = 3;
+
+ /**
+ * 纠纷任务类型，1：承办，2：配合
+ */
+ public static final int CASE_TASK_TYPE_1 = 1;
+ public static final int CASE_TASK_TYPE_2 = 2;
+
+ /**
+ * 任务候选执行者类型：1：所有人，2：上一步骤选择，3：上一步骤执行者，4：自定义指定（单位部门角色人组合）
+ */
+ public static final int CANDE_TYPE_1 = 1;
+ public static final int CANDE_TYPE_2 = 2;
+ public static final int CANDE_TYPE_3 = 3;
+ public static final int CANDE_TYPE_4 = 4;
+
+ /**
+ * 任务签收状态，0：不用签收，1：未签收，:2：已签收
+ */
+ public static final int SIGN_STATUS_0 = 0;
+ public static final int SIGN_STATUS_1 = 1;
+ public static final int SIGN_STATUS_2 = 2;
+
+ /**
+ * 任务进度，1：进行中，2：已完成
+ */
+ public static final int TASK_STATUS_1 = 1;
+ public static final int TASK_STATUS_2 = 2;
+
+ /**
+ * 处理结果，1：通过，2：回退，3：上报
+ */
+ public static final int HANDLE_RESULT_1 = 1;
+ public static final int HANDLE_RESULT_2 = 2;
+ public static final int HANDLE_RESULT_3 = 3;
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml
index 3323de9..0899569 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml
@@ -12,7 +12,6 @@
<!-- 结果集 -->
<resultMap id="dataResult" type="cn.huge.module.cases.domain.po.CaseInfoUnfold">
<result property="id" column="id"/>
- <result property="caseId" column="case_id"/>
<result property="mediateUnitId" column="mediate_unit_id"/>
<result property="mediateUnitName" column="mediate_unit_name"/>
<result property="mediateDeptId" column="mediate_dept_id"/>
@@ -63,7 +62,6 @@
<!-- 字段 -->
<sql id="column-part">
id,
- case_id,
mediate_unit_id,
mediate_unit_name,
mediate_dept_id,
@@ -111,7 +109,6 @@
</sql>
<!-- 更新实体字段 -->
<sql id="set-part">
- <if test="entity.caseId != null">case_id = #{entity.caseId},</if>
<if test="entity.mediateUnitId != null">mediate_unit_id = #{entity.mediateUnitId},</if>
<if test="entity.mediateUnitName != null">mediate_unit_name = #{entity.mediateUnitName},</if>
<if test="entity.mediateDeptId != null">mediate_dept_id = #{entity.mediateDeptId},</if>
@@ -163,9 +160,6 @@
<where>
<if test="terms.id != null and terms.id !=''">
and id = #{terms.id}
- </if>
- <if test="terms.caseId != null and terms.caseId !=''">
- and case_id = #{terms.caseId}
</if>
<if test="terms.mediateUnitId != null and terms.mediateUnitId !=''">
and mediate_unit_id = #{terms.mediateUnitId}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfoUnfold.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfoUnfold.java
index f082111..b300dd5 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfoUnfold.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfoUnfold.java
@@ -21,16 +21,10 @@
public class CaseInfoUnfold {
/**
- * 主键编号
+ * 纠纷编号
*/
@TableId(value = "id")
private String id;
-
- /**
- * 纠纷编号
- */
- @TableField(value = "case_id")
- private String caseId;
/**
* 受理时间
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java
index 6629ef2..b19f65a 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java
@@ -191,9 +191,7 @@
public Map<String, Object> listFeedback(String id) {
Map<String, Object> result = new HashMap<>();
- QueryWrapper<CaseInfoUnfold> caseInfoUnfoldQueryWrapper = new QueryWrapper<>();
- caseInfoUnfoldQueryWrapper.eq("case_id", id);
- CaseInfoUnfold caseInfoUnfold = unfoldService.getOne(caseInfoUnfoldQueryWrapper);
+ CaseInfoUnfold caseInfoUnfold = unfoldService.getById(id);
result.put("manager", caseInfoUnfold.getMediator());
QueryWrapper<CaseFeedback> caseFeedbackQueryWrapper = new QueryWrapper<>();
caseFeedbackQueryWrapper.eq("case_id", id);
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index a05f846..4bbb026 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -206,8 +206,7 @@
caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
CaseInfoUnfold caseInfoUnfold = new CaseInfoUnfold();
- caseInfoUnfold.setId(utilsClient.getNewTimeId());
- caseInfoUnfold.setCaseId(caseInfo.getId());
+ caseInfoUnfold.setId(caseInfo.getId());
caseInfoUnfold.setCreateTime(nowDate);
caseInfoUnfold.setUpdateTime(nowDate);
@@ -551,8 +550,7 @@
caseInfo.setProcessName("来访登记");
//todo case_ref生成、case_title生成
- caseInfoUnfold.setId(utilsClient.getNewTimeId());
- caseInfoUnfold.setCaseId(caseInfo.getId());
+ caseInfoUnfold.setId(caseInfo.getId());
caseInfoUnfold.setCreateTime(nowDate);
caseInfoUnfold.setUpdateTime(nowDate);
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
index 5ce5c6d..b48fc15 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
@@ -12,10 +12,13 @@
import cn.huge.module.cases.dao.mapper.CaseInfoUnfoldMapper;
import cn.huge.module.cases.domain.po.CaseInfoUnfold;
import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
import cn.huge.module.mediate.constant.CaseBaseConsts;
+import cn.huge.module.mediate.constant.CaseBaseConstsEnum;
import cn.huge.module.sys.dto.FileIdInfoBaseDTO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Maps;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -158,12 +161,11 @@
// 获取当前登录用户
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
CaseInfoUnfold CaseInfoUnfold = new CaseInfoUnfold();
+ CaseInfoUnfold.setId(caseId);
CaseInfoUnfold.setMediatorId(loginUser.getId());
CaseInfoUnfold.setMediator(loginUser.getTrueName());
CaseInfoUnfold.setMediatorMobile(loginUser.getMobile());
- Map<String, Object> terms = new HashMap<>();
- terms.put("case_id", caseId);
- mapper.updateCaseInfoUnfoldTerms(CaseInfoUnfold, terms);
+ mapper.updateCaseInfoUnfold(CaseInfoUnfold);
}catch (Exception e){
log.error("[CaseInfoUnfoldService.choosePrincipal]调用失败，异常信息："+e, e);
throw new ServiceException("CaseInfoUnfoldService.choosePrincipal", e);
@@ -172,16 +174,14 @@
public TransactResultDTO getTransactResult(String caseId){
//查询办理结果信息
- QueryWrapper<CaseInfoUnfold>caseInfoUnfoldQueryWrapper = new QueryWrapper<>();
- caseInfoUnfoldQueryWrapper.eq("case_id", caseId);
- CaseInfoUnfold caseInfoUnfold = this.getOne(caseInfoUnfoldQueryWrapper);
+ CaseInfoUnfold caseInfoUnfold = this.getById(caseId);
TransactResultDTO transactResultDTO = new TransactResultDTO();
BeanUtils.copyProperties(caseInfoUnfold, transactResultDTO);
if(ObjectUtils.isNotEmpty(transactResultDTO)){
QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
caseAssistApplyQueryWrapper.select("apply_assist_unit_name").eq("case_id", caseId).eq("apply_status", 1)
- .eq("audit_result", CaseBaseConsts.AUDIT_RESULT_1);
+ .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
CaseAssistApply caseAssistApply = assistApplyService.getOne(caseAssistApplyQueryWrapper);
if(ObjectUtils.isNotEmpty(caseAssistApply)){
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
index d7a2aa0..8eed38b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
@@ -139,7 +139,7 @@
public void addCaseSupervise(CaseSupervise caseSupervise, String userId){
try{
List<QuiltUnitDTO> quiltUnitDTOList = caseSupervise.getQuiltUnitDTOList();
- Integer timeTerm = sysClient.getTimeLimit("dyh_case_supervise", SyTimeEnum.SY_TIME_03.getIndex());
+ Integer timeTerm = sysClient.getTimeLimit("dyh_case_supervise", SyTimeEnum.SY_TIME_5.getIndex());
List<CaseSupervise> caseSuperviseList = new ArrayList<>();
for(QuiltUnitDTO quiltUnitDTO: quiltUnitDTOList){
CaseSupervise caseSuperviseNew = new CaseSupervise();
--
Gitblit v1.8.0