From 826d7a2d241c24a1ef47fe0e69533a18b3464bc2 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期五, 04 七月 2025 21:16:46 +0800 Subject: [PATCH] art:技术状态鉴定工单变更-数据库设计 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java index e04b991..59c7742 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java @@ -15,10 +15,10 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart; -import org.jeecg.modules.eam.base.model.RepairDepartIdModel; -import org.jeecg.modules.eam.base.model.EamBaseRepairDepartTreeModel; -import org.jeecg.modules.eam.base.service.IEamBaseRepairDepartService; +import org.jeecg.modules.system.entity.EamBaseRepairDepart; +import org.jeecg.modules.system.model.RepairDepartIdModel; +import org.jeecg.modules.system.model.EamBaseRepairDepartTreeModel; +import org.jeecg.modules.system.service.IEamBaseRepairDepartService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -87,22 +87,22 @@ return result; } -// @AutoLog(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」") -// @ApiOperation(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」", notes = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」") -// @GetMapping(value = "/loadMaintainDepartTreeOptions") -// public Result<List<RepairDepartIdModel>> loadMaintainDepartTreeOptions() { -// Result<List<RepairDepartIdModel>> result = new Result<>(); -// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// String userId = user.getId(); -// try { -// List<RepairDepartIdModel> list = eamBaseRepairDepartService.loadMaintainDepartTreeOptions(userId); -// result.setSuccess(true); -// result.setResult(list); -// } catch (Exception e) { -// log.error(e.getMessage(), e); -// } -// return result; -// } + @AutoLog(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」") + @ApiOperation(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」", notes = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」") + @GetMapping(value = "/loadMaintainDepartTreeOptions") + public Result<List<RepairDepartIdModel>> loadMaintainDepartTreeOptions() { + Result<List<RepairDepartIdModel>> result = new Result<>(); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userId = user.getId(); + try { + List<RepairDepartIdModel> list = eamBaseRepairDepartService.loadMaintainDepartTreeOptions(userId); + result.setSuccess(true); + result.setResult(list); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return result; + } @AutoLog(value = "缁翠慨閮ㄩ棬鐝粍-id闆嗗悎") @ApiOperation(value = "缁翠慨閮ㄩ棬鐝粍-id闆嗗悎", notes = "缁翠慨閮ㄩ棬鐝粍-id闆嗗悎") -- Gitblit v1.9.3