Merge branch '0418_小程序开发' of http://182.92.166.109:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发
This commit is contained in:
haown
commit
070981b54d
@ -324,4 +324,11 @@ public class SignPatientManageRouteNode extends BaseEntity {
|
||||
|
||||
@ApiModelProperty(value = "默认已接通：CONNECTED；未接通:NOTCONNECTED")
|
||||
private String phoneConnectStatus;
|
||||
|
||||
/**
|
||||
* AI：自动 或 COMMON：手动
|
||||
*/
|
||||
@ApiModelProperty(value = "AI：自动 或 COMMON：手动")
|
||||
@Excel(name = "AI：自动 或 COMMON：手动")
|
||||
private String phoneDialMethod;
|
||||
}
|
||||
|
||||
@ -238,6 +238,13 @@ public class SpecialDiseaseNode extends BaseEntity {
|
||||
@Excel(name = "AL电话推送标识，0：未开启，1：已开启")
|
||||
private Integer phonePushSign;
|
||||
|
||||
/**
|
||||
* AI：自动 或 COMMON：手动
|
||||
*/
|
||||
@ApiModelProperty(value = "AI：自动 或 COMMON：手动")
|
||||
@Excel(name = "AI：自动 或 COMMON：手动")
|
||||
private String phoneDialMethod;
|
||||
|
||||
/**
|
||||
* AI电话模板表id
|
||||
*/
|
||||
|
||||
@ -68,10 +68,11 @@
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="phoneDialMethod" column="phone_dial_method"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectSignPatientManageRouteNodeVo">
|
||||
select id, manage_route_id, manage_route_name, route_node_id, route_node_name, route_node_day, task_type, task_status, task_subdivision, 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, 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 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, 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, 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 from sign_patient_manage_route_node
|
||||
</sql>
|
||||
|
||||
<select id="selectSignPatientManageRouteNodeList" parameterType="com.xinelu.manage.dto.signpatientmanageroutenode.SignPatientManageRouteNodeDto" resultMap="SignPatientManageRouteNodeResult">
|
||||
@ -108,6 +109,9 @@
|
||||
<if test="nodeExecuteStatus != null and nodeExecuteStatus != ''">
|
||||
and node_execute_status = #{nodeExecuteStatus}
|
||||
</if>
|
||||
<if test="phoneDialMethod != null and phoneDialMethod != ''">
|
||||
and phone_dial_method = #{phoneDialMethod}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
@ -150,7 +154,7 @@
|
||||
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.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.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
|
||||
from sign_patient_manage_route_node node
|
||||
left join sign_patient_manage_route route on node.manage_route_id = route.id
|
||||
<where>
|
||||
@ -316,6 +320,8 @@
|
||||
</if>
|
||||
<if test="updateTime != null">update_time,
|
||||
</if>
|
||||
<if test="phoneDialMethod != null">phone_dial_method,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="manageRouteId != null">#{manageRouteId},
|
||||
@ -442,6 +448,8 @@
|
||||
</if>
|
||||
<if test="updateTime != null">#{updateTime},
|
||||
</if>
|
||||
<if test="phoneDialMethod != null ">#{phoneDialMethod}
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<insert id="insertBatch">
|
||||
@ -451,7 +459,7 @@
|
||||
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,
|
||||
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)
|
||||
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)
|
||||
values
|
||||
<foreach collection="nodeList" item="item" separator=",">
|
||||
(#{item.manageRouteId},#{item.manageRouteName},#{item.routeNodeId},#{item.routeNodeName},#{item.routeNodeDay},#{item.taskType},#{item.taskStatus},#{item.taskSubdivision},#{item.secondClassifyDescribe},
|
||||
@ -460,7 +468,7 @@
|
||||
#{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.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.routeHandleId},#{item.routeHandlePerson},#{item.routeLink},#{item.textRemindContent},#{item.nodeContent},0,#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.phoneDialMethod})
|
||||
</foreach>
|
||||
</insert>
|
||||
<update id="updateSignPatientManageRouteNode" parameterType="SignPatientManageRouteNode">
|
||||
@ -652,6 +660,9 @@
|
||||
<if test="updateTime != null">update_time =
|
||||
#{updateTime},
|
||||
</if>
|
||||
<if test="phoneDialMethod != null ">phone_dial_method =
|
||||
#{phoneDialMethod},
|
||||
</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
@ -55,6 +55,7 @@
|
||||
<result property="appletPromptDescription" column="applet_prompt_description"/>
|
||||
<result property="appletNodeContent" column="applet_node_content"/>
|
||||
<result property="phonePushSign" column="phone_push_sign"/>
|
||||
<result property="phoneDialMethod" column="phone_dial_method"/>
|
||||
<result property="phoneTemplateId" column="phone_template_id"/>
|
||||
<result property="phoneTemplateName" column="phone_template_name"/>
|
||||
<result property="phoneMessageRemind" column="phone_message_remind"/>
|
||||
@ -106,6 +107,7 @@
|
||||
<result property="appletPromptDescription" column="applet_prompt_description"/>
|
||||
<result property="appletNodeContent" column="applet_node_content"/>
|
||||
<result property="phonePushSign" column="phone_push_sign"/>
|
||||
<result property="phoneDialMethod" column="phone_dial_method"/>
|
||||
<result property="phoneTemplateId" column="phone_template_id"/>
|
||||
<result property="phoneTemplateName" column="phone_template_name"/>
|
||||
<result property="phoneMessageRemind" column="phone_message_remind"/>
|
||||
@ -156,6 +158,7 @@
|
||||
applet_prompt_description,
|
||||
applet_node_content,
|
||||
phone_push_sign,
|
||||
phone_dial_method,
|
||||
phone_template_id,
|
||||
phone_template_name,
|
||||
phone_message_remind,
|
||||
@ -219,6 +222,9 @@
|
||||
<if test="messagePushSign != null ">
|
||||
and message_push_sign = #{messagePushSign}
|
||||
</if>
|
||||
<if test="phoneDialMethod != null ">
|
||||
and phone_dial_method = #{phoneDialMethod}
|
||||
</if>
|
||||
<if test="messageTemplateId != null ">
|
||||
and message_template__id = #{messageTemplateId}
|
||||
</if>
|
||||
@ -410,6 +416,8 @@
|
||||
</if>
|
||||
<if test="nodeContent != null">node_content,
|
||||
</if>
|
||||
<if test="phoneDialMethod != null">phone_dial_method,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="routeId != null">#{routeId},
|
||||
@ -506,6 +514,8 @@
|
||||
</if>
|
||||
<if test="nodeContent != null">#{nodeContent},
|
||||
</if>
|
||||
<if test="phoneDialMethod != null ">#{phoneDialMethod}
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@ -653,6 +663,9 @@
|
||||
<if test="nodeContent != null">node_content =
|
||||
#{nodeContent},
|
||||
</if>
|
||||
<if test="phoneDialMethod != null ">phone_dial_method =
|
||||
#{phoneDialMethod},
|
||||
</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
@ -717,7 +730,8 @@
|
||||
route_check_remark,
|
||||
node_content,
|
||||
create_by,
|
||||
create_time
|
||||
create_time,
|
||||
phone_dial_method
|
||||
) values
|
||||
<foreach item="specialDiseaseNodeList" index="index" collection="list" separator=",">
|
||||
(
|
||||
@ -767,6 +781,7 @@
|
||||
#{specialDiseaseNodeList.nodeContent},
|
||||
#{specialDiseaseNodeList.createBy},
|
||||
#{specialDiseaseNodeList.createTime}
|
||||
#{specialDiseaseNodeList.phoneDialMethod}
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
@ -837,6 +852,7 @@
|
||||
sdn.route_check_date,
|
||||
sdn.route_check_remark,
|
||||
sdn.node_content,
|
||||
sdn.phone_dial_method,
|
||||
(select COUNT(1)
|
||||
from special_disease_node
|
||||
where route_id = specialDiseaseRouteId) totalNumber,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user