From 0c5e744bd9b52147c7fc273ec8fe7bd7afea0ebb Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 05 三月 2024 15:42:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
index 9266c9a..06321bc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.BaseOrganization;
import com.ruoyi.project.service.IBaseOrganizationService;
@@ -85,10 +86,21 @@
@RepeatSubmit
public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
log.info("鏂板鏈烘瀯淇℃伅{}锛�", baseOrganization);
- String organization = onlyValueCommon.addOnlyValue("organization");
- //"0"+鍦板競缂栫爜+鍖婚櫌绫诲瀷+搴忓彿
- baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
-
+ //"0"+鍦板競缂栫爜+鍖婚櫌绫诲瀷
+ String str = "0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature();
+ String maxOrganizationID = baseOrganizationService.getMaxOrganizationID(str + "__");
+ if (StringUtils.isNotBlank(maxOrganizationID)) {
+ String result = maxOrganizationID.substring(str.length());
+ //鑾峰彇搴忓彿锛�+1锛岀敓鎴愭柊鐨勫簭鍙�
+ int xh = Integer.valueOf(result) + 1;
+ if (String.valueOf(xh).length() > 1) {
+ baseOrganization.setOrganizationid(str + xh);
+ } else {
+ baseOrganization.setOrganizationid(str + "0" + xh);
+ }
+ } else {
+ baseOrganization.setOrganizationid(str + str + "01");
+ }
boolean save = baseOrganizationService.save(baseOrganization);
log.info("鏂板鏈烘瀯淇℃伅baseOrganization鐨処D{}锛�", baseOrganization.getId());
return AjaxResult.success(baseOrganization);
--
Gitblit v1.9.3