xuhy
2025-03-07 a7c07ab992d15406a598e55895e44394554186d6
Merge remote-tracking branch 'origin/master'
3个文件已修改
18 ■■■■ 已修改文件
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -146,7 +146,7 @@
     * 7    待结算
     * 8    已结算
     */
    @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算")
    @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算 9 = 签订待审核")
    @TableField("status")
    private String status;
    @ApiModelProperty(value = "内存大小多个文件逗号拼接")
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
@@ -644,15 +644,14 @@
                        tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
                        tBill.setContractNumber(contract.getContractNumber());
                    }
                    if (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).getDayOfMonth() <= 15) {
                        tBill.setPayableFeesTime(contract.getEndTime().withHour(0).withMinute(0).withSecond(0).toLocalDate());
                    } else {
                        tBill.setPayableFeesTime((contract.getPayType().equals("1") ?
                                beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15).toLocalDate() : contract.getPayType().equals("2") ?
                                beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15).toLocalDate() : beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).withHour(0).withMinute(0).withSecond(0).toLocalDate()));
                    if (tBill.getEndTime().getDayOfMonth()>=15){
                        tBill.setPayableFeesTime(tBill.getStartTime().withDayOfMonth(15).toLocalDate());
                    }else if (tBill.getStartTime().getYear()==tBill.getEndTime().getYear()&& tBill.getStartTime().getMonthValue()==tBill.getEndTime().getMonthValue()){
                        // 如果同年同月 且日小于15 缴费时间取合同
                        tBill.setPayableFeesTime(tBill.getStartTime().toLocalDate());
                    }else{
                        tBill.setPayableFeesTime(tBill.getStartTime().withDayOfMonth(15).toLocalDate());
                    }
                    billService.save(tBill);
                }
                break;
ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
@@ -61,6 +61,7 @@
        t.attachment,
        t.attachment_name,
        t.status,
        t.code,
        t.create_time,
        t.update_time,
        t.create_by,