|
|
@@ -1779,8 +1779,8 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
|
|
|
qwSopAutoByTags.setTagsIdsSelectList(combinedTagsList);
|
|
|
qwSopAutoByTags.setSendType(2);
|
|
|
List<QwSopRuleTimeVO> qwSopRuleTimeVOS = qwSopMapper.selectQwSopAutoByTagsByForeach(qwSopAutoByTags);
|
|
|
-
|
|
|
try {
|
|
|
+ log.info("SOP任务：{}", qwSopRuleTimeVOS.size());
|
|
|
if (qwSopRuleTimeVOS != null && !qwSopRuleTimeVOS.isEmpty()) {
|
|
|
//SOP规则
|
|
|
qwSopRuleTimeTools(qwSopRuleTimeVOS, userID, qwUser, corpId, externalUserID, externalContact.getName(), contact, currentDate, localTime, combinedTagsList);
|
|
|
@@ -2252,13 +2252,14 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
|
|
|
SysConfig sysConfig = sysConfigService.selectConfigByConfigKey("qw.config");
|
|
|
List<SopUserLogsInfo> sopUserLogsInfos = sopUserLogsInfoMapper.repeatProject(PubFun.listToNewList(qwSopRuleTimeVOS, QwSopRuleTimeVO::getProject), externalUserID);
|
|
|
Map<Integer, List<String>> collect = sopUserLogsInfos.stream().collect(Collectors.groupingBy(SopUserLogsInfo::getProject, Collectors.mapping(SopUserLogsInfo::getSopId, Collectors.toList())));
|
|
|
-
|
|
|
+ log.info("进入生成营期");
|
|
|
// sop任务
|
|
|
qwSopRuleTimeVOS.forEach(ruleTimeVO -> {
|
|
|
if(sysConfig != null){
|
|
|
QwConfig qwConfig = JSON.parseObject(sysConfig.getConfigValue(), QwConfig.class);
|
|
|
if(qwConfig.isProject()){
|
|
|
List<String> sopIdList = collect.get(ruleTimeVO.getProject());
|
|
|
+ log.info("是否多个项目:{}", sopIdList);
|
|
|
if(sopIdList.isEmpty()) return;
|
|
|
if(sopIdList.contains(ruleTimeVO.getId())) return;
|
|
|
}
|
|
|
@@ -3914,7 +3915,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
|
|
|
qwSopAutoByTags.setSendType(2);
|
|
|
List<QwSopRuleTimeVO> qwSopRuleTimeVOS = qwSopMapper.selectQwSopAutoByTagsByForeach(qwSopAutoByTags);
|
|
|
logger.info("分时段里符合的标签-自动SOP条件:" + qwSopAutoByTags + "|" + qwUser.getQwUserId() + "|" + ext);
|
|
|
-
|
|
|
+ log.info("qwSopRuleTimeVOS:{}", qwSopRuleTimeVOS);
|
|
|
if (qwSopRuleTimeVOS != null && !qwSopRuleTimeVOS.isEmpty()) {
|
|
|
//SOP规则
|
|
|
qwSopRuleTimeTools(qwSopRuleTimeVOS, qwUserId, qwUser, corpId, ext, externalContact.getName(), contact, currentDate, localTime, combinedTagsList);
|
|
|
@@ -4200,7 +4201,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
|
|
|
qwSopAutoByTags.setSendType(2);
|
|
|
List<QwSopRuleTimeVO> qwSopRuleTimeVOS = qwSopMapper.selectQwSopAutoByTagsByForeach(qwSopAutoByTags);
|
|
|
logger.info("分时段里符合的标签-自动SOP条件:" + qwSopAutoByTags + "|" + qwUser.getQwUserId() + "|" + ext);
|
|
|
-
|
|
|
+ log.info("qwSopRuleTimeVOS:{}", qwSopRuleTimeVOS);
|
|
|
if (qwSopRuleTimeVOS != null && !qwSopRuleTimeVOS.isEmpty()) {
|
|
|
//SOP规则
|
|
|
qwSopRuleTimeTools(qwSopRuleTimeVOS, qwUserId, qwUser, corpId, ext, externalContact.getName(), contact, currentDate, localTime, combinedTagsList);
|
