From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 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 a7cdde5..56aeceb 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;
@@ -41,10 +42,10 @@
* 鏌ヨ鏈烘瀯绠＄悊鍒楄〃
*/
@ApiOperation("鑾峰彇鏈烘瀯鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:organization:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:organization:list')")
@GetMapping("/list")
public TableDataInfo list(BaseOrganization baseOrganization) {
- log.info("鑾峰彇鏈烘瀯鍒楄〃{}锛�" , baseOrganization);
+ log.info("鑾峰彇鏈烘瀯鍒楄〃{}锛�", baseOrganization);
startPage();
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
return getDataTable(list);
@@ -54,11 +55,11 @@
* 瀵煎嚭鏈烘瀯绠＄悊鍒楄〃
*/
@ApiOperation("瀵煎嚭鏈烘瀯淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:organization:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:organization:export')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(BaseOrganization baseOrganization) {
- log.info("瀵煎嚭鏈烘瀯淇℃伅{}锛�" , baseOrganization);
+ log.info("瀵煎嚭鏈烘瀯淇℃伅{}锛�", baseOrganization);
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
ExcelUtil<BaseOrganization> util = new ExcelUtil<BaseOrganization>(BaseOrganization.class);
return util.exportExcel(list, "鏈烘瀯绠＄悊鏁版嵁");
@@ -68,10 +69,10 @@
* 鑾峰彇鏈烘瀯绠＄悊璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃鏈烘瀯id鑾峰彇鏈烘瀯淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:organization:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:organization:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- log.info("鑾峰彇鏈烘瀯绠＄悊璇︾粏淇℃伅{}锛�" , id);
+ log.info("鑾峰彇鏈烘瀯绠＄悊璇︾粏淇℃伅{}锛�", id);
return AjaxResult.success(baseOrganizationService.getById(id));
}
@@ -79,28 +80,42 @@
* 鏂板鏈烘瀯绠＄悊
*/
@ApiOperation("鏂板鏈烘瀯淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:organization:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:organization:add')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
- log.info("鏂板鏈烘瀯淇℃伅{}锛�" , baseOrganization);
- String organization = onlyValueCommon.addOnlyValue("organization");
- //"0"+鍦板競缂栫爜+鍖婚櫌绫诲瀷+搴忓彿
- baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
- return toAjax(baseOrganizationService.save(baseOrganization));
+ log.info("鏂板鏈烘瀯淇℃伅{}锛�", baseOrganization);
+ //"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);
}
/**
* 淇敼鏈烘瀯绠＄悊
*/
@ApiOperation("淇敼鏈烘瀯淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:organization:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:organization:edit')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody BaseOrganization baseOrganization) {
- log.info("淇敼鏈烘瀯淇℃伅{}锛�" , baseOrganization);
+ log.info("淇敼鏈烘瀯淇℃伅{}锛�", baseOrganization);
return toAjax(baseOrganizationService.updateById(baseOrganization));
}
@@ -108,11 +123,11 @@
* 鍒犻櫎鏈烘瀯绠＄悊
*/
@ApiOperation("鍒犻櫎鏈烘瀯淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:organization:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:organization:remove')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
- log.info("鍒犻櫎鏈烘瀯淇℃伅{}锛�" , ids);
+ log.info("鍒犻櫎鏈烘瀯淇℃伅{}锛�", ids);
return toAjax(baseOrganizationService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.3