From aac8c6923e0a8d112b7ef278369d1c905b117351 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Fri, 2 Aug 2024 18:00:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SignPatientManageRouteNode.java | 23 ++++++-- .../SignPatientManageRouteServiceImpl.java | 8 +-- ...SignPatientManageRouteNodeServiceImpl.java | 37 ++++++++---- .../impl/SpecialDiseaseRouteServiceImpl.java | 2 +- .../vo/manualfollowup/ManualFollowUpVO.java | 2 +- .../vo/signpatientmanageroute/PhonePush.java | 2 +- .../SignPatientManageRouteNodeInfoVo.java | 2 +- .../SignPatientTaskVo.java | 2 +- .../SignPatientManageRouteMapper.xml | 10 ++-- .../SignPatientManageRouteNodeMapper.xml | 59 +++++++++++++------ 10 files changed, 99 insertions(+), 48 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java index c6927d94..e9640dfc 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java @@ -86,10 +86,10 @@ public class SignPatientManageRouteNode extends BaseEntity { @Excel(name = "电话推送标识,0:未开启,1:已开启") private Integer phonePushSign; - /** 电话话术表id */ - @ApiModelProperty(value = "电话话术表id") - @Excel(name = "电话话术表id") - private Long phoneId; + /** 话术表 ID */ + @ApiModelProperty(value = "话术表 ID") + @Excel(name = "话术表 ID") + private Long scriptInfoId; /** 电话模板ID */ @ApiModelProperty(value = "电话模板ID") @@ -182,6 +182,11 @@ public class SignPatientManageRouteNode extends BaseEntity { @Excel(name = "短信模板表id") private Long messageTemplateId; + /** 第三方短信模板编码 */ + @ApiModelProperty(value = "第三方短信模板编码") + @Excel(name = "第三方短信模板编码") + private String messageTemplateCode; + /** 短信模板名称 */ @ApiModelProperty(value = "短信模板名称") @Excel(name = "短信模板名称") @@ -207,6 +212,11 @@ public class SignPatientManageRouteNode extends BaseEntity { @Excel(name = "公众号模板表id") private Long officialTemplateId; + /** 公众号官方模板编码 */ + @ApiModelProperty(value = "公众号官方模板编码") + @Excel(name = "公众号官方模板编码") + private String officialTemplateCode; + /** 公众号模板名称 */ @ApiModelProperty(value = "公众号模板名称") @Excel(name = "公众号模板名称") @@ -232,6 +242,11 @@ public class SignPatientManageRouteNode extends BaseEntity { @Excel(name = "小程序模板表id") private Long appletTemplateId; + /** 小程序模板编码(微信方) */ + @ApiModelProperty(value = "小程序模板编码(微信方)") + @Excel(name = "小程序模板编码(微信方)") + private String appletTemplateCode; + /** 小程序模板名称 */ @ApiModelProperty(value = "小程序模板名称") @Excel(name = "小程序模板名称") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java index ec016b8f..c001d1d8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java @@ -696,7 +696,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout break; // 话术 case TaskNodeTypeConstants.PHONE_OUTBOUND: - manageRouteNode.setPhoneId(node.getScriptInfoId()); + manageRouteNode.setScriptInfoId(node.getScriptInfoId()); // 查询话术 ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getScriptInfoId()); if (ObjectUtils.isNotEmpty(scriptInfo)) { @@ -742,8 +742,8 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout // 电话外呼 case TaskNodeTypeConstants.PHONE_OUTBOUND: // 电话外呼分为话术和问卷两种,根据模板id判断选择的哪种模板 - if (manageNode.getPhoneId() != null) { // 话术 - ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(manageNode.getPhoneId()); + if (manageNode.getScriptInfoId() != null) { // 话术 + ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(manageNode.getScriptInfoId()); if (ObjectUtils.isNotEmpty(scriptInfo)) { // 话术库json内容替换 manageNode.setPhoneNodeContent(signPatientManageRouteNodeService.getFlowScheme(scriptInfo.getFlowScheme(), labelFieldContentList)); @@ -936,7 +936,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout SignPatientManageRouteNode signPatientManageRouteNode = new SignPatientManageRouteNode(); if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.PHONE_OUTBOUND.getInfo().equals(routeNode.getTaskNodeType())) { signPatientManageRouteNode.setPhonePushSign(Objects.isNull(routeNode.getPhonePushSign()) ? null : routeNode.getPhonePushSign()); - signPatientManageRouteNode.setPhoneId(Objects.isNull(routeNode.getPhoneId()) ? null : routeNode.getPhoneId()); + signPatientManageRouteNode.setScriptInfoId(Objects.isNull(routeNode.getScriptInfoId()) ? null : routeNode.getScriptInfoId()); signPatientManageRouteNode.setPhoneTemplateId(Objects.isNull(routeNode.getPhoneTemplateId()) ? null : routeNode.getPhoneTemplateId()); signPatientManageRouteNode.setPhoneTemplateName(StringUtils.isBlank(routeNode.getPhoneTemplateName()) ? null : routeNode.getPhoneTemplateName()); signPatientManageRouteNode.setPhoneNodeContent(StringUtils.isBlank(routeNode.getPhoneNodeContent()) ? null : routeNode.getPhoneNodeContent()); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index f1fb6797..bde679d2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -167,7 +167,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage retVo.setTemplateType(TemplateTypeConstants.PROPAGANDA); } else if (StringUtils.isNotBlank(node.getPhoneTemplateId())) { // 话术 - ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getPhoneId()); + ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getScriptInfoId()); detailInfo = JSONObject.parseObject(JSONObject.toJSONString(scriptInfo)); retVo.setTemplateType(TemplateTypeConstants.SCRIPT); } else if (node.getQuestionInfoId() != null) { @@ -310,7 +310,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage retVo.setTemplateType(TemplateTypeConstants.PROPAGANDA); } else if (StringUtils.isNotBlank(node.getPhoneTemplateId())) { // 话术 - ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getPhoneId()); + ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getScriptInfoId()); detailInfo = JSONObject.parseObject(JSONObject.toJSONString(scriptInfo)); retVo.setTemplateType(TemplateTypeConstants.SCRIPT); } else if (node.getQuestionInfoId() != null) { @@ -351,8 +351,8 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage JSONObject detailInfo = new JSONObject(); switch (node.getTaskNodeType()) { case TaskNodeTypeConstants.PHONE_OUTBOUND: // 电话外呼-查询话术表 - if (node.getPhoneId() != null) { - ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getPhoneId()); + if (node.getScriptInfoId() != null) { + ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getScriptInfoId()); detailInfo = JSONObject.parseObject(JSONObject.toJSONString(scriptInfo)); } else if (node.getQuestionInfoId() != null) { // 问卷 // 查询问卷详情 @@ -732,11 +732,12 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage switch(manageNode.getTaskNodeType()) { // 电话外呼--话术/问卷,只替换话术 case TaskNodeTypeConstants.PHONE_OUTBOUND: - if (manageNode.getPhoneId() != null) { - ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(manageNode.getPhoneId()); + if (manageNode.getScriptInfoId() != null) { + ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(manageNode.getScriptInfoId()); if (ObjectUtils.isNotEmpty(scriptInfo)) { // 话术库json内容替换 manageNode.setPhoneNodeContent(getFlowScheme(scriptInfo.getFlowScheme(), labelFieldContentList)); + manageNode.setPhoneTemplateId(scriptInfo.getScriptId()); } } // 电话短信内容 @@ -751,9 +752,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage case TaskNodeTypeConstants.PROPAGANDA_ARTICLE: // 文字提醒 case TaskNodeTypeConstants.TEXT_REMIND: - // 人工随访 - //case TaskContentConstants.ARTIFICIAL_FOLLOW_UP: - // break; + break; } } // 替换短信、公众号、小程序内容 @@ -1127,7 +1126,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage break; // 话术 case TaskNodeTypeConstants.PHONE_OUTBOUND: - manageRouteNode.setPhoneId(node.getScriptInfoId()); + manageRouteNode.setScriptInfoId(node.getScriptInfoId()); // 查询话术 ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getScriptInfoId()); if (ObjectUtils.isNotEmpty(scriptInfo)) { @@ -1184,7 +1183,11 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage private void replaceTemplateInfo(SignPatientManageRouteNode manageRouteNode, SpecialDiseaseNode node, List labelFieldContentList) { if (node.getMessageTemplateId() != null) { // 替换短信模板 - manageRouteNode.setMessageNodeContent(replaceMessageInfo(node.getMessageTemplateId(), labelFieldContentList)); + TextMessage textMessage = textMessageMapper.selectTextMessageById(node.getMessageTemplateId()); + if (ObjectUtils.isNotEmpty(textMessage)) { + manageRouteNode.setMessageTemplateCode(textMessage.getTextMessageId()); + manageRouteNode.setMessageNodeContent(replaceMessageInfo(node.getMessageTemplateId(), labelFieldContentList)); + } } if (node.getPhoneMessageTemplateId() != null) { // 替换短信模板 @@ -1192,11 +1195,19 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage } // 替换公众号模板 if (node.getOfficialPushSign() != null && node.getOfficialPushSign() == 1) { - manageRouteNode.setOfficialNodeContent(replaceWeChatTemplate(node.getOfficialTemplateId(), labelFieldContentList)); + WechatTemplate wechatTemplate = wechatTemplateMapper.selectWechatTemplateById(node.getOfficialTemplateId()); + if (ObjectUtils.isNotEmpty(wechatTemplate)) { + manageRouteNode.setOfficialTemplateCode(wechatTemplate.getTemplateId()); + manageRouteNode.setOfficialNodeContent(replaceWeChatTemplate(node.getOfficialTemplateId(), labelFieldContentList)); + } } // 替换小程序模板 if (node.getAppletPushSign() != null && node.getAppletPushSign() == 1) { - manageRouteNode.setAppletNodeContent(replaceWeChatTemplate(node.getAppletTemplateId(), labelFieldContentList)); + WechatTemplate wechatTemplate = wechatTemplateMapper.selectWechatTemplateById(node.getOfficialTemplateId()); + if (ObjectUtils.isNotEmpty(wechatTemplate)) { + manageRouteNode.setAppletTemplateCode(wechatTemplate.getTemplateId()); + manageRouteNode.setAppletNodeContent(replaceWeChatTemplate(node.getAppletTemplateId(), labelFieldContentList)); + } } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java index 857d0016..ba525eb4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java @@ -342,7 +342,7 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi break; // 话术 case TaskNodeTypeConstants.PHONE_OUTBOUND: - manageRouteNode.setPhoneId(node.getScriptInfoId()); + manageRouteNode.setScriptInfoId(node.getScriptInfoId()); // 查询话术 ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getScriptInfoId()); if (ObjectUtils.isNotEmpty(scriptInfo)) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/manualfollowup/ManualFollowUpVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/manualfollowup/ManualFollowUpVO.java index 6404fdc9..3f016e22 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/manualfollowup/ManualFollowUpVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/manualfollowup/ManualFollowUpVO.java @@ -137,7 +137,7 @@ public class ManualFollowUpVO { private Long followTemplateId; @ApiModelProperty(value = "电话话术表id") - private Long phoneId; + private Long scriptInfoId; @ApiModelProperty(value = "任务节点类型,电话外呼:PHONE_OUTBOUND,问卷量表:QUESTIONNAIRE_SCALE,宣教文章:PROPAGANDA_ARTICLE,文字提醒:TEXT_REMIND") private String taskNodeType; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java index 18e1fa9f..d246870d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java @@ -31,7 +31,7 @@ public class PhonePush { private Integer phonePushSign; @ApiModelProperty(value = "电话话术表id") - private Long phoneId; + private Long scriptInfoId; @ApiModelProperty(value = "电话模板ID") private String phoneTemplateId; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/SignPatientManageRouteNodeInfoVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/SignPatientManageRouteNodeInfoVo.java index 55187ea6..bfa8229a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/SignPatientManageRouteNodeInfoVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/SignPatientManageRouteNodeInfoVo.java @@ -73,7 +73,7 @@ public class SignPatientManageRouteNodeInfoVo { /** 电话话术表id */ @ApiModelProperty(value = "电话话术表id") @Excel(name = "电话话术表id") - private Long phoneId; + private Long scriptInfoId; /** 电话模板ID */ @ApiModelProperty(value = "电话模板ID") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/SignPatientTaskVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/SignPatientTaskVo.java index 7c7b7279..0f174b6c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/SignPatientTaskVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/SignPatientTaskVo.java @@ -88,7 +88,7 @@ public class SignPatientTaskVo { /** 电话话术表id */ @ApiModelProperty(value = "电话话术表id") @Excel(name = "电话话术表id") - private Long phoneId; + private Long scriptInfoId; /** 电话模板ID */ @ApiModelProperty(value = "电话模板ID") diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml index 272788f9..fdb8cbec 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml @@ -69,7 +69,7 @@ - + @@ -229,7 +229,7 @@ spmrn.second_classify_describe, spmrn.execute_time, spmrn.phone_push_sign, - spmrn.phone_id, + spmrn.script_info_id, spmrn.phone_template_id, spmrn.phone_template_name, spmrn.phone_node_content, @@ -330,10 +330,10 @@ WHEN spmrn.task_node_type = 'QUESTIONNAIRE_SCALE' THEN spmrn.questionnaire_name END AS 'templateName', CASE - WHEN spmrn.task_node_type = 'PHONE_OUTBOUND' THEN spmrn.phone_id + WHEN spmrn.task_node_type = 'PHONE_OUTBOUND' THEN spmrn.script_info_id WHEN spmrn.task_node_type = 'QUESTIONNAIRE_SCALE' THEN spmrn.question_info_id END AS 'templateId', - spmrn.phone_id, + spmrn.script_info_id, spmrn.follow_template_id, spmrn.node_execute_status, spmrn.route_handle_remark @@ -615,7 +615,7 @@ spmrn.route_node_name, spmrn.phone_push_sign, spmrn.route_node_day, - spmrn.phone_id, + spmrn.script_info_id, spmrn.phone_template_id, spmrn.phone_template_name, spmrn.phone_node_content, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index 569f1410..80d293b6 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -18,7 +18,7 @@ - + @@ -37,16 +37,19 @@ + + + @@ -80,7 +83,7 @@ - select id, manage_route_id, manage_route_name, route_node_id, route_node_name, route_node_day, task_type, task_status, task_subdivision, task_node_type, second_classify_describe, execute_time, phone_push_sign, phone_id, phone_template_id, phone_template_name, phone_node_content, phone_redial_times, phone_time_interval, phone_message_remind, phone_message_template_id, phone_message_template_name,phone_message_template_content,question_info_id, questionnaire_name, questionnaire_content, question_expiration_date, propaganda_info_id, propaganda_title, propaganda_content, message_push_sign, message_template_id, message_template_name, message_preview, message_node_content, official_push_sign, official_template_id, official_template_name, official_remind_content, official_node_content, follow_template_id, follow_template_name, applet_push_sign, applet_template_id, applet_template_name, applet_remind_content, applet_prompt_description, applet_node_content, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark, route_handle_id, route_handle_person, route_link,text_remind_content, node_content,message_status, del_flag, create_by, create_time, update_by, update_time, phone_dial_method, phone_node_execute_result_status, message_node_execute_result_status, official_node_execute_result_status, applet_node_execute_result_status, node_finish_date from sign_patient_manage_route_node + select id, manage_route_id, manage_route_name, route_node_id, route_node_name, route_node_day, task_type, task_status, task_subdivision, task_node_type, second_classify_describe, execute_time, phone_push_sign, script_info_id, phone_template_id, phone_template_name, phone_node_content, phone_redial_times, phone_time_interval, phone_message_remind, phone_message_template_id, phone_message_template_name,phone_message_template_content,question_info_id, questionnaire_name, questionnaire_content, question_expiration_date, propaganda_info_id, propaganda_title, propaganda_content, message_push_sign, message_template_id, message_template_code, message_template_name, message_preview, message_node_content, official_push_sign, official_template_id, official_template_code, official_template_name, official_remind_content, official_node_content, follow_template_id, follow_template_name, applet_push_sign, applet_template_id, applet_template_code, applet_template_name, applet_remind_content, applet_prompt_description, applet_node_content, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark, route_handle_id, route_handle_person, route_link,text_remind_content, node_content,message_status, del_flag, create_by, create_time, update_by, update_time, phone_dial_method, phone_node_execute_result_status, message_node_execute_result_status, official_node_execute_result_status, applet_node_execute_result_status, node_finish_date from sign_patient_manage_route_node select node.id, node.manage_route_id, node.manage_route_name, node.route_node_id, node.route_node_name, node.route_node_day, node.task_type, - node.task_status, node.task_subdivision,node.second_classify_describe, node.execute_time, node.phone_push_sign, node.phone_id, + node.task_status, node.task_subdivision,node.second_classify_describe, node.execute_time, node.phone_push_sign, node.script_info_id, node.phone_template_id, node.phone_template_name, node.phone_node_content, node.phone_redial_times, node.phone_time_interval, node.phone_message_remind, node.phone_message_template_id, node.phone_message_template_name,node.phone_message_template_content, node.question_info_id, node.questionnaire_name, node.questionnaire_content, node.question_expiration_date, node.propaganda_info_id, node.propaganda_title, node.propaganda_content,node.follow_template_id, node.follow_template_name, - node.message_push_sign, node.message_template_id, node.message_template_name,node.message_preview, node.message_node_content, - node.official_push_sign, node.official_template_id, node.official_template_name, node.official_remind_content, node.official_node_content, - node.applet_push_sign, node.applet_template_id, node.applet_template_name, node.applet_remind_content, node.applet_prompt_description, node.applet_node_content, + node.message_push_sign, node.message_template_id, node.message_template_code, node.message_template_name,node.message_preview, node.message_node_content, + node.official_push_sign, node.official_template_id, node.official_template_code, node.official_template_name, node.official_remind_content, node.official_node_content, + node.applet_push_sign, node.applet_template_id, node.applet_template_code, node.applet_template_name, node.applet_remind_content, node.applet_prompt_description, node.applet_node_content, node.route_check_status, node.route_check_person, node.route_check_date, node.route_check_remark, node.route_node_remark, node.node_execute_status, node.route_handle_remark, node.route_handle_id, node.route_handle_person, node.route_link,node.text_remind_content,node.node_content,node.phone_dial_method,node.task_node_type from sign_patient_manage_route_node node @@ -231,7 +234,7 @@ phone_push_sign, - phone_id, + script_info_id, phone_template_id, @@ -269,6 +272,8 @@ message_template_id, + message_template_code, + message_template_name, message_preview, @@ -279,6 +284,8 @@ official_template_id, + official_template_code, + official_template_name, official_remind_content, @@ -289,6 +296,8 @@ applet_template_id, + applet_template_code, + applet_template_name, applet_remind_content, @@ -365,7 +374,7 @@ #{phonePushSign}, - #{phoneId}, + #{scriptInfoId}, #{phoneTemplateId}, @@ -403,6 +412,8 @@ #{messageTemplateId}, + #{messageTemplateCode}, + #{messageTemplateName}, #{messagePreview}, @@ -413,6 +424,8 @@ #{officialTemplateId}, + #{officialTemplateCode}, + #{officialTemplateName}, #{officialRemindContent}, @@ -423,6 +436,8 @@ #{appletTemplateId}, + #{appletTemplateCode}, + #{appletTemplateName}, #{appletRemindContent}, @@ -477,20 +492,21 @@ insert into sign_patient_manage_route_node(manage_route_id, manage_route_name, route_node_id, route_node_name, route_node_day, task_type, task_status, task_subdivision, task_node_type, second_classify_describe, - execute_time, phone_push_sign, phone_id, phone_template_id, phone_template_name, phone_node_content, phone_redial_times, phone_time_interval, phone_message_remind, phone_message_template_id, + execute_time, phone_push_sign, script_info_id, phone_template_id, phone_template_name, phone_node_content, phone_redial_times, phone_time_interval, phone_message_remind, phone_message_template_id, phone_message_template_name, phone_message_template_content,question_info_id, questionnaire_name, questionnaire_content, question_expiration_date, propaganda_info_id, propaganda_title, propaganda_content, message_push_sign, - message_template_id, message_template_name, message_preview, message_node_content, official_push_sign, official_template_id, official_template_name, official_remind_content, - official_node_content, applet_push_sign, applet_template_id, applet_template_name, applet_remind_content, applet_prompt_description, applet_node_content, + message_template_id, message_template_code, message_template_name, message_preview, message_node_content, official_push_sign, official_template_id, official_template_code,official_template_name, official_remind_content, + official_node_content, applet_push_sign, applet_template_id, applet_template_code, applet_template_name, applet_remind_content, applet_prompt_description, applet_node_content, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark,phone_connect_status, route_handle_id, route_handle_person, route_link, text_remind_content,node_content, del_flag, create_by, create_time, update_by, update_time,phone_dial_method,follow_template_id, follow_template_name) values (#{item.manageRouteId},#{item.manageRouteName},#{item.routeNodeId},#{item.routeNodeName},#{item.routeNodeDay},#{item.taskType},#{item.taskStatus},#{item.taskSubdivision},#{item.taskNodeType},#{item.secondClassifyDescribe}, - #{item.executeTime},#{item.phonePushSign},#{item.phoneId},#{item.phoneTemplateId},#{item.phoneTemplateName},#{item.phoneNodeContent},#{item.phoneRedialTimes},#{item.phoneTimeInterval},#{item.phoneMessageRemind},#{item.phoneMessageTemplateId}, + #{item.executeTime},#{item.phonePushSign},#{item.scriptInfoId},#{item.phoneTemplateId},#{item.phoneTemplateName},#{item.phoneNodeContent},#{item.phoneRedialTimes},#{item.phoneTimeInterval},#{item.phoneMessageRemind},#{item.phoneMessageTemplateId}, #{item.phoneMessageTemplateName},#{item.phoneMessageTemplateContent}, - #{item.questionInfoId},#{item.questionnaireName},#{item.questionnaireContent},#{item.questionExpirationDate},#{item.propagandaInfoId},#{item.propagandaTitle},#{item.propagandaContent},#{item.messagePushSign},#{item.messageTemplateId}, - #{item.messageTemplateName},#{item.messagePreview},#{item.messageNodeContent},#{item.officialPushSign},#{item.officialTemplateId},#{item.officialTemplateName},#{item.officialRemindContent},#{item.officialNodeContent}, - #{item.appletPushSign},#{item.appletTemplateId},#{item.appletTemplateName},#{item.appletRemindContent},#{item.appletPromptDescription},#{item.appletNodeContent}, + #{item.questionInfoId},#{item.questionnaireName},#{item.questionnaireContent},#{item.questionExpirationDate},#{item.propagandaInfoId},#{item.propagandaTitle},#{item.propagandaContent},#{item.messagePushSign}, + #{item.messageTemplateId}, #{item.messageTemplateCode}, + #{item.messageTemplateName},#{item.messagePreview},#{item.messageNodeContent},#{item.officialPushSign},#{item.officialTemplateId},#{item.officialTemplateCode},#{item.officialTemplateName},#{item.officialRemindContent},#{item.officialNodeContent}, + #{item.appletPushSign},#{item.appletTemplateId},#{item.appletTemplateCode},#{item.appletTemplateName},#{item.appletRemindContent},#{item.appletPromptDescription},#{item.appletNodeContent}, #{item.routeCheckStatus},#{item.routeCheckPerson},#{item.routeCheckDate},#{item.routeCheckRemark},#{item.routeNodeRemark},#{item.nodeExecuteStatus},#{item.routeHandleRemark},#{item.phoneConnectStatus}, #{item.routeHandleId},#{item.routeHandlePerson},#{item.routeLink},#{item.textRemindContent},#{item.nodeContent},0,#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.phoneDialMethod},#{item.followTemplateId},#{item.followTemplateName}) @@ -534,8 +550,8 @@ phone_push_sign = #{phonePushSign}, - phone_id = - #{phoneId}, + script_info_id = + #{scriptInfoId}, phone_template_id = #{phoneTemplateId}, @@ -591,6 +607,9 @@ message_template_id = #{messageTemplateId}, + message_template_code = + #{messageTemplateCode}, + message_template_name = #{messageTemplateName}, @@ -606,6 +625,9 @@ official_template_id = #{officialTemplateId}, + official_template_code = + #{officialTemplateCode}, + official_template_name = #{officialTemplateName}, @@ -621,6 +643,9 @@ applet_template_id = #{appletTemplateId}, + applet_template_code = + #{appletTemplateCode}, + applet_template_name = #{appletTemplateName},