营期的评级显示

fs-company/src/main/java/com/fs/company/controller/qw/SopUserLogsInfoController.java

@@ -83,6 +83,7 @@ public class SopUserLogsInfoController extends BaseController
         //startPage();
         if (sopUserLogsInfo.getFilterMode() == 1) {
             List<SopUserLogsInfo> list = sopUserLogsInfoService.selectSopUserLogsInfoList(sopUserLogsInfo);
+            list.forEach(item -> item.setLevel(item.getGrade()));
 
             if (!list.isEmpty()) {
                 // 使用并行流提取externalId
@@ -98,7 +99,7 @@ public class SopUserLogsInfoController extends BaseController
                 Map<Long, SopExternalContactInfo> externalContactInfoMap = qwExternalContactVOTimes.stream()
                         .collect(Collectors.toMap(
                                 QwExternalContactVOTime::getId,
-                                item -> new SopExternalContactInfo(item.getCreateTime(), item.getTagIds(), item.getRemark(),item.getLevel())
+                                item -> new SopExternalContactInfo(item.getCreateTime(), item.getTagIds(), item.getRemark(), null)
                         ));
 
                 List<String> tagIds = qwExternalContactVOTimes.stream().map(QwExternalContactVOTime::getTagIds).filter(StringUtils::isNotEmpty).flatMap(e -> JSON.parseArray(e, String.class).stream()).collect(Collectors.toList());
@@ -117,12 +118,10 @@ public class SopUserLogsInfoController extends BaseController
                 list.forEach(item -> {
                     SopExternalContactInfo info = externalContactInfoMap.getOrDefault(
                             item.getExternalId(),
-                            new SopExternalContactInfo("无进线时间", "无标签", "无备注",0));
+                            new SopExternalContactInfo("无进线时间", "无标签", "无备注", null));
                     item.setInComTime(info.getCreateTime());
                     item.setTagIds(info.getTagIds());
                     item.setRemark(info.getRemark());
-                    item.setLevel(info.getLevel());
-
                 });
             }
 

fs-service/src/main/java/com/fs/sop/mapper/SopUserLogsInfoMapper.java

@@ -200,6 +200,12 @@ public interface SopUserLogsInfoMapper {
             "    WHEN #{item.sopUserLogsInfoId} THEN #{item.level} " +
             "</foreach>" +
             "    ELSE grade " +
+            "END, " +
+            "is_days_not_study = CASE id " +
+            "<foreach collection=\"contactList\" item=\"item\">" +
+            "    WHEN #{item.sopUserLogsInfoId} THEN CASE WHEN #{item.level} = 5 THEN is_days_not_study ELSE 0 END " +
+            "</foreach>" +
+            "    ELSE is_days_not_study " +
             "END " +
             "WHERE id IN " +
             "<foreach collection='contactList' item='item' open='(' separator=',' close=')'>" +