From a4cc23f66e107648c1aa537276e295e9300637c2 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Wed, 3 Apr 2024 13:50:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A3=E6=95=99=E5=BA=93?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../propagandainfo/PropagandaInfoController.java | 9 +++++++++ .../service/propagandainfo/IPropagandaInfoService.java | 2 ++ .../propagandainfo/impl/PropagandaInfoServiceImpl.java | 9 +++++---- .../manage/propagandainfo/PropagandaInfoMapper.xml | 6 +++--- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java index f22219bc..f62a9430 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java @@ -76,6 +76,15 @@ public class PropagandaInfoController extends BaseController { return R.ok(propagandaInfoService.selectPropagandaInfoById(id)); } + /** + * 获取宣教库管理信息 + */ + @ApiOperation("根据id获取宣教库管理信息") + @PreAuthorize("@ss.hasPermi('manage:propaganda:query')") + @GetMapping(value = "getById/{id}") + public R getById(@PathVariable("id") Long id) { + return R.ok(propagandaInfoService.getById(id)); + } /** * 新增宣教库管理 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java index 155e8168..9a5a92ea 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java @@ -23,6 +23,8 @@ public interface IPropagandaInfoService { */ public PropagandaMaterialsVo selectPropagandaInfoById(Long id); + PropagandaInfo getById(Long id); + /** * 查询宣教库管理列表 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java index 9d0bf02d..16bef88d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java @@ -8,7 +8,6 @@ import com.xinelu.manage.domain.propagandamaterials.PropagandaMaterials; import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto; import com.xinelu.manage.dto.propagandainfo.PropagandaInfoSaveDto; import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto; -import com.xinelu.manage.mapper.materialsinfo.MaterialsInfoMapper; import com.xinelu.manage.mapper.propagandainfo.PropagandaInfoMapper; import com.xinelu.manage.mapper.propagandamaterials.PropagandaMaterialsMapper; import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; @@ -33,8 +32,6 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService { private PropagandaInfoMapper propagandaInfoMapper; @Resource private PropagandaMaterialsMapper propagandaMaterialsMapper; - @Resource - private MaterialsInfoMapper materialsInfoMapper; /** * 查询宣教库管理 @@ -47,7 +44,11 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService { return propagandaInfoMapper.selectPropagandaInfo(id); } - /** + @Override public PropagandaInfo getById(Long id) { + return propagandaInfoMapper.selectPropagandaInfoById(id); + } + + /** * 查询宣教库管理列表 * * @param propagandaInfo 宣教库管理 diff --git a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml index 2d9f1310..3b8e69d2 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml @@ -109,10 +109,10 @@ p.article_summary, voicebroadcast, disease_type_id, disease_type_name, propaganda_link, p.propaganda_barcode_path, pm.materials_id, m.id, m.materials_name, m.materials_type, m.materials_option, m.materials_file_path, m.video_cover_type, - m.video_cover_file_path from propaganda_materials pm - left join propaganda_info p on pm.propaganda_id = p.id + m.video_cover_file_path from propaganda_info p + left join propaganda_materials pm on pm.propaganda_id = p.id left join materials_info m on m.id = pm.materials_id - where p.id = #{id} + where p.id = #{id} and pm.del_flag = 0