From 1232b349321cec66587c7da33d7bb32c9c310168 Mon Sep 17 00:00:00 2001 From: paidaxing444 <12qwaszx> Date: Mon, 26 Oct 2020 10:37:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=86=85=E5=AE=B9=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/benyi/assessmentcontent.js | 17 ++ .../src/views/benyi/assessmentstudy/index.vue | 185 ++++++++++++++++++ .../ByAssessmentcontentController.java | 65 ++++-- .../mapper/ByAssessmentcontentMapper.java | 8 + .../service/IByAssessmentcontentService.java | 8 + .../impl/ByAssessmentcontentServiceImpl.java | 11 ++ .../benyi/ByAssessmentcontentMapper.xml | 14 ++ 7 files changed, 287 insertions(+), 21 deletions(-) create mode 100644 ruoyi-ui/src/views/benyi/assessmentstudy/index.vue diff --git a/ruoyi-ui/src/api/benyi/assessmentcontent.js b/ruoyi-ui/src/api/benyi/assessmentcontent.js index 671f894d3..f1a2b2988 100644 --- a/ruoyi-ui/src/api/benyi/assessmentcontent.js +++ b/ruoyi-ui/src/api/benyi/assessmentcontent.js @@ -17,6 +17,14 @@ export function treeselect() { }) } +// 查询流程下拉树结构 +export function treeselectstudy() { + return request({ + url: '/benyi/assessmentcontent/treeselectstudy', + method: 'get' + }) +} + // 查询评估内容详细 export function getAssessmentcontent(id) { @@ -26,6 +34,15 @@ export function getAssessmentcontent(id) { }) } + +// 查询评估内容详细 +export function getAssessmentcontentbyparentid(id) { + return request({ + url: '/benyi/assessmentcontent/byparentid/' + id, + method: 'get' + }) +} + // 新增评估内容 export function addAssessmentcontent(data) { return request({ diff --git a/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue b/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue new file mode 100644 index 000000000..b014176fb --- /dev/null +++ b/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue @@ -0,0 +1,185 @@ + + + + \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java index e78c38198..47f3fb6fb 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java @@ -32,33 +32,61 @@ import com.ruoyi.framework.web.page.TableDataInfo; */ @RestController @RequestMapping("/benyi/assessmentcontent") -public class ByAssessmentcontentController extends BaseController -{ +public class ByAssessmentcontentController extends BaseController { @Autowired private IByAssessmentcontentService byAssessmentcontentService; @Autowired private TokenService tokenService; -/** - * 查询评估内容列表 - */ -@PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:list')") -@GetMapping("/list") - public TableDataInfo list(ByAssessmentcontent byAssessmentcontent) - { + /** + * 查询评估内容列表 + */ + @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:list')") + @GetMapping("/list") + public TableDataInfo list(ByAssessmentcontent byAssessmentcontent) { startPage(); List list = byAssessmentcontentService.selectByAssessmentcontentList(byAssessmentcontent); return getDataTable(list); } - + + /** + * 查询评估内容列表 + */ + @PreAuthorize("@ss.hasPermi('benyi:assessmentstudy:list')") + @GetMapping("/treeselectstudy") + public AjaxResult treeselectstudy(ByAssessmentcontent byAssessmentcontent) { + List list = byAssessmentcontentService.selectByAssessmentcontentstudyList(byAssessmentcontent); + return AjaxResult.success(byAssessmentcontentService.buildByAssessmentcontentTreeSelect(list)); + } + + /** + * 获取评估内容详细信息 + */ + @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:query')") + @GetMapping(value = "/byparentid/{id}") + public AjaxResult getInfobyparentId(@PathVariable("id") Long id) { + System.out.println("start:"+id); + ByAssessmentcontent byAssessmentcontent=new ByAssessmentcontent(); + byAssessmentcontent.setParentId(id); + return AjaxResult.success(byAssessmentcontentService.selectByAssessmentcontentList(byAssessmentcontent)); + } + +// /** +// * 获取部门下拉树列表 +// */ +// @GetMapping("/treeselect") +// public AjaxResult treeselect(ByDayFlowDetail byDayFlowDetail) { +// List byDayFlowDetails = byDayFlowDetailService.selectByDayFlowDetailListTree(byDayFlowDetail); +// return AjaxResult.success(byDayFlowDetailService.buildDayFlowDetailTreeSelect(byDayFlowDetails)); +// } + /** * 导出评估内容列表 */ @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:export')") @Log(title = "评估内容", businessType = BusinessType.EXPORT) @GetMapping("/export") - public AjaxResult export(ByAssessmentcontent byAssessmentcontent) - { + public AjaxResult export(ByAssessmentcontent byAssessmentcontent) { List list = byAssessmentcontentService.selectByAssessmentcontentList(byAssessmentcontent); ExcelUtil util = new ExcelUtil(ByAssessmentcontent.class); return util.exportExcel(list, "assessmentcontent"); @@ -69,13 +97,11 @@ public class ByAssessmentcontentController extends BaseController */ @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(byAssessmentcontentService.selectByAssessmentcontentById(id)); } - /** * 获取部门下拉树列表 */ @@ -92,8 +118,7 @@ public class ByAssessmentcontentController extends BaseController @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:add')") @Log(title = "评估内容", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody ByAssessmentcontent byAssessmentcontent) - { + public AjaxResult add(@RequestBody ByAssessmentcontent byAssessmentcontent) { return toAjax(byAssessmentcontentService.insertByAssessmentcontent(byAssessmentcontent)); } @@ -103,8 +128,7 @@ public class ByAssessmentcontentController extends BaseController @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:edit')") @Log(title = "评估内容", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody ByAssessmentcontent byAssessmentcontent) - { + public AjaxResult edit(@RequestBody ByAssessmentcontent byAssessmentcontent) { return toAjax(byAssessmentcontentService.updateByAssessmentcontent(byAssessmentcontent)); } @@ -114,8 +138,7 @@ public class ByAssessmentcontentController extends BaseController @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:remove')") @Log(title = "评估内容", businessType = BusinessType.DELETE) @DeleteMapping("/{id}") - public AjaxResult remove(@PathVariable Long id) - { + public AjaxResult remove(@PathVariable Long id) { if (byAssessmentcontentService.hasChildByAssessmentcontentId(id)) { return AjaxResult.error("存在下级内容,不允许删除"); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java index c54320d8f..fd9018f7f 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java @@ -27,6 +27,14 @@ public interface ByAssessmentcontentMapper { */ public List selectByAssessmentcontentList(ByAssessmentcontent byAssessmentcontent); + /** + * 查询评估内容列表 + * + * @param byAssessmentcontent 评估内容 + * @return 评估内容集合 + */ + public List selectByAssessmentcontentstudyList(ByAssessmentcontent byAssessmentcontent); + /** * 新增评估内容 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java index f78022ca2..97d19c388 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java @@ -28,6 +28,14 @@ public interface IByAssessmentcontentService { */ public List selectByAssessmentcontentList(ByAssessmentcontent byAssessmentcontent); + /** + * 查询评估内容列表 + * + * @param byAssessmentcontent 评估内容 + * @return 评估内容集合 + */ + public List selectByAssessmentcontentstudyList(ByAssessmentcontent byAssessmentcontent); + /** * 构建前端所需要树结构 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java index ad0bfaedf..e1a7b8f2c 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java @@ -47,6 +47,17 @@ public class ByAssessmentcontentServiceImpl implements IByAssessmentcontentServi return byAssessmentcontentMapper.selectByAssessmentcontentList(byAssessmentcontent); } + /** + * 查询评估内容列表 + * + * @param byAssessmentcontent 评估内容 + * @return 评估内容集合 + */ + @Override + public List selectByAssessmentcontentstudyList(ByAssessmentcontent byAssessmentcontent){ + return byAssessmentcontentMapper.selectByAssessmentcontentstudyList(byAssessmentcontent); + } + /** * 构建前端所需要树结构 * diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml index 8e3cf6d46..1409c9fdc 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml @@ -28,6 +28,20 @@ + +