代扣优化项 问题处理

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

@@ -81,6 +81,8 @@ public class IcbcWithholdDto  extends BaseDto {
  private String paymentStartTime;
  @ApiModelProperty(value = "缴费结束时间")
  private String paymentEndTime;
+ @ApiModelProperty(value = "导出用 姓名")
+ private String custName;
 
  /**
   * 失败原因

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

@@ -545,6 +545,7 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
             if (CollectionUtil.isNotEmpty(successFilesContentAsJson)){
                 LambdaUpdateWrapper<IcbcWithhold> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.in(IcbcWithhold::getBatchNo,successFilesContentAsJson);
+                updateWrapper.isNotNull(IcbcWithhold::getWithholdStatus);
                 updateWrapper.set(IcbcWithhold::getUploadStatus,UploadStatusEnum.成功.getName());
                 updateWrapper.set(IcbcWithhold::getWithholdStatus,UploadStatusEnum.代扣处理中.getName());
                 this.getBaseMapper().update(null,updateWrapper);
@@ -735,6 +736,9 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
         if (StringUtils.isNotEmpty(icbcWithhold.getPaymentStartTime())){
             dto.setPaymentStartTime(icbcWithhold.getPaymentStartTime());
         }
+        if (StringUtils.isNotEmpty(icbcWithhold.getCustName())){
+            fileName = icbcWithhold.getCustName() +"-扣款记录明细";
+        }
         if (StringUtils.isNotEmpty(icbcWithhold.getPaymentEndTime())){
             dto.setPaymentEndTime(icbcWithhold.getPaymentEndTime());
         }