From 9bb41d903ec26b28aaf638e60942f676b80e980d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Mon, 24 Nov 2025 10:22:00 +0800
Subject: [PATCH] =?UTF-8?q?11-24-=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/xzd/domain/XzdDeductionItems.java  |  9 +++++----
 .../dromara/xzd/domain/bo/XzdDeductionItemsBo.java |  5 +++--
 .../dromara/xzd/domain/vo/XzdDeductionItemsVo.java |  5 +++--
 .../impl/XzdContractDetailsServiceImpl.java        | 14 +++++++-------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java
index 986fec07..1ce0d76c 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
@@ -99,14 +100,14 @@ public class XzdDeductionItems extends BaseEntity {
     private LocalDate changeReturnTime;
 
     /**
-     * 申请扣除（0：否，1：是）
+     * 申请扣除（0：否，1：是）(改为金额)
      */
-    private Long applyDeduction;
+    private BigDecimal applyDeduction;
 
     /**
-     * 变更申请扣除（0：否，1：是）
+     * 变更申请扣除（0：否，1：是）(改为金额)
      */
-    private Long changeApplyDeduction;
+    private BigDecimal changeApplyDeduction;
 
     /**
      * 备注
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java
index 3e8907c0..6c64e72b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java
@@ -10,6 +10,7 @@ import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.xzd.domain.XzdDeductionItems;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
@@ -98,12 +99,12 @@ public class XzdDeductionItemsBo extends BaseEntity {
     /**
      * 申请扣除（0：否，1：是）
      */
-    private Long applyDeduction;
+    private BigDecimal applyDeduction;
 
     /**
      * 变更申请扣除（0：否，1：是）
      */
-    private Long changeApplyDeduction;
+    private BigDecimal changeApplyDeduction;
 
     /**
      * 备注
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdDeductionItemsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdDeductionItemsVo.java
index 4c1e014e..51c9b667 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdDeductionItemsVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdDeductionItemsVo.java
@@ -10,6 +10,7 @@ import org.dromara.xzd.domain.XzdDeductionItems;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 
@@ -116,14 +117,14 @@ public class XzdDeductionItemsVo implements Serializable {
      */
     @ExcelProperty(value = "申请扣除", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=：否，1：是")
-    private Long applyDeduction;
+    private BigDecimal applyDeduction;
 
     /**
      * 变更申请扣除（0：否，1：是）
      */
     @ExcelProperty(value = "变更申请扣除", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=：否，1：是")
-    private Long changeApplyDeduction;
+    private BigDecimal changeApplyDeduction;
 
     /**
      * 备注
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
index 115ca123..850c57af 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
@@ -25,7 +25,6 @@ import org.dromara.xzd.domain.*;
 import org.dromara.xzd.domain.bo.XzdContractDetailsBo;
 import org.dromara.xzd.domain.vo.XzdContractChangeVo;
 import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
-import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
 import org.dromara.xzd.enums.XzdClassEnum;
 import org.dromara.xzd.mapper.XzdContractDetailsMapper;
 import org.dromara.xzd.service.IXzdContractDetailsService;
@@ -510,13 +509,14 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
                 }
                 info.setSealNameDetail(xzdBusinessInfos);
             }
+
             //签约组织(供应商)
-            if (info.getSigningOrganization() != null) {
-                XzdSupplierInfoVo xzdSupplierInfoVo2 = xzdSupplierInfoService.queryById(info.getSigningOrganization());
-                if (xzdSupplierInfoVo2 != null) {
-                    info.setSigningOrganizationName(xzdSupplierInfoVo2.getUnitName());
-                }
-            }
+//            if (info.getSigningOrganization() != null) {
+//                XzdSupplierInfoVo xzdSupplierInfoVo2 = xzdSupplierInfoService.queryById(info.getSigningOrganization());
+//                if (xzdSupplierInfoVo2 != null) {
+//                    info.setSigningOrganizationName(xzdSupplierInfoVo2.getUnitName());
+//                }
+//            }
 
             //合同文本-预收款项
             LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();