From 124f72ec02d2124cabd2f9e028b3c8f5972b08ba Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 5 Aug 2024 17:47:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=BE=AE=E4=BF=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SignPatientManageRouteController.java | 2 +- .../manage/vo/textmessage/TextMessageTaskVO.java | 5 +++++ .../xinelu/manage/vo/textmessage/TextMessageVO.java | 4 ++++ .../vo/wechattemplate/WechatTemplateTaskVO.java | 12 ++++++++++++ .../mapper/manage/textmessage/TextMessageMapper.xml | 2 ++ .../manage/wechattemplate/WechatTemplateMapper.xml | 8 +++++++- 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientmanageroute/SignPatientManageRouteController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientmanageroute/SignPatientManageRouteController.java index b4ba0545..cc4d163c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientmanageroute/SignPatientManageRouteController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientmanageroute/SignPatientManageRouteController.java @@ -78,7 +78,7 @@ public class SignPatientManageRouteController extends BaseController { } /** - * 新增签约患者管理任务路径 + * 新增签约患者管理任务路径（手动创建任务） */ @Log(title = "签约患者管理任务路径", businessType = BusinessType.INSERT) @PostMapping("/add") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/textmessage/TextMessageTaskVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/textmessage/TextMessageTaskVO.java index 6b90e046..8feb8f93 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/textmessage/TextMessageTaskVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/textmessage/TextMessageTaskVO.java @@ -117,4 +117,9 @@ public class TextMessageTaskVO { */ @ApiModelProperty(value = "适用任务类型字典表ids") private Long[] suitTaskTypeIds; + + /** + * 短信模版code（手动创建人任务使用） + */ + private String messageTemplateCode; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/textmessage/TextMessageVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/textmessage/TextMessageVO.java index f5c0ca61..57052560 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/textmessage/TextMessageVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/textmessage/TextMessageVO.java @@ -118,4 +118,8 @@ public class TextMessageVO extends BaseEntity { @ApiModelProperty(value = "短信模板适用任务类型列表") private List suitTaskList; + /** + * 短信模版code（手动创建人任务使用） + */ + private String messageTemplateCode; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/wechattemplate/WechatTemplateTaskVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/wechattemplate/WechatTemplateTaskVO.java index 3a03365b..0e157773 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/wechattemplate/WechatTemplateTaskVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/wechattemplate/WechatTemplateTaskVO.java @@ -107,4 +107,16 @@ public class WechatTemplateTaskVO { */ @ApiModelProperty(value = "适用任务类型字典表ids") private Long[] suitTaskTypeIds; + + /** + * 微信模板ID (手动创建任务使用) + */ + @ApiModelProperty(value = "模板ID") + private String appletTemplateCode; + + /** + * 公众号模板ID (手动创建任务使用) + */ + @ApiModelProperty(value = "模板ID") + private String officialTemplateCode ; } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml index 05a0e748..b0a4b3f3 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml @@ -32,6 +32,7 @@ + @@ -106,6 +107,7 @@ tm.disease_type_name, tm.text_message_name, tm.text_message_id, + tm.text_message_id messageTemplateCode, tm.text_message_content, tm.text_message_channel, tm.text_message_status, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml index 05d48aa7..09bee0fb 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml @@ -123,11 +123,17 @@ wt.disease_type_name, wt.wechat_template_name, wt.template_id, + CASE + WHEN wt.template_source = 'WE_CHAT_APPLET' THEN wt.template_id + END AS appletTemplateCode, + CASE + WHEN wt.template_source = 'WE_CHAT_OFFICIAL_ACCOUNT' THEN wt.template_id + END AS officialTemplateCode, wt.template_content, wt.template_source, wt.template_sort, wt.template_remark, - wt.source_template_id, + wt.source_template_id, IFNULL(MAX(wtst.id), 0) AS taskId, GROUP_CONCAT(wtst.suit_task_type_name SEPARATOR ',') as suitTaskTypeName from wechat_template wt