Commit 673b2271 by 徐高华

通知画布

parent 36fd147c
...@@ -745,6 +745,8 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService { ...@@ -745,6 +745,8 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
String failRemark = qdto.getFailRemark() ; String failRemark = qdto.getFailRemark() ;
Date sendTime = qdto.getSendTime() ; Date sendTime = qdto.getSendTime() ;
this.groupChatPlanOwnerLogMapper.staffSendResult(staffId,planId,sendTime,failRemark) ; this.groupChatPlanOwnerLogMapper.staffSendResult(staffId,planId,sendTime,failRemark) ;
GroupChatPlanOwnerLogDTO dto = this.groupChatPlanOwnerLogService.getOwnerInfo(planId,staffId,null,wxEnterpriseId) ;
this.updateMsgid(dto);
} }
public void addOrDelTimer(Long planId, Date sendTime, int status) { public void addOrDelTimer(Long planId, Date sendTime, int status) {
...@@ -840,6 +842,9 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService { ...@@ -840,6 +842,9 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
private void updateMsgid(GroupChatPlanOwnerLogDTO dto) { private void updateMsgid(GroupChatPlanOwnerLogDTO dto) {
try{ try{
if(null == dto) {
return;
}
Long ownerLogId = dto.getOwnerLogId() ; Long ownerLogId = dto.getOwnerLogId() ;
String staffId = dto.getStaffId() ; String staffId = dto.getStaffId() ;
Date sendTime = dto.getSendTime() ; Date sendTime = dto.getSendTime() ;
......
...@@ -159,21 +159,47 @@ ...@@ -159,21 +159,47 @@
</if> </if>
order by a.create_time , a.owner_log_id order by a.create_time , a.owner_log_id
</select> </select>
<select id="getOwnerInfo" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
select
a.owner_log_id ownerLogId ,
b.plan_id planId ,
b.name planName ,
b.exec_type execType ,
a.staff_id staffId ,
a.clerk_id clerkId ,
a.store_id storeId ,
a.send_status sendStatus ,
a.send_count sendCount ,
a.fail_count failCount ,
a.send_time sendTime ,
a.create_time createTime ,
b.end_time expireDate ,
b.end_time endTime ,
b.start_time startTime ,
a.done_flag doneFlag ,
a.msgid msgid
from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id
where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId} and b.delete_flag = 0 and a.staff_id = #{staffId}
<if test="null != clerkId">
and a.clerk_id = #{clerkId}
</if>
</select>
<select id="listOwnerLogPageForWxaTotal" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.ChatOwnerTotalDTO"> <select id="listOwnerLogPageForWxaTotal" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.ChatOwnerTotalDTO">
select select
b.plan_id planId , b.plan_id planId ,
b.name planName , b.name planName ,
b.start_time startTime , b.start_time startTime ,
b.end_time endTime , b.end_time endTime ,
b.exec_type execType , b.exec_type execType ,
<!-- 已发送 --> <!-- 已发送 -->
SUM(CASE a.send_status WHEN 2 THEN 1 ELSE 0 END ) sendCount, SUM(CASE a.send_status WHEN 2 THEN 1 ELSE 0 END ) sendCount,
<!-- 待发送 --> <!-- 待发送 -->
SUM(CASE a.send_status WHEN 1 THEN 1 ELSE 0 END ) notSendCount SUM(CASE a.send_status WHEN 1 THEN 1 ELSE 0 END ) notSendCount
from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id
where where
a.wx_enterprise_id = #{wxEnterpriseId} and b.delete_flag = 0 a.wx_enterprise_id = #{wxEnterpriseId} and b.delete_flag = 0
<if test="null != storeId"> <if test="null != storeId">
and a.store_id = #{storeId} and a.store_id = #{storeId}
...@@ -196,17 +222,17 @@ ...@@ -196,17 +222,17 @@
group by b.plan_id group by b.plan_id
order by b.end_time desc , a.create_time desc order by b.end_time desc , a.create_time desc
</select> </select>
<select id="listOwnerLogPageForWxa" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO"> <select id="listOwnerLogPageForWxa" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
select select
a.owner_log_id ownerLogId , a.owner_log_id ownerLogId ,
b.plan_id planId , b.plan_id planId ,
b.name planName , b.name planName ,
a.staff_id staffId , a.staff_id staffId ,
a.clerk_id clerkId , a.clerk_id clerkId ,
a.store_id storeId , a.store_id storeId ,
a.send_status sendStatus , a.send_status sendStatus ,
a.send_count sendCount , a.send_count sendCount ,
a.fail_count failCount , a.fail_count failCount ,
a.send_time sendTime , a.send_time sendTime ,
a.create_time createTime , a.create_time createTime ,
...@@ -214,8 +240,8 @@ ...@@ -214,8 +240,8 @@
b.end_time endTime , b.end_time endTime ,
b.start_time startTime , b.start_time startTime ,
a.done_flag doneFlag , a.done_flag doneFlag ,
a.msgid msgid a.msgid msgid
from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id
where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId} and b.delete_flag = 0 where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId} and b.delete_flag = 0
<if test="null != storeId"> <if test="null != storeId">
and a.store_id = #{storeId} and a.store_id = #{storeId}
...@@ -228,30 +254,6 @@ ...@@ -228,30 +254,6 @@
</if> </if>
order by a.create_time desc , a.owner_log_id order by a.create_time desc , a.owner_log_id
</select> </select>
<select id="getOwnerInfo" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
select
a.owner_log_id ownerLogId ,
b.plan_id planId ,
b.name planName ,
b.exec_type execType ,
a.staff_id staffId ,
a.clerk_id clerkId ,
a.store_id storeId ,
a.send_status sendStatus ,
a.send_count sendCount ,
a.fail_count failCount ,
a.send_time sendTime ,
a.create_time createTime ,
b.end_time expireDate ,
b.end_time endTime ,
b.start_time startTime ,
a.done_flag doneFlag ,
a.msgid msgid
from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id
where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId} and b.delete_flag = 0 and a.staff_id = #{staffId}
and a.clerk_id = #{clerkId}
</select>
<select id="getTotalCount" resultType="java.lang.Integer"> <select id="getTotalCount" resultType="java.lang.Integer">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment