研究队列bug修复

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/controller/vo/BizReasearchQueueVO.java

@@ -12,6 +12,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -51,6 +52,11 @@ public class BizReasearchQueueVO implements Serializable {
     private Date createTime;
 
     /** 队列状态 */
-    @ApiModelProperty(value = "当前状态", position = 6)
+    @ApiModelProperty(value = "当前状态", position = 7)
     private String status;
+
+    /** 推送时间点 */
+    @ApiModelProperty(value = "推送时间点", position = 8)
+    @TableField(typeHandler = JsonbReasearchPushPointListTypeHandler.class)
+    private List<BizReasearchPushPointEntity> timePoints;
 }

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizReasearchQueueMapper.xml

@@ -13,6 +13,7 @@
         <result property="clinicCount" column="clinic_count" />
         <result property="createTime" column="create_time" />
         <result property="status" column="status" />
+        <result property="timePoints" column="time_points" typeHandler="cn.tr.module.smart.common.config.handler.JsonbReasearchPushPointListTypeHandler"/>
     </resultMap>
 
 
@@ -25,7 +26,8 @@
         brq.time_points_show as time_points_show,
         brq.clinic_count as clinic_count,
         brq.create_time as create_time,
-        brq.status as  status
+        brq.status as  status,
+        brq.time_points as time_points
         FROM
         biz_reasearch_queue as brq
         left join biz_question_group as bqg on brq.bind_question_id = bqg.id
@@ -55,7 +57,8 @@
         brq.time_points_show as time_points_show,
         brq.clinic_count as clinic_count,
         brq.create_time as create_time,
-        brq.status as  status
+        brq.status as  status,
+        brq.time_points as time_points
         FROM
         biz_reasearch_queue as brq
         left join biz_question_group as bqg on brq.bind_question_id = bqg.id