From 67c6b3ec9f9a916e5f39a1c0b14499e66f78c982 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 23 六月 2026 17:54:36 +0800
Subject: [PATCH] 【市一】外链开放机构号生成
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
index 5e8c4fe..5a91def 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
@@ -1,13 +1,20 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
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.smartor.domain.BaseOrganization;
import com.smartor.domain.ServiceOutPath;
+import com.smartor.domain.ServiceTask;
+import com.smartor.service.IBaseOrganizationService;
import com.smartor.service.IServiceOutPathService;
+import com.smartor.service.IServiceTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
@@ -30,6 +37,12 @@
@Autowired
private IServiceOutPathService serviceOutPathService;
+ @Autowired
+ private IServiceTaskService serviceTaskService;
+
+ @Autowired
+ private IBaseOrganizationService baseOrganizationService;
+
/**
* 鏌ヨ涓婚敭鍒楄〃
*/
@@ -50,13 +63,33 @@
*/
@PostMapping("/getInfoByParam")
public AjaxResult param(@Param("param") String param) {
- ServiceOutPath serviceOutPath=new ServiceOutPath();
+ ServiceOutPath serviceOutPath = new ServiceOutPath();
serviceOutPath.setRadix(param);
List<ServiceOutPath> list = serviceOutPathService.selectServiceOutPathList(serviceOutPath);
- ServiceOutPath serviceOutPath1 = list.get(0);
- serviceOutPath1.setId(null);
- serviceOutPath1.setRadix(null);
- if (CollectionUtils.isNotEmpty(list)) return success(serviceOutPath1);
+ if (CollectionUtils.isNotEmpty(list)) {
+ ServiceOutPath serviceOutPath1 = list.get(0);
+ serviceOutPath1.setId(null);
+ serviceOutPath1.setRadix(null);
+ //鏍规嵁taskid鑾峰彇鏈烘瀯淇℃伅
+ if(StringUtils.isNotEmpty(serviceOutPath1.getParam1())){
+ String taskId = serviceOutPath1.getParam1();
+ if(StringUtils.isNotEmpty(taskId)){
+ ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(Long.valueOf(taskId));
+ String orgId = serviceTask.getOrgid();
+ if(StringUtils.isNotEmpty(orgId)){
+ BaseOrganization baseOrganization = new BaseOrganization();
+ baseOrganization.setOrgid(orgId);
+ List<BaseOrganization> orgs = baseOrganizationService.selectBaseOrganizationList(baseOrganization);
+ if(CollectionUtils.isNotEmpty(orgs)){
+ String orgname = orgs.get(0).getOrganizationName();
+ serviceOutPath1.setOrgid(orgId);
+ serviceOutPath1.setOrgname(orgname);
+ }
+ }
+ }
+ }
+ return success(serviceOutPath1);
+ }
return success(null);
}
@@ -87,6 +120,7 @@
*/
@ApiOperation("鏂板涓婚敭")
@Log(title = "涓婚敭", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody ServiceOutPath serviceOutPath) {
return toAjax(serviceOutPathService.insertServiceOutPath(serviceOutPath));
@@ -98,6 +132,7 @@
@ApiOperation("淇敼涓婚敭")
//@PreAuthorize("@ss.hasPermi('smartor:path:edit')")
@Log(title = "涓婚敭", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceOutPath serviceOutPath) {
return toAjax(serviceOutPathService.updateServiceOutPath(serviceOutPath));
--
Gitblit v1.9.3