From 47a4e95a407c5fe82f3363826fbc4db2218e6ed5 Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Tue, 24 Jun 2025 09:43:27 +0800
Subject: [PATCH] fix:法院案号生成调整
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java | 6 +++---
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java | 24 ++++++++++++------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
index da0c79b..27e7c43 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
@@ -626,7 +626,7 @@
} else if (parts.length >= 4) {
return parts[0] + parts[1] + parts[2] + "-" + parts[3];
} else if (parts.length >= 5) {
- return parts[0] + parts[1] + parts[2] + "-" + parts[3]+"-" + parts[4];
+ return parts[0] + parts[1] + parts[2] + "-" + parts[3] + "-" + parts[4];
} else {
return input; // 或抛出异常
}
@@ -674,7 +674,7 @@
GridUserRoleVo gridUserRoleVo = new GridUserRoleVo();
gridUserRoleVo.setUserId(userId);
GridUserRoleDTO userRoleDTO = sysClient.getUserRoleList(gridUserRoleVo);
- if (StringUtils.isEmpty(userRoleDTO.getRoleName()) || !userRoleDTO.getRoleName().contains("（M）")) {
+ if (StringUtils.isEmpty(userRoleDTO.getRoleName()) || (!userRoleDTO.getRoleName().contains("（M）") && !userRoleDTO.getRoleName().contains("领导") && !userRoleDTO.getRoleName().contains("调度干部"))) {
return ReturnFailUtils.getRepInfo("该用户没有矛调系统的权限");
}
CtUserole ctUserole = new CtUserole();
@@ -730,7 +730,7 @@
switch (grade) {
case 1:
//市级级
- ctUnit.setLevel(grade );
+ ctUnit.setLevel(grade);
ctUnit.setUnitGrade(grade);
ctUnit.setUnitType(UserBaseConsts.UNIT_TYPE_102);
ctUnit.setParentId("2024000000000001");
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java
index 7fdb613..f8c8433 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java
@@ -19,17 +19,17 @@
/**
* 常量前缀
*/
- public static String CASE_NO_SIGN_TH = "天河调";
- public static String CASE_NO_SIGN_HZ = "海珠调";
- public static String CASE_NO_SIGN_LW = "荔湾调";
- public static String CASE_NO_SIGN_YX = "越秀调";
- public static String CASE_NO_SIGN_PY = "番禺调";
- public static String CASE_NO_SIGN_HD = "花都调";
- public static String CASE_NO_SIGN_BY = "粤云调";
- public static String CASE_NO_SIGN_NS = "南沙调";
- public static String CASE_NO_SIGN_HP = "黄埔调";
- public static String CASE_NO_SIGN_ZC = "增城调";
- public static String CASE_NO_SIGN_CH = "从化调";
+ public static String CASE_NO_SIGN_TH = "穗天综调";
+ public static String CASE_NO_SIGN_HZ = "穗海综调";
+ public static String CASE_NO_SIGN_LW = "穗荔综调";
+ public static String CASE_NO_SIGN_YX = "穗越综调";
+ public static String CASE_NO_SIGN_PY = "穗番综调";
+ public static String CASE_NO_SIGN_HD = "穗花综调";
+ public static String CASE_NO_SIGN_BY = "穗云综调";
+ public static String CASE_NO_SIGN_NS = "穗南综调";
+ public static String CASE_NO_SIGN_HP = "穗埔综调";
+ public static String CASE_NO_SIGN_ZC = "穗增综调";
+ public static String CASE_NO_SIGN_CH = "穗从综调";
public static String CASE_NO_SIGN_GZ = "粤调";
/**
@@ -136,7 +136,7 @@
StringBuffer caseNoSign = new StringBuffer();
// 设置年号
int year = DateUtils.getYear(DateUtils.getNowDate());
- caseNoSign.append("（").append(year).append("）");
+ caseNoSign.append(year);
if (GzRegionBaseEnum.AREA_1.getIndex().equals(area)){
caseNoSign.append(CASE_NO_SIGN_TH);
}else if (GzRegionBaseEnum.AREA_2.getIndex().equals(area)){
--
Gitblit v1.8.0