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 e51317d..52502a5 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 @@ -117,4 +117,22 @@ public class StateGridController extends BaseController { } + /** + * 国网模版下载 + * @param + * @return + */ + @ApiOperation(value = "国网模版下载") + // @PreAuthorize("@ss.hasPermi('key:people:add')") + @PostMapping("/downloadStateGridTemp") + public AjaxResult downloadStateGridTemp(@RequestBody TbGwModelDto o) { + try { + return service.downloadStateGridTemp(o); + }catch (Exception e){ + log.info("国网模版修改失败{}",e.getMessage()); + return error(e.getMessage()); + } + } + + } diff --git a/search-tool/src/main/java/com/bonus/tool/dto/ComCorePersonBean.java b/search-tool/src/main/java/com/bonus/tool/dto/ComCorePersonBean.java index 1fa186d..db50cc9 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/ComCorePersonBean.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/ComCorePersonBean.java @@ -20,6 +20,11 @@ public class ComCorePersonBean { */ private Long id; + /** + * 用户id + */ + private String userId; + /** * 姓名 */ diff --git a/search-tool/src/main/java/com/bonus/tool/dto/ComOtherPersonBean.java b/search-tool/src/main/java/com/bonus/tool/dto/ComOtherPersonBean.java index ae65835..ad3dde0 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/ComOtherPersonBean.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/ComOtherPersonBean.java @@ -22,6 +22,10 @@ public class ComOtherPersonBean { */ private String postName; + /** + * 用户ID + */ + private Long userId; /** * 姓名 diff --git a/search-tool/src/main/java/com/bonus/tool/dto/ComPerformanceBean.java b/search-tool/src/main/java/com/bonus/tool/dto/ComPerformanceBean.java index f16f928..f57ff5a 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/ComPerformanceBean.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/ComPerformanceBean.java @@ -24,6 +24,11 @@ public class ComPerformanceBean { */ private Long id; + /** + * 主键 + */ + private Long perfId; + /** * 工程名称 */ diff --git a/search-tool/src/main/java/com/bonus/tool/dto/SubOtherPeopleBean.java b/search-tool/src/main/java/com/bonus/tool/dto/SubOtherPeopleBean.java index fe2f5f2..3fb12e2 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/SubOtherPeopleBean.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/SubOtherPeopleBean.java @@ -25,6 +25,11 @@ public class SubOtherPeopleBean { */ private Long subId; + /** + * 用户id + */ + private Long userId; + /** * 姓名 */ diff --git a/search-tool/src/main/java/com/bonus/tool/dto/SubPerformanceBean.java b/search-tool/src/main/java/com/bonus/tool/dto/SubPerformanceBean.java index 09ce341..9d627be 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/SubPerformanceBean.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/SubPerformanceBean.java @@ -29,6 +29,11 @@ public class SubPerformanceBean { */ private Long subId; + /** + * 业绩id + */ + private Long perfId; + /** * 项目名称 */ 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 ba27aa1..340c4db 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 @@ -42,4 +42,11 @@ public interface StateGridService { * @return */ AjaxResult updateStateGridTemp(TbGwModelDto o); + + /** + * 国网模版下载 + * @param + * @return + */ + AjaxResult downloadStateGridTemp(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 49c3cee..24fc408 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 @@ -184,6 +184,26 @@ public class StateGridServiceImpl implements StateGridService { return AjaxResult.success("国网模板修改成功"); } + /** + * 国网模版下载 + * @param + * @return + */ + @Override + public AjaxResult downloadStateGridTemp(TbGwModelDto o) { + AjaxResult ajaxResult = getStateGridTempById(o); + if (ajaxResult.isSuccess()) { + TbGwModelVo data = (TbGwModelVo) ajaxResult.get("data"); + //将每种数据的文件查出来封装进去 + + } + return null; + } + + private List getFileSourceList(TbGwModelDto o) { + return null; + } + /** * 删除国网模版关联数据 * diff --git a/search-tool/src/main/resources/mapper/StateGridMapper.xml b/search-tool/src/main/resources/mapper/StateGridMapper.xml index deb39fc..b0443fa 100644 --- a/search-tool/src/main/resources/mapper/StateGridMapper.xml +++ b/search-tool/src/main/resources/mapper/StateGridMapper.xml @@ -160,6 +160,7 @@