修正sop发送客户群发优先级

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -903,7 +903,12 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
             log.info("qw_sop数据：{}", JSON.toJSONString(sopLogs));
         }
         sopLogs.setSopId(logVo.getSopId());
-        sopLogs.setSort(Integer.valueOf(logVo.getStartTime().replaceAll("-","")));
+        // 客户群群发设置最高优先级
+        if (ruleTimeVO.getSendType() != null && ruleTimeVO.getSendType() == 6) {
+            sopLogs.setSort(100000000);
+        } else {
+            sopLogs.setSort(Integer.valueOf(logVo.getStartTime().replaceAll("-","")));
+        }
         sopLogs.setExternalUserId(externalContactId);
         sopLogs.setExternalId(externalId);
         sopLogs.setExternalUserName(externalUserName);

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -704,7 +704,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                     sopLogs.setReceivingStatus(0L);
                     sopLogs.setSopId(param.getSopId());
                     sopLogs.setCorpId(groupChat.getCorpId());
-                    sopLogs.setSort(2);
+                    sopLogs.setSort(100000000);
                     sopLogs.setSendType(6);
                     sopLogs.setExternalUserName(groupChat.getName());
                     sopLogs.setQwUserKey(qwUser.getId());

fs-service/src/main/resources/mapper/sop/QwSopLogsMapper.xml

@@ -492,7 +492,7 @@
           and ql.corp_id=#{data.corpId}
           and ql.external_user_id =#{data.externalUserId}
           and ql.log_type = 2
-          and ql.send_type in (2,5,7)
+          and ql.send_type in (2,5,6,7)
           and ql.send_status = 3
           and ql.receiving_status = 0
           and ql.send_time <= now()
@@ -532,7 +532,7 @@
                 LEFT JOIN qw_sop qs ON qs.id = ql.sop_id
         WHERE
             ql.log_type = 2
-          AND ql.send_type IN (2,5,11)
+          AND ql.send_type IN (2,5,6,11)
           AND ql.send_status = 3
           AND ql.receiving_status = 0
           AND ql.send_time <= now()