1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -132,31 +132,31 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
      */
     @Override
     public List<ExpenseInfo> removeRepeatList(ExpenseInfo expenseInfo) {
-        List<ExpenseInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_REPEATLIST+JSONObject.toJSONString(expenseInfo),ExpenseInfo.class);
-        if(listRedis != null && listRedis.size() > 0 ){
-            return listRedis;
-        }
+//        List<ExpenseInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_REPEATLIST+JSONObject.toJSONString(expenseInfo),ExpenseInfo.class);
+//        if(listRedis != null && listRedis.size() > 0 ){
+//            return listRedis;
+//        }
         if (expenseInfo.getCompId() == null || expenseInfo.getCompId().isEmpty()) {
             expenseInfo.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
         }
         //查询所有费用集合
-        List<ExpenseInfo> expenseInfoList = this.selectList(new EntityWrapper<ExpenseInfo>().eq("delete_flag", "0").eq("comp_id", expenseInfo.getCompId()));
-        List<ExpenseInfo> expenseInfos = new ArrayList<>();
-        if ("1".equals(expenseInfo.getRemoveRepeatFlag())) {
-            expenseInfos = expenseInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
-                    -> new TreeSet<>(Comparator.comparing(ExpenseInfo -> ExpenseInfo.getWarehouseName() + ExpenseInfo.getContractNo()))), ArrayList::new));
-        } else if ("2".equals(expenseInfo.getRemoveRepeatFlag())) {
-            expenseInfos = expenseInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
-                    -> new TreeSet<>(Comparator.comparing(ExpenseInfo::getExpenseName))), ArrayList::new));
-        } else if ("3".equals(expenseInfo.getRemoveRepeatFlag())) {
-            expenseInfos = expenseInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
-                    -> new TreeSet<>(Comparator.comparing(ExpenseInfo::getUnallocatedAmount))), ArrayList::new));
-        } else {
-            expenseInfos = expenseInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
-                    -> new TreeSet<>(Comparator.comparing(ExpenseInfo::getAgent))), ArrayList::new));
-        }
-        cacheComponent.putRaw(Const.ADMIN_REPEATLIST+JSONObject.toJSONString(expenseInfo), JSONObject.toJSONString(expenseInfos),60*60*24);
-        return expenseInfos;
+        List<ExpenseInfo> expenseInfoList = this.selectList(new EntityWrapper<ExpenseInfo>().eq("delete_flag", "0").eq("comp_id", expenseInfo.getCompId()).groupBy("agent"));
+//        List<ExpenseInfo> expenseInfos = new ArrayList<>();
+//        if ("1".equals(expenseInfo.getRemoveRepeatFlag())) {
+//            expenseInfos = expenseInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
+//                    -> new TreeSet<>(Comparator.comparing(ExpenseInfo -> ExpenseInfo.getWarehouseName() + ExpenseInfo.getContractNo()))), ArrayList::new));
+//        } else if ("2".equals(expenseInfo.getRemoveRepeatFlag())) {
+//            expenseInfos = expenseInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
+//                    -> new TreeSet<>(Comparator.comparing(ExpenseInfo::getExpenseName))), ArrayList::new));
+//        } else if ("3".equals(expenseInfo.getRemoveRepeatFlag())) {
+//            expenseInfos = expenseInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
+//                    -> new TreeSet<>(Comparator.comparing(ExpenseInfo::getUnallocatedAmount))), ArrayList::new));
+//        } else {
+//            expenseInfos = expenseInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
+//                    -> new TreeSet<>(Comparator.comparing(ExpenseInfo::getAgent))), ArrayList::new));
+//        }
+//        cacheComponent.putRaw(Const.ADMIN_REPEATLIST+JSONObject.toJSONString(expenseInfo), JSONObject.toJSONString(expenseInfos),60*60*24);
+        return expenseInfoList;
 
     }