修复收支明细列表筛选功能

kxs-user/kxs-user-biz/pom.xml

@@ -186,8 +186,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>15</source>
-                    <target>15</target>
+                    <source>16</source>
+                    <target>16</target>
                 </configuration>
             </plugin>
         </plugins>

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserAmountLogServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.constant.CommonConstants;
@@ -11,9 +12,11 @@ import com.kxs.common.core.constant.enums.KindTypeEnum;
 import com.kxs.common.mybatis.handler.MonthTableNameHandler;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.user.api.dto.kxsapp.userAccount.UserAmountVariationListDTO;
+import com.kxs.user.api.model.KxsChangeTypeKind;
 import com.kxs.user.api.model.KxsUser;
 import com.kxs.user.api.model.KxsUserAmountLog;
 import com.kxs.user.api.vo.kxsapp.userAccount.*;
+import com.kxs.user.biz.mapper.KxsChangeTypeKindMapper;
 import com.kxs.user.biz.mapper.KxsUserAmountLogMapper;
 import com.kxs.user.biz.mapper.KxsUserMapper;
 import com.kxs.user.biz.service.KxsUserAmountLogService;
@@ -21,6 +24,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户余额记录日志表(KxsUserAmountLog)表服务实现类
@@ -34,6 +38,8 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
 
     private final KxsUserMapper userMapper;
 
+    private final KxsChangeTypeKindMapper kxsChangeTypeKindMapper;
+
     @Override
     public IPage<UserAmountVariationListVO> getByPage(Page<UserAmountVariationListVO> page, UserAmountVariationListDTO param) {
 
@@ -41,6 +47,16 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
         //拼接表名
         String tableName = CommonConstants.KXS_USER_AMOUNT_LOG_PREFIX + param.getTradeMonth();
 
+        //拿出所有分类的子集ID集合
+        if(!param.getChangeType().isEmpty()){
+
+            List<KxsChangeTypeKind> kxsChangeTypeKinds = kxsChangeTypeKindMapper.selectList(Wrappers.<KxsChangeTypeKind>lambdaQuery()
+                    .select(KxsChangeTypeKind::getId)
+                    .in(KxsChangeTypeKind::getChangeTypeId, param.getChangeType()));
+            param.setChangeType(kxsChangeTypeKinds.stream().map(KxsChangeTypeKind::getId).collect(Collectors.toList()));
+        }
+
+
         return baseMapper.getByPage(page, param, tableName);
     }