1. 结算跟单明细调整

src/main/java/com/ydtech/modules/fnc/controller/InsPlyIncomeController.java

@@ -149,6 +149,13 @@ public class InsPlyIncomeController extends BaseController {
 
         return insPlyIncomeService.batchBalance(insPlyIncomeVo);
     }
+    @PutMapping("/batchSumBalance")
+    @ApiModelProperty(value = "批次批量結算")
+    public HttpResult<Object> batchSumBalance(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {
+
+        return insPlyIncomeService.batchSumBalance(insPlyIncomeVo);
+    }
+
 
     @PutMapping("/batchPinBalance")
     @ApiModelProperty(value = "平台批量结算")

src/main/java/com/ydtech/modules/fnc/controller/SettlementDocumentaryFeesSumController.java

@@ -0,0 +1,29 @@
+package com.ydtech.modules.fnc.controller;
+
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesSumService;
+import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
+import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api(tags = "开票批次表结算")
+@RequestMapping("/fnc/SettlementSumFees")
+public class SettlementDocumentaryFeesSumController {
+    @Autowired
+    private SettlementDocumentaryFeesSumService settlementDocumentaryFeesSumService;
+
+
+    @PutMapping("/voidInvoicing")
+    @ApiModelProperty(value = "作废开票")
+    public HttpResult<Object> voidInvoicing(@RequestBody SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
+        HttpResult<Object>  result= settlementDocumentaryFeesSumService.voidInvoicing(settlementDocumentaryFeesSumVo);
+        return HttpResult.ok(result);
+    }
+}

src/main/java/com/ydtech/modules/fnc/dao/SettlementDocumentaryFeesSumMapper.java

@@ -0,0 +1,10 @@
+package com.ydtech.modules.fnc.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SettlementDocumentaryFeesSumMapper extends BaseMapper<SettlementDocumentaryFeesSumEntity> {
+}

src/main/java/com/ydtech/modules/fnc/entity/SettlementDocumentaryFeesEntity.java

@@ -157,6 +157,10 @@ public class SettlementDocumentaryFeesEntity implements Serializable {
     @TableField("invoice_id")
     private String invoicId;
 
+    @ApiModelProperty("批次开票关联id")
+    @TableField("settlement_sum_id")
+    private String settlementSumId;
+
 
     @ApiModelProperty("图片路径")
     @TableField(exist = false)

src/main/java/com/ydtech/modules/fnc/entity/SettlementDocumentaryFeesSumEntity.java

@@ -0,0 +1,80 @@
+package com.ydtech.modules.fnc.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Getter
+@Setter
+@TableName("settlement_documentary_fees_sum")
+@ApiModel(value = "settlementDocumentaryFeesSum", description = "开票批次表")
+public class SettlementDocumentaryFeesSumEntity   implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("结算总金额")
+    @TableField("total_amount")
+    private BigDecimal totalAmount;
+
+
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("保险id")
+    @TableField("company_id")
+    private String companyId;
+
+    @ApiModelProperty("是否是开票 结算")
+    @TableField("settlement_status")
+    private String settlementStatus;
+
+
+    @ApiModelProperty("用户")
+    @TableField("user_id")
+    private String userId;
+
+
+    @ApiModelProperty("开票方式")
+    @TableField("invoicing_method")
+    private String invoicingMethod;
+
+
+    @ApiModelProperty("开票号")
+    @TableField("invoice_id")
+    private String invoicId;
+
+    @ApiModelProperty("是否是非车")
+    @TableField("is_not_car")
+    private String isNotCar;
+
+    @ApiModelProperty("合作公司id")
+    @TableField("partner_companies_id")
+    private String partnerCompaniesId;
+
+
+    @ApiModelProperty("已开票已结算")
+    @TableField("invoiced_settled_amount")
+    private BigDecimal invoicedSettledAmount;
+
+    @ApiModelProperty("已开票未结算")
+    @TableField("Invoiced_not_settled_amount")
+    private BigDecimal InvoicedNotSettledAmount;
+
+    @ApiModelProperty("结清状态")
+    @TableField("completion_status")
+    private String completionStatus;
+}

src/main/java/com/ydtech/modules/fnc/service/InsPlyIncomeService.java

@@ -139,4 +139,7 @@ public interface InsPlyIncomeService extends IService<InsPlyIncome> {
     void batchUpdateVoucher(InsPlyIncomeVo insPlyIncomeVo);
 
     HttpResult<Object> reconciliation(InsPlyIncomeVo insPlyIncomeVo);
+
+    HttpResult<Object> batchSumBalance(InsPlyIncomeVo insPlyIncomeVo);
+
 }

src/main/java/com/ydtech/modules/fnc/service/SettlementDocumentaryFeesSumService.java

@@ -0,0 +1,10 @@
+package com.ydtech.modules.fnc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
+import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
+
+public interface SettlementDocumentaryFeesSumService extends IService<SettlementDocumentaryFeesSumEntity> {
+    HttpResult<Object> voidInvoicing(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
+}

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -109,6 +109,8 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
     private ImportAsyncService importAsyncService;
     @Autowired
     private IncomeTaskRelationshipService incomeTaskRelationshipService;
+    @Autowired
+    private  SettlementDocumentaryFeesSumService settlementDocumentaryFeesSumService;
 
     @Value("${upload.file.path}")
     private String uploadPath;
@@ -1593,6 +1595,87 @@ handlingProportion,
         return HttpResult.ok();
     }
 
+    @Override
+    public HttpResult<Object> batchSumBalance(InsPlyIncomeVo insPlyIncomeVo) {
+
+        List<InsPlyIncomeVo> multipleSelection = insPlyIncomeVo.getMultipleSelection();
+        HashMap<String, Object> params = new HashMap<>();
+        BigDecimal settleMentAmount = BigDecimal.ZERO;
+        BigDecimal settleNotMentAmount = BigDecimal.ZERO;
+        for (InsPlyIncomeVo item :  multipleSelection){
+            SettlementDocumentaryFeesEntity settlementDocumentaryFeesVo = new SettlementDocumentaryFeesEntity();
+            if(item.getSettlementAmount()  ==null  ||  item .getSettlementAmount().compareTo(BigDecimal.ZERO) <0){
+                throw new SystemException("请输入正确金额");
+            }
+            String id = item.getId();
+            SettlementDocumentaryFeesEntity settlementDocumentaryFeesEntity = settlementDocumentaryFeesService.getBaseMapper().selectById(id);   // 开票
+            BigDecimal invoicedNotSettledAmount = settlementDocumentaryFeesEntity.getInvoicedNotSettledAmount();//未结算金额
+            if(item.getSettlementAmount().compareTo(invoicedNotSettledAmount) >0){
+                throw new SystemException("结算金额大于未结算金额");
+            }
+            if(item.getSettlementAmount().compareTo(BigDecimal.ZERO) >0){
+                settlementDocumentaryFeesVo.setInvoiceId(settlementDocumentaryFeesEntity.getInvoicId());   //开票号
+                settlementDocumentaryFeesVo.setSettlementTime(insPlyIncomeVo.getSettlementTime());   //结算时间
+                settlementDocumentaryFeesVo.setSettlementStatus("2");   //2为结算状态
+                settlementDocumentaryFeesVo.setCompanyId(settlementDocumentaryFeesEntity.getCompanyId());  // 保险公司id
+                settlementDocumentaryFeesVo.setPartnerCompaniesId(settlementDocumentaryFeesEntity.getPartnerCompaniesId());  //合作公司id
+                settlementDocumentaryFeesVo.setUnsettledAmount(insPlyIncomeVo.getInvoicCommissionFeevalue().subtract(insPlyIncomeVo.getSettlementAmount()));  //未结算金额
+                settlementDocumentaryFeesVo.setIsNotCar(settlementDocumentaryFeesEntity.getIsNotCar()); // 是否是非车
+                settlementDocumentaryFeesVo.setInvoicingMethod(settlementDocumentaryFeesEntity.getInvoicingMethod());  //开票方式
+                settlementDocumentaryFeesVo.setTaxPoints(settlementDocumentaryFeesEntity.getTaxPoints());  //税点
+                settlementDocumentaryFeesVo.setSettlementImageId(settlementDocumentaryFeesEntity.getSettlementImageId());
+                if ("0".equals(insPlyIncomeVo.getInvoicingMethod())) {
+                    settlementDocumentaryFeesVo.setExpendAmount(settlementDocumentaryFeesEntity.getSettlementAmount().multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100)))));
+                } else {
+                    settlementDocumentaryFeesVo.setExpendAmount(settlementDocumentaryFeesEntity.getSettlementAmount());   //进账金额
+                }
+                settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());   //进账金额
+                settlementDocumentaryFeesVo.setHandlingFeesStatus(settlementDocumentaryFeesEntity.getHandlingFeesStatus());
+                settlementDocumentaryFeesVo.setTotalAmount(insPlyIncomeVo.getInvoicCommissionFeevalue());
+                settlementDocumentaryFeesVo.setCreateTime(LocalDateTime.now());
+                settlementDocumentaryFeesVo.setParentId(insPlyIncomeVo.getId());
+                settlementDocumentaryFeesVo.setAgreementType("2");  //1平台 2  保险
+
+                //       生成跟单费结算记录
+                SettlementDocumentaryLogEntity settlementDocumentaryLogEntity = new SettlementDocumentaryLogEntity();
+                settlementDocumentaryLogEntity.setAmount(settlementDocumentaryFeesVo.getSettlementAmount());  // 结算金额
+                settlementDocumentaryLogEntity.setSettlementDocumentaryId(settlementDocumentaryFeesEntity.getId()); // 关联id
+                settlementDocumentaryLogEntity.setAmountType("2");  //跟单费结算
+                settlementDocumentaryLogEntity.setCreateTime(new Date());
+                settlementDocumentaryFeesService.getBaseMapper().insert(settlementDocumentaryFeesVo);
+                settlementDocumentaryLogService.save(settlementDocumentaryLogEntity);
+                //修改开票金额
+
+                BigDecimal add = settlementDocumentaryFeesEntity.getInvoicedSettledAmount().add(insPlyIncomeVo.getSettlementAmount());
+                settlementDocumentaryFeesEntity.setInvoicedSettledAmount(add);
+
+                BigDecimal subtract = settlementDocumentaryFeesEntity.getTotalAmount().subtract(add);
+                settlementDocumentaryFeesEntity.setInvoicedNotSettledAmount(subtract);
+
+                if (subtract.compareTo(BigDecimal.ZERO) == 0) {
+                    settlementDocumentaryFeesEntity.setCompletionStatus("2");
+                } else if (subtract.compareTo(BigDecimal.ZERO) != 0) {
+                    settlementDocumentaryFeesEntity.setCompletionStatus("1");
+                }
+                settlementDocumentaryFeesService.updateById(settlementDocumentaryFeesEntity);
+                settleMentAmount = settleMentAmount.add(settlementDocumentaryFeesEntity.getInvoicedSettledAmount());
+                settleNotMentAmount = settleNotMentAmount.add(settlementDocumentaryFeesEntity.getInvoicedNotSettledAmount());
+            }
+//             更新金额
+
+
+            SettlementDocumentaryFeesSumEntity settlementDocumentaryFeesSumEntity = settlementDocumentaryFeesSumService.getById(insPlyIncomeVo.getSettlementSumId());
+            settlementDocumentaryFeesSumEntity.setInvoicedSettledAmount(settleMentAmount);
+            settlementDocumentaryFeesSumEntity.setInvoicedNotSettledAmount(settleNotMentAmount);
+            if (settleNotMentAmount.compareTo(BigDecimal.ZERO) == 0) {
+                settlementDocumentaryFeesSumEntity.setCompletionStatus("2");
+            } else if (settleNotMentAmount.compareTo(BigDecimal.ZERO) != 0) {
+                settlementDocumentaryFeesSumEntity.setCompletionStatus("1");
+            }
+            settlementDocumentaryFeesSumService.updateById(settlementDocumentaryFeesSumEntity);
+        }
+        return null;
+    }
     /**
      * @param insPlyIncomeVo
      * @return
@@ -1975,9 +2058,39 @@ handlingProportion,
         } else {
             settlementDocumentaryFeesVo.setExpendAmount(insPlyIncomeVo.getSettlementAmount());
         }
+//        跟单生成批次表
+        SettlementDocumentaryFeesSumEntity settlementDocumentaryFeesSumEntity = this.saveSumSettlement(insPlyIncomeVo);
+        settlementDocumentaryFeesVo.setSettlementSumId(settlementDocumentaryFeesSumEntity.getId());
         return settlementDocumentaryFeesService.inertSettle(settlementDocumentaryFeesVo);
     }
 
+    private SettlementDocumentaryFeesSumEntity saveSumSettlement(InsPlyIncomeVo insPlyIncomeVo) {
+        String handlingFeesStatus = insPlyIncomeVo.getHandlingFeesStatus();
+        SettlementDocumentaryFeesSumEntity settlementDocumentaryFeesSumEntity = new SettlementDocumentaryFeesSumEntity();
+        BigDecimal totalAmount = BigDecimal.ZERO;
+        if("1".equals(handlingFeesStatus)){
+            List<InsPlyIncomeVo> nowInsPlyIncomeVo = insPlyIncomeVo.getMultipleSelection();
+            for (InsPlyIncomeVo  item:  nowInsPlyIncomeVo ){
+                totalAmount =  totalAmount.add(item.getSettlementAmount()) ;
+            }
+            settlementDocumentaryFeesSumEntity.setPartnerCompaniesId(insPlyIncomeVo.getPartnerCompaniesId());
+            settlementDocumentaryFeesSumEntity.setCompanyId(insPlyIncomeVo.getCompanyId());
+            settlementDocumentaryFeesSumEntity.setCreateTime(new Date());
+            settlementDocumentaryFeesSumEntity.setInvoicId(insPlyIncomeVo.getInvoicId());
+            settlementDocumentaryFeesSumEntity.setInvoicingMethod(insPlyIncomeVo.getInvoicingMethod());
+            settlementDocumentaryFeesSumEntity.setIsNotCar(insPlyIncomeVo.getIsNotCar());
+            settlementDocumentaryFeesSumEntity.setSettlementStatus("1");
+            settlementDocumentaryFeesSumEntity.setUserId(BaseController.getUser().getId());
+            settlementDocumentaryFeesSumEntity.setInvoicedSettledAmount(BigDecimal.ZERO);
+            settlementDocumentaryFeesSumEntity.setCompletionStatus("0");
+            settlementDocumentaryFeesSumEntity.setTotalAmount(totalAmount);// 开票总额
+            settlementDocumentaryFeesSumEntity.setInvoicedNotSettledAmount(totalAmount);
+            settlementDocumentaryFeesSumService.getBaseMapper().insert(settlementDocumentaryFeesSumEntity);
+            return settlementDocumentaryFeesSumEntity;
+        }
+        return settlementDocumentaryFeesSumEntity;
+    }
+
     @Override
     public HttpResult pinHandlingexcel(InsPlyIncomeVo insPlyIncomeVo, HttpServletRequest request, HttpServletResponse response) {
         HashMap<String, Object> params = new HashMap<>();
@@ -2258,11 +2371,14 @@ handlingProportion,
     }
 
     @Override
+    @Transactional
     public HttpResult<Object> singleInvoic(InsPlyIncomeVo insPlyIncomeVo) {
 
         //  通过ids 查出跟单非结算单
         SettlementDocumentaryFeesVo settlementDocumentaryFeesVo = new SettlementDocumentaryFeesVo();  // 生成跟单费结算表
         if (!CollectionUtils.isEmpty(insPlyIncomeVo.getMultipleSelection())) {
+            SettlementDocumentaryFeesSumEntity settlementDocumentaryFeesSumEntity = this.saveSumSettlement(insPlyIncomeVo);
+
             for (InsPlyIncomeVo insPlyIncomeVo1 : insPlyIncomeVo.getMultipleSelection()) {
 
                 insPlyIncomeVo.setSettlementAmount(insPlyIncomeVo1.getSettlementAmount());
@@ -2325,6 +2441,7 @@ handlingProportion,
                     BigDecimal settlementAmount = insPlyIncomeVo.getSettlementAmount();
                     settlementDocumentaryFeesVo.setExpendAmount(settlementAmount.multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100)))));
                 }
+                settlementDocumentaryFeesVo.setSettlementSumId(settlementDocumentaryFeesSumEntity.getId());
                 settlementDocumentaryFeesService.inertSettle(settlementDocumentaryFeesVo);
             }
         }
@@ -2520,4 +2637,6 @@ handlingProportion,
         return HttpResult.ok();
     }
 
+
+
 }

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesSumServiceImpl.java

@@ -0,0 +1,48 @@
+package com.ydtech.modules.fnc.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
+import com.ydtech.modules.fnc.dao.SettlementDocumentaryFeesSumMapper;
+import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity;
+import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
+import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesService;
+import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesSumService;
+import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+public class SettlementDocumentaryFeesSumServiceImpl extends ServiceImpl<SettlementDocumentaryFeesSumMapper, SettlementDocumentaryFeesSumEntity> implements SettlementDocumentaryFeesSumService {
+    @Autowired
+    private SettlementDocumentaryFeesService settlementDocumentaryFeesService;
+
+    @Override
+    @Transactional
+    public HttpResult<Object> voidInvoicing(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
+        String id = settlementDocumentaryFeesSumVo.getId();
+        SettlementDocumentaryFeesSumEntity settlementDocumentaryFeesSumEntity = baseMapper.selectById(id);
+        settlementDocumentaryFeesSumEntity.getCompletionStatus();
+        if (!"0".equals(settlementDocumentaryFeesSumEntity.getCompletionStatus())) {
+            throw new SystemException("已结算不能进行作废");
+        }
+        settlementDocumentaryFeesSumEntity.setSettlementStatus("3");  // 作废
+        baseMapper.updateById(settlementDocumentaryFeesSumEntity);
+
+
+        LambdaQueryWrapper<SettlementDocumentaryFeesEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SettlementDocumentaryFeesEntity::getSettlementSumId, id);
+        List<SettlementDocumentaryFeesEntity> settlementDocumentaryFeesEntities = settlementDocumentaryFeesService.getBaseMapper().selectList(queryWrapper);
+        for (SettlementDocumentaryFeesEntity item : settlementDocumentaryFeesEntities) {
+            item.setSettlementStatus("3");
+            settlementDocumentaryFeesService.updateById(item);
+        }
+        return HttpResult.ok();
+    }
+}

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -359,6 +359,9 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty(value = "协议id")
     private String agreeId;
 
+    @ApiModelProperty("批次开票关联id")
+    private String settlementSumId;
+
 
 
 

src/main/java/com/ydtech/modules/fnc/vo/SettlementDocumentaryFeesSumVo.java

@@ -0,0 +1,77 @@
+package com.ydtech.modules.fnc.vo;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel("开票批次表")
+public class SettlementDocumentaryFeesSumVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    private String id;
+
+
+    @ApiModelProperty("结算总金额")
+    private BigDecimal totalAmount;
+
+
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty("保险id")
+    private String companyId;
+
+    @ApiModelProperty("是否是开票 结算")
+    private String settlementStatus;
+
+
+    @ApiModelProperty("用户")
+    private String userId;
+
+
+    @ApiModelProperty("开票方式")
+    private String invoicingMethod;
+
+
+    @ApiModelProperty("开票号")
+    private String invoicId;
+
+    @ApiModelProperty("是否是非车")
+    private String isNotCar;
+
+    @ApiModelProperty("合作公司id")
+    private String partnerCompaniesId;
+
+
+    @ApiModelProperty("已开票已结算")
+    private BigDecimal invoicedSettledAmount;
+
+    @ApiModelProperty("已开票未结算")
+    private BigDecimal InvoicedNotSettledAmount;
+
+    @ApiModelProperty("结清状态")
+    private String completionStatus;
+
+    @ApiModelProperty(value = "每页页数")
+    @Min(value = 20, message = "页数最小为20")
+    @Max(value = 100, message = "页数最大为100")
+    private int pageSize=20;
+
+    @ApiModelProperty(value = "页数")
+    @Min(value = 1, message = "页数最小为1")
+    private int pageNum=1;
+
+}

src/main/java/com/ydtech/modules/fnc/vo/SettlementDocumentaryFeesVo.java

@@ -129,4 +129,8 @@ public class SettlementDocumentaryFeesVo implements Serializable {
 
     @ApiModelProperty("结清状态")
     private String completionStatus;
+
+    @ApiModelProperty("批次开票关联id")
+    private String settlementSumId;
+
 }

src/main/resources/mapper/modules/fnc/SettlementDocumentaryFeesMapper.xml

@@ -61,6 +61,7 @@
             a.invoiced_settled_amount as "invoicedSettledAmount",
             a.Invoiced_not_settled_amount as "InvoicedNotSettledAmount",
             a.completion_status as "completionStatus",
+            a.settlement_sum_id as "settlementSumId",
             upf.url as "imageUrl",
             a.unsettled_amount as "unsettledAmount"
             from  settlement_documentary_fees  a
@@ -88,6 +89,9 @@
             <if test="completionStatus !=null  and  completionStatus  !=''">
                 and a.completion_status =#{completionStatus}
             </if>
+            <if test="settlementSumId !=null  and  settlementSumId  !=''">
+                and a.settlement_sum_id =#{settlementSumId}
+            </if>
         </where>
         ORDER  BY  a.create_time desc
     </select>

src/main/resources/mapper/modules/fnc/SettlementDocumentaryFeesSumMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.fnc.dao.SettlementDocumentaryFeesSumMapper">
+
+
+
+
+
+</mapper>