suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

跟进任务列表排序

Browse Source
This commit is contained in:
zhangchenbiao
2023-08-22 14:13:17 +08:00
parent 5e85d06793
commit 8946e73112
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
View File

@@ -143,20 +143,33 @@
<select id="getTaskPage" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
a.id,
a.partner_line_id,
a.follow_user_id,
a.task_title,
a.communication_type,
a.deadline,
a.communication_content,
a.task_status,
a.finish_time,
a.deleted,
a.create_time,
a.update_time
from
hy_follow_task
hy_follow_task a
inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0'
where
deleted = '0' and follow_user_id = #{followUserId}
a.deleted = '0' and a.follow_user_id = #{followUserId}
<if test="taskStatus != null">
and task_status = #{taskStatus}
and a.task_status = #{taskStatus}
</if>
<if test="deadlineStartTime != null">
and deadline >= #{deadlineStartTime}
and a.deadline >= #{deadlineStartTime}
</if>
<if test="deadlineEndTime != null">
<![CDATA[ and deadline <= #{deadlineEndTime}]]>
<![CDATA[ and a.deadline <= #{deadlineEndTime}]]>
</if>
order by a.deadline desc
</select>
<select id="getFollowTask" resultMap="BaseResultMap">

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
View File

@@ -265,12 +265,12 @@ public class FollowTaskServiceImpl implements FollowTaskService {
if(Objects.isNull(partnerInfo)){
return;
}
String lockKey = MessageFormat.format(CommonConstants.FOLLOW_TASK_NOTICE_KEY, task.getFollowUserId(), task.getId());
/*String lockKey = MessageFormat.format(CommonConstants.FOLLOW_TASK_NOTICE_KEY, task.getFollowUserId(), task.getId());
boolean result = redisUtilPool.setNxExpire(lockKey, DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC), CommonConstants.FOLLOW_TASK_NOTICE_LOCK_TIMES);
if(!result){
//一小时内发送过不再发送通知
return;
}
}*/
String dateline = DateUtil.format(task.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_7);
String content = MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT, dateline, partnerInfo.getUsername(), partnerInfo.getMobile());
noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(task.getFollowUserId()), content);