Merge branch 'fixbug-zcy' into 'master'

fix bug 1020723

See merge request rays/pcloud-book!438

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

@@ -58,17 +58,17 @@
   </select>
 
   <delete id="cancelSend">
-    update time_control_task_send set send_state = #{sendState}, update_time = now()
+    update time_control_task_send set send_state = #{sendState}, update_time = now(), working = 0
     where subscribe_id = #{subscribeId} and send_state = 0
   </delete>
 
   <delete id="cancelSendByTaskId">
-    update time_control_task_send set send_state = 2, update_time = now()
+    update time_control_task_send set send_state = 2, update_time = now(), working = 0
     where task_id = #{taskId} and send_state = 0
   </delete>
 
   <delete id="cancelSendByItemId">
-    update time_control_task_send set send_state = 2, update_time = now()
+    update time_control_task_send set send_state = 2, update_time = now(), working = 0
     where task_item_id = #{taskItemId} and send_state = 0
   </delete>
 

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

@@ -23,12 +23,12 @@
   </update>
 
   <update id="unSubscribeTask">
-    UPDATE time_control_task_subscribe set state = #{state}, update_time = now(), working = 0
+    UPDATE time_control_task_subscribe set state = #{state}, update_time = now()
     where id = #{id}
   </update>
 
   <update id="unSubscribeTaskByTaskId">
-    UPDATE time_control_task_subscribe set state = 0, update_time = now(), working = 0
+    UPDATE time_control_task_subscribe set state = 0, update_time = now()
     where task_id = #{taskId}
   </update>