From c7670c21fbb97223b91b75b83a8d5db4ffc5d3a9 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 12 Jul 2024 11:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=86=E5=88=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/taskpartitiondict/TaskPartitionDict.java | 8 ++++++-- .../taskpartitiondict/TaskPartitionDictMapper.xml | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java index 1c24254a..4423073e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java @@ -109,10 +109,14 @@ public class TaskPartitionDict extends BaseEntity { * PHONE_OUTBOUND:电话外呼(默认自动。人工或自动); QUESTIONNAIRE_SCALE:问卷量表(消息推送或人工随访); * PROPAGANDA_ARTICLE:宣教文章; TEXT_REMIND:文字提醒(微信、短信、公众号) */ - @ApiModelProperty(value = "节点类型,PHONE_OUTBOUND:电话外呼(默认自动。人工或自动);QUESTIONNAIRE_SCALE:问卷量表(消息推送或人工随访);\n" - + "PROPAGANDA_ARTICLE:宣教文章;TEXT_REMIND:文字提醒(微信、短信、公众号)") + @ApiModelProperty(value = "节点类型,PHONE_OUTBOUND:电话外呼(默认自动。人工或自动);QUESTIONNAIRE_SCALE:问卷量表(消息推送或人工随访);PROPAGANDA_ARTICLE:宣教文章;TEXT_REMIND:文字提醒(微信、短信、公众号)") private String taskNodeType; + /** + * 应用范围;PRIVATE:专用;PUBLIC:公共 + */ + private String applyRange; + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml index fcc3ca3a..893cde28 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml @@ -17,6 +17,7 @@ + @@ -36,6 +37,7 @@ task_partition_content, template_type, task_node_type, + apply_range, create_by, create_time, update_by, @@ -73,6 +75,9 @@ and template_type = #{templateType} + + and apply_range = #{applyRange} + order by task_partition_sort @@ -117,6 +122,8 @@ template_type, + apply_range, + #{taskTypeId}, @@ -149,6 +156,8 @@ #{templateType}, + #{applyRange}, + @@ -200,6 +209,9 @@ task_node_type = #{taskNodeType}, + apply_range = + #{applyRange}, + where id = #{id} @@ -228,6 +240,7 @@ tpd.second_classify_describe, tpd.execution_time, tpd.task_partition_sort, + tpd.apply_range, (SELECT count(1) from label_field_info where task_partition_dict_id = tpd.id) taskPartitionRemark from task_partition_dict tpd