新增字段

wujianwei

2025-08-18 b5943e51f38cd2e841f8e12e9da7d3495d96e310

新增字段

 service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java

@@ -391,10 +391,16 @@
     */
    @TableField("bill_id")
    private Integer billId;
    /** 关联账单状态 */
    @Excel(name = "关联账单状态")
    @TableField("related_bill_status")
    private Integer relatedBillStatus;


    /**
     * 关联账单id
     */
    @Excel(name = "账单名称")
    @TableField("bill_name")
    private String billName;


 service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java

@@ -110,4 +110,6 @@
    void updatePendingSettlementBusinessByBillId(@Param("id") Integer id, @Param("billName")String billName);

    PendingSettlementBusiness selectPendingSettlementBusinessByNo(String dispatchNo);

    void updateEstimatedReceivableBillStatus(@Param("list") List<String> list, @Param("status") int status);
}

 service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java

@@ -230,7 +230,7 @@
        estimatedReceivableBillLog.setOperation("本次提交金额"+ settlementAmount);
        estimatedReceivableBillLog.setFileName(estimatedReceivableBill.getAttachment());
        logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
        settledAmount = settledAmount.add(settlementAmount);

        List<String>dispatchNos =pendingSettlementBusinessMapper.selectPendingSettlementBusinessDispatchNos(estimatedReceivableBill.getId());
        // 检查当前提交金额+已结算金额是否超过应结算金额
        if (settlementAmount.add(settledAmount).compareTo(totalAmount) > 0) {
@@ -241,11 +241,15 @@
            //已结算大于应计算金额为已结算
            estimatedReceivableBill.setStatus(2);
            estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
            pendingSettlementBusinessMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
        }else {
            //否则部分结算
            estimatedReceivableBill.setStatus(1);
            estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
           pendingSettlementBusinessMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
        }
        settledAmount = settledAmount.add(settlementAmount);
        estimatedReceivableBill.setSettledAmount(settledAmount);
        return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
    }


 service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml

@@ -541,7 +541,7 @@
    <update id="updatePendingSettlementBusinessIsCreate">

        UPDATE pending_settlement_business
        SET is_create = 1 ,bill_id = #{id},bill_name = #{billName}
        SET is_create = 1 ,bill_id = #{id},bill_name = #{billName},related_bill_status = 1
        WHERE dispatch_no IN
        <foreach item="item" collection="list" open="(" separator="," close=")">
            #{item}
@@ -551,6 +551,14 @@
          UPDATE pending_settlement_business set bill_name = #{billName}
          where bill_id = #{id}

    </update>
    <update id="updateEstimatedReceivableBillStatus">
        UPDATE pending_settlement_business
        SET related_bill_status = #{status}
        WHERE dispatch_no IN
        <foreach item="item" collection="list" open="(" separator="," close=")">
            #{item}
        </foreach>
    </update>

    <!--删除-->
@@ -564,7 +572,7 @@
        </foreach>
    </delete>
    <delete id="cancelRelevancy">
         UPDATE pending_settlement_business set bill_id = null ,bill_name = null,is_create = 0
         UPDATE pending_settlement_business set bill_id = null ,bill_name = null,is_create = 0,related_bill_status = 0
         where id = #{id}
    </delete>