短信微信列表修改

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")

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;
 }

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<TextMessageSuitTask> suitTaskList;
 
+    /**
+     * 短信模版code（手动创建人任务使用）
+     */
+    private String messageTemplateCode;
 }

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 ;
 }

postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml

@@ -32,6 +32,7 @@
         <result column="disease_type_name" property="diseaseTypeName"/>
         <result column="text_message_name" property="textMessageName"/>
         <result column="text_message_id" property="textMessageId"/>
+        <result column="messageTemplateCode" property="messageTemplateCode"/>
         <result column="text_message_content" property="textMessageContent"/>
         <result column="text_message_channel" property="textMessageChannel"/>
         <result column="text_message_status" property="textMessageStatus"/>
@@ -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,

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