还款导出支持筛选导出

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/RepaymentMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.dto.RepaymentBatchDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.RepaymentDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PrivilegeCompany;
 import com.yeejoin.amos.boot.module.hygf.api.entity.Repayment;
@@ -31,5 +32,5 @@ public interface RepaymentMapper extends BaseMapper<Repayment> {
     List<String> getTodoTelephones(@Param("userIds") List<String> userIds);
 
     @UserEmpower(field = {"regional_companies_code"}, dealerField = {"regional_companies_code"}, fieldConditions = {"in"}, relationship = "and")
-    List<Repayment> getAllData();
+    List<Repayment> getAllData(@Param("dto") RepaymentBatchDto repaymentBatchDto);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/RepaymentMapper.xml

@@ -49,6 +49,32 @@
 
     <select id="getAllData" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.Repayment">
         select * from hygf_repayment
+        <where>
+            <if test="dto.companyName != null and dto.companyName != ''  ">
+                and company_name  = #{dto.companyName}
+            </if>
+            <if test="dto.loanPeriod != null and dto.loanPeriod != ''" >
+                and loan_period  like concat('%',#{dto.loanPeriod},'%')
+            </if>
+            <if test="dto.messageState != null and dto.messageState != '' " >
+                and message_state = #{dto.messageState}
+            </if>
+            <if test="dto.period != null and dto.period != ''" >
+                and period  like concat('%',#{dto.period},'%')
+            </if>
+            <if test="dto.repayDate != null and dto.repayDate != ''" >
+                and repay_date = #{dto.repayDate}
+            </if>
+            <if test="dto.repayState != null and dto.repayState != ''" >
+                and repay_state= #{repayState}
+            </if>
+            <if test="dto.sequenceNbrList != null and dto.sequenceNbrList.size() > 0" >
+                and sequence_nbr in
+                <foreach collection="dto.sequenceNbrList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
         order by create_time DESC,sequence_nbr DESC
     </select>
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RepaymentServiceImpl.java

@@ -359,21 +359,9 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
 
     public void exportRepaymentExcel(RepaymentBatchDto repaymentBatchDto, HttpServletResponse response) {
         LambdaQueryWrapper<Repayment> wrapper = new LambdaQueryWrapper<>();
-        //如果是空值导出全部
-        List<Repayment> repaymentList;
 
-        if (Objects.nonNull(repaymentBatchDto)) {
-            wrapper.in(CollectionUtil.isNotEmpty(repaymentBatchDto.getSequenceNbrList()),Repayment::getSequenceNbr, repaymentBatchDto.getSequenceNbrList());
-            wrapper.eq(StringUtils.isNotEmpty(repaymentBatchDto.getCompanyName()),Repayment::getCompanyName,repaymentBatchDto.getCompanyName());
-            wrapper.eq(StringUtils.isNotEmpty(repaymentBatchDto.getRepayState()),Repayment::getRepayState,repaymentBatchDto.getRepayState());
-            wrapper.like(StringUtils.isNotEmpty(repaymentBatchDto.getPeriod()),Repayment::getPeriod,repaymentBatchDto.getPeriod());
-            wrapper.like(StringUtils.isNotEmpty(repaymentBatchDto.getLoanPeriod()),Repayment::getLoanPeriod,repaymentBatchDto.getLoanPeriod());
-            wrapper.eq(StringUtils.isNotEmpty(repaymentBatchDto.getMessageState()),Repayment::getMessageState,repaymentBatchDto.getMessageState());
-            wrapper.eq(StringUtils.isNotEmpty(repaymentBatchDto.getRepayDate()),Repayment::getRepayDate,repaymentBatchDto.getRepayDate());
-            repaymentList = list(wrapper);
-        }else {
-            repaymentList =  baseMapper.getAllData();
-        }
+        List<Repayment>    repaymentList =  baseMapper.getAllData(repaymentBatchDto);
+
         if (CollectionUtil.isNotEmpty(repaymentList)) {
             List<RepaymentExcelVO> dataList = new ArrayList<>();
             for (Repayment repayment : repaymentList) {