From 32418ccf94327d5446f4e87337cb7ff7bc8c3131 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 04 四月 2025 01:49:12 +0800 Subject: [PATCH] bug修改 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 2 ++ ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 31 ++++++++++++++++++------------- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 2 ++ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java index 9eb6592..2456e4c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java @@ -14,6 +14,7 @@ import com.ruoyi.common.constant.DictConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.enums.DisabledEnum; import com.ruoyi.common.enums.ProcessCategoryEnum; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; @@ -392,6 +393,7 @@ firstBill = billService.lambdaQuery() .eq(TBill::getContractId, contractId) .orderByAsc(TBill::getStartTime) + .ne(TBill::getManualAddition, DisabledEnum.YES.getCode()) .last("limit 1") .one(); tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java index 2970b75..2ea41f2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java @@ -1,24 +1,23 @@ package com.ruoyi.system.model; -import com.baomidou.mybatisplus.annotation.*; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.ruoyi.common.core.domain.BaseModel; -import com.ruoyi.common.core.domain.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.data.annotation.Transient; -import springfox.documentation.annotations.ApiIgnore; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; /** * <p> @@ -184,6 +183,12 @@ @TableField(exist = false) private BigDecimal preOutstand; + @ApiModelProperty(value = "是否管理后台添加 1=是 0=否 用于生成合同附件时过滤管理后台添加的账单,查询首个账单") + @TableField("is_manual_addition") + private Integer manualAddition; + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java index 42adf5f..c49375a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java @@ -5,6 +5,7 @@ import com.ruoyi.common.constant.AmountConstant; import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.enums.DisabledEnum; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.OrderNos; @@ -247,6 +248,7 @@ @Override @Transactional(rollbackFor = Exception.class) public void saveBill(TbillSaveDto bill) { + bill.setManualAddition(DisabledEnum.YES.getCode()); save(bill); if (bill.getBillType().equals("3")){ if (bill.getDetails()==null || bill.getDetails().size()==0){ -- Gitblit v1.7.1