From 5bcb419e91c36d906be75793f62bc9b8ffc75340 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Sun, 27 Apr 2025 14:12:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E7=BD=91=E6=A8=A1=E7=89=88=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/tool/controller/search/StateGridController.java | 3 +-- .../src/main/java/com/bonus/tool/dto/TbGwModelDto.java | 7 ++++++- .../src/main/java/com/bonus/tool/dto/TbGwModelVo.java | 7 ++++++- .../main/java/com/bonus/tool/service/StateGridService.java | 2 +- .../com/bonus/tool/service/impl/StateGridServiceImpl.java | 6 +++--- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java index bb8b371..e51317d 100644 --- a/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java +++ b/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java @@ -75,8 +75,7 @@ public class StateGridController extends BaseController { @PostMapping("/getStateGridTempById") public AjaxResult getStateGridTempById(@RequestBody TbGwModelDto o) { try { - TbGwModelVo bean = service.getStateGridTempById(o); - return success(bean); + return service.getStateGridTempById(o); }catch (Exception e){ log.info("公司业绩管理详情失败{}",e.getMessage()); return error("公司业绩管理详情失败"); diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelDto.java b/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelDto.java index 79f8e66..b8d507d 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelDto.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelDto.java @@ -53,10 +53,15 @@ public class TbGwModelDto implements Serializable { private List comCoreList; /** - * 公司关键人员id + * 公司其他人员id */ private List comOtherList; + /** + * 分包人员（EPC模版用） + */ + private List subPersonList; + /** * 分包列表 */ diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelVo.java index 7f3b0c8..9bcde51 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelVo.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelVo.java @@ -53,10 +53,15 @@ public class TbGwModelVo implements Serializable { private List comCoreList; /** - * 公司关键人员id + * 公司其他人员id */ private List comOtherList; + /** + * 分包人员（EPC模版用） + */ + private List subPersonList; + /** * 分包列表 */ diff --git a/search-tool/src/main/java/com/bonus/tool/service/StateGridService.java b/search-tool/src/main/java/com/bonus/tool/service/StateGridService.java index 2c88100..ba27aa1 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/StateGridService.java +++ b/search-tool/src/main/java/com/bonus/tool/service/StateGridService.java @@ -27,7 +27,7 @@ public interface StateGridService { * @param o * @return */ - TbGwModelVo getStateGridTempById(TbGwModelDto o); + AjaxResult getStateGridTempById(TbGwModelDto o); /** * 国网模版删除 diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java index 0b54926..49c3cee 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java @@ -121,7 +121,7 @@ public class StateGridServiceImpl implements StateGridService { * @return */ @Override - public TbGwModelVo getStateGridTempById(TbGwModelDto o) { + public AjaxResult getStateGridTempById(TbGwModelDto o) { try { //1.0获取国网模版详情 TbGwModelVo bean = mapper.getStateGridTempById(o); @@ -145,10 +145,10 @@ public class StateGridServiceImpl implements StateGridService { List subOtherList = mapper.selectSubOtherList(o.getId(), item.getId()); item.setSubPersonList(subOtherList); }); - return bean; + return AjaxResult.success(bean); } catch (Exception e) { log.info("国网模版详情失败{}", e.getMessage()); - return null; + return AjaxResult.error("国网模版详情失败"); } }