From 1c8b2be08e6c7655bab6d8a99f15b883768f0d38 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 30 七月 2024 17:15:43 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/ISvyLibTemplateService.java | 3 +++ ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java | 12 +++++++++++- smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java | 9 +++++++++ smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml | 2 +- smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml | 1 + 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java index 7149c53..de5a90d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java @@ -6,10 +6,12 @@ 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.BaseEntity; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.PageUtils; +import com.smartor.domain.SvyLibScriptTag; import com.smartor.domain.SvyLibTemplate; import com.smartor.domain.SvyLibTemplateReq; import com.smartor.service.ISvyLibTemplateService; @@ -36,10 +38,18 @@ @Autowired private ISvyLibTemplateService svyLibTemplateService; + @ApiOperation("鏌ヨ闂嵎鍒楄〃") + @GetMapping("/list") + public TableDataInfo selectSvyLibTemplatelist(SvyLibTemplate svyLibTemplate) { + startPage(); + List<SvyLibTemplate> sviLibTemplate = svyLibTemplateService.getSviLibTemplate(svyLibTemplate); + return getDataTable(sviLibTemplate); + } + /** * 鏌ヨ闂嵎鍒楄〃 */ - @ApiOperation("鏌ヨ闂嵎鍒楄〃璇︽儏") + @ApiOperation("鏌ヨ闂嵎璇︽儏") @PostMapping("/selectSvyLibTemplatelist") public TableDataInfo selectSvyLibTemplatelist(@RequestBody SvyLibTemplateReq svyLibTemplateReq) { PageUtils.startPageByPost(svyLibTemplateReq.getPageNum(), svyLibTemplateReq.getPageSize()); diff --git a/smartor/src/main/java/com/smartor/service/ISvyLibTemplateService.java b/smartor/src/main/java/com/smartor/service/ISvyLibTemplateService.java index dbda5a1..da112dd 100644 --- a/smartor/src/main/java/com/smartor/service/ISvyLibTemplateService.java +++ b/smartor/src/main/java/com/smartor/service/ISvyLibTemplateService.java @@ -22,6 +22,8 @@ */ public SvyLibTemplate selectSvyLibTemplateBySvyid(Long svyid); + public List<SvyLibTemplate> getSviLibTemplate(SvyLibTemplate svyLibTemplate); + /** * 鏌ヨ闂嵎鍒楄〃 * @@ -40,6 +42,7 @@ /** * 鏂板鎴栦慨鏀归棶鍗锋ā鏉夸俊鎭� + * * @param svyLibTemplate * @return */ diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java index f90d53f..e11b3c6 100644 --- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java @@ -49,6 +49,15 @@ return svyLibTemplateMapper.selectSvyLibTemplateBySvyid(svyid); } + @Override + public List<SvyLibTemplate> getSviLibTemplate(SvyLibTemplate svyLibTemplate) { + SvyLibTemplateReq svyLibTemplateReq=new SvyLibTemplateReq(); + svyLibTemplateReq.setSvyid(svyLibTemplate.getSvyid()); + svyLibTemplateReq.setCategoryid(svyLibTemplate.getCategoryid()); + svyLibTemplateReq.setDescription(svyLibTemplate.getDescription()); + return svyLibTemplateMapper.selectSvyLibTemplateList(svyLibTemplateReq); + } + /** * 鏌ヨ闂嵎鍒楄〃 * diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml index 48524ef..4f2fa1e 100644 --- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml +++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml @@ -142,7 +142,7 @@ <insert id="insertIvrLibaTemplateScript" parameterType="com.smartor.domain.IvrLibaTemplateScript" useGeneratedKeys="true" - keyProperty="ID"> + keyProperty="id"> insert into ivr_liba_template_script <trim prefix="(" suffix=")" suffixOverrides=","> <if test="scriptno != null">scriptno,</if> diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml index 9771de5..cc840d2 100644 --- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml +++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml @@ -116,6 +116,7 @@ <if test="description != null and description != ''">and a.icdname like concat('%', #{description}, '%') </if> </where> + order by a.create_time desc </select> <select id="selectSvyLibTemplateBySvyid" parameterType="Long" resultMap="SvyLibTemplateResult"> -- Gitblit v1.9.3