Procházet zdrojové kódy

1.查询客服去掉ID和name为空的 2.客服统计,不再返回累计

王苗苗 před 2 měsíci
rodič
revize
bbcd422ed6

binární
.DS_Store


+ 4 - 4
slibra-admin/src/main/resources/application-local.yml

@@ -6,11 +6,11 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/big_model?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                url: jdbc:mysql://192.168.100.159:3306/libra_bot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://localhost:3306/big_model?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.100.159:3306/libra_bot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 1234qwer
-#                password: EKoAe3H8xybQKrFPApXM
+#                password: 1234qwer
+                password: EKoAe3H8xybQKrFPApXM
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 4 - 4
slibra-system/src/main/java/com/slibra/business/service/impl/TCallRecordServiceImpl.java

@@ -353,14 +353,14 @@ public class TCallRecordServiceImpl implements ITCallRecordService
                 }
             }
         }
-        CallUserCountInfo callUserCountInfo = new CallUserCountInfo();
+        /*CallUserCountInfo callUserCountInfo = new CallUserCountInfo();
         callUserCountInfo.setUserName("累计");
         callUserCountInfo.setTotalTimes(result.stream().map(CallUserCountInfo::getTotalTimes).mapToLong(Long::longValue).sum());
         callUserCountInfo.setInTodayCount(result.stream().map(CallUserCountInfo::getInTodayCount).mapToInt(Integer::intValue).sum());
         callUserCountInfo.setInAllCount(result.stream().map(CallUserCountInfo::getInAllCount).mapToInt(Integer::intValue).sum());
         callUserCountInfo.setOutTodayCount(result.stream().map(CallUserCountInfo::getOutTodayCount).mapToInt(Integer::intValue).sum());
         callUserCountInfo.setOutAllCount(result.stream().map(CallUserCountInfo::getOutAllCount).mapToInt(Integer::intValue).sum());
-        result.add(callUserCountInfo);
+        result.add(callUserCountInfo);*/
         return result;
     }
 
@@ -408,7 +408,7 @@ public class TCallRecordServiceImpl implements ITCallRecordService
                 }
             }
         }
-        CallUserCountInfo callUserCountInfo = new CallUserCountInfo();
+        /*CallUserCountInfo callUserCountInfo = new CallUserCountInfo();
         callUserCountInfo.setUserName("累计");
 //        callUserCountInfo.setTotalTimes(result.stream().map(CallUserCountInfo::getTotalTimes).mapToLong(Long::longValue).sum());
         callUserCountInfo.setInTodayCount(result.stream().map(CallUserCountInfo::getInTodayCount).mapToInt(Integer::intValue).sum());
@@ -417,7 +417,7 @@ public class TCallRecordServiceImpl implements ITCallRecordService
 //        callUserCountInfo.setOutAllCount(result.stream().map(CallUserCountInfo::getOutAllCount).mapToInt(Integer::intValue).sum());
         callUserCountInfo.setTodayTransferCount(result.stream().map(CallUserCountInfo::getTodayTransferCount).mapToInt(Integer::intValue).sum());
         callUserCountInfo.setTotalTransferCount(result.stream().map(CallUserCountInfo::getTotalTransferCount).mapToInt(Integer::intValue).sum());
-        result.add(callUserCountInfo);
+        result.add(callUserCountInfo);*/
         return result;
     }
 

+ 2 - 0
slibra-system/src/main/resources/mapper/business/TCallRecordMapper.xml

@@ -305,6 +305,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             1 = 1
           AND del_flag = 0
+        AND user_id IS NOT NULL
+        AND user_id != ''
         <if test="type == 0 "> and service_category = 0</if>
         <if test="type == 1 "> and service_category != 0 </if>
     </select>