From c1a463b9f1c0a7160dbd0ac1c7490eef13861a5e Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Tue, 29 Oct 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java
index 4232d09..1db1dd2 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java
@@ -1,6 +1,6 @@
package cn.huge.module.mediate.controller.client;
-import cn.huge.base.common.constant.GzAreaEnum;
+import cn.huge.base.common.constant.GzRegionEnum;
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
@@ -16,7 +16,6 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
import java.util.Date;
/**
@@ -83,7 +82,7 @@
int year = DateUtils.getYear(new Date());
String caseNoLogo = caseInfoService.getCaseNoLogo(area);
if (StringUtils.isEmpty(caseNoLogo)){
- caseNoLogo = caseInfoService.getCaseNoLogo(GzAreaEnum.GZEnum_0.getIndex());
+ caseNoLogo = caseInfoService.getCaseNoLogo(GzRegionEnum.CITY_1.getIndex());
}
String caseNoPrefix = "（" + year + "）"+caseNoLogo;
String newCaseNo = caseInfoService.getNewCaseNo(caseNoPrefix);
@@ -117,7 +116,6 @@
return ReturnFailUtils.getRepInfo();
}
}
-
/**
* 生成新的事项编号
--
Gitblit v1.8.0