Merge branch 'feat-1002341' into 'master'

消息配置支持同一天

See merge request rays/pcloud-book!398

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/biz/impl/TaskBizImpl.java

@@ -165,10 +165,10 @@ public class TaskBizImpl implements TaskBiz {
             throw new WechatGroupBizException(WechatGroupBizException.ERROR, "至多填写3条任务提醒");
         }
         //检验是否存在当天定时任务
-        TimeControlTaskItem item = taskItemMapper.getByTaskIdAndDay(taskId, startDay);
+        /*TimeControlTaskItem item = taskItemMapper.getByTaskIdAndDay(taskId, startDay);
         if (null != item) {
             throw new WechatGroupBizException(WechatGroupBizException.ERROR, "已配置过当天消息!");
-        }
+        }*/
         List<CreateReplyMessageDto> completedReplyMessageList = createTaskItemDto.getCompletedReplyMessageList();
         if(null!=createTaskItemDto.getFinishConfirm() && createTaskItemDto.getFinishConfirm()==1){
             if (StringUtil.isEmpty(createTaskItemDto.getFinishLinkIntroduce())) {
@@ -184,7 +184,7 @@ public class TaskBizImpl implements TaskBiz {
                 throw new WechatGroupBizException(WechatGroupBizException.ERROR, "至多填写3条完成任务提醒");
             }
         }
-        item = new TimeControlTaskItem();
+        TimeControlTaskItem item = new TimeControlTaskItem();
         BeanUtils.copyProperties(createTaskItemDto, item);
         if (null == item.getFinishConfirm()) {
             item.setFinishConfirm(0);
@@ -253,10 +253,10 @@ public class TaskBizImpl implements TaskBiz {
             throw new WechatGroupBizException(WechatGroupBizException.ERROR, "至多填写3条任务提醒");
         }
         //检验是否存在当天定时任务
-        TimeControlTaskItem item = taskItemMapper.getByTaskIdAndDay(taskId, startDay);
+        /*TimeControlTaskItem item = taskItemMapper.getByTaskIdAndDay(taskId, startDay);
         if (null != item && !item.getId().equals(taskItemId)) {
             throw new WechatGroupBizException(WechatGroupBizException.ERROR, "已配置过当天消息!");
-        }
+        }*/
         List<CreateReplyMessageDto> completedReplyMessageList = updateTaskItemDto.getCompletedReplyMessageList();
         if(null!=updateTaskItemDto.getFinishConfirm() && updateTaskItemDto.getFinishConfirm()==1){
             if (StringUtil.isEmpty(updateTaskItemDto.getFinishLinkIntroduce())) {

pcloud-service-book/src/main/resources/mapper/timecontrol/TimeControlTaskItemMapper.xml

@@ -59,7 +59,7 @@
   <select id="listTaskItemDay" resultType="com.pcloud.book.timecontrol.dto.ReplyMessageBaseDto">
     select id, task_id taskId, start_day startDay
     from time_control_task_item where task_id = #{taskId}
-    order by startDay asc
+    order by startDay asc, send_hour asc
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >