还款导出支持筛选导出

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/RepaymentBatchDto.java

@@ -7,4 +7,10 @@ import java.util.List;
 @Data
 public class RepaymentBatchDto {
     private List<String> sequenceNbrList;
+    private String companyName;
+    private String loanPeriod;
+    private String messageState;
+    private String period;
+    private String repayDate;
+    private String repayState;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/RepaymentController.java

@@ -162,7 +162,7 @@ public class RepaymentController extends BaseController {
     @PostMapping(value = "/exportRepaymentExcel")
     @ApiOperation(httpMethod = "POST", value = "导出还款Excel", notes = "导出还款Excel")
     public ResponseModel<?> exportRepaymentExcel(@RequestBody RepaymentBatchDto repaymentBatchDto, HttpServletResponse response) {
-        repaymentService.exportRepaymentExcel(repaymentBatchDto.getSequenceNbrList(), response);
+        repaymentService.exportRepaymentExcel(repaymentBatchDto, response);
         return ResponseHelper.buildResponse(null);
     }
 

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

@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.vo.RepaymentExcelVO;
 import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
@@ -356,12 +357,19 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
         }
     }
 
-    public void exportRepaymentExcel(List<String> sequenceNbrList, HttpServletResponse response) {
+    public void exportRepaymentExcel(RepaymentBatchDto repaymentBatchDto, HttpServletResponse response) {
         LambdaQueryWrapper<Repayment> wrapper = new LambdaQueryWrapper<>();
         //如果是空值导出全部
         List<Repayment> repaymentList;
-        if (CollectionUtil.isNotEmpty(sequenceNbrList)) {
-            wrapper.in(Repayment::getSequenceNbr, sequenceNbrList);
+
+        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();