From 5e9d36400c0b688ead2cab11ad7d54a9c25014a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Wed, 26 Nov 2025 19:01:14 +0800
Subject: [PATCH] =?UTF-8?q?11-26-=E6=89=BF=E5=8C=85=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=8D=95=E4=BD=8D=E6=94=B9=E4=B8=BA=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xzd/domain/bo/XzdContractDetailsBo.java      |  2 +-
 .../xzd/domain/vo/XzdContractDetailsVo.java      |  4 ++--
 .../impl/XzdContractDetailsServiceImpl.java      | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java
index 3a48edc4..66f7d274 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java
@@ -110,7 +110,7 @@ public class XzdContractDetailsBo extends BaseEntity {
     /**
      * 开票单位
      */
-    @NotNull(message = "开票单位不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "开票单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long invoicingUnit;
 
     /**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java
index c065d3f3..32524f17 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java
@@ -147,7 +147,7 @@ public class XzdContractDetailsVo implements Serializable {
     private BigDecimal contractAmount;
 
     /**
-     * 开票单位(供应商)
+     * 开票单位(供应商,现改为部门公司)
      */
     @ExcelProperty(value = "开票单位")
     private Long invoicingUnit;
@@ -155,7 +155,7 @@ public class XzdContractDetailsVo implements Serializable {
     /**
      * 开票单位名称
      */
-    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "invoicingUnit")
+//    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "invoicingUnit")
     private String invoicingUnitName;
 
     /**
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 850c57af..12aaf8e6 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
@@ -185,6 +185,17 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
         add.setContractCode(banBen);
         add.setHtzt("正常");
 
+        //开票单位(部门)  要获取到顶级(公司)
+        if (bo.getInvoicingUnit() != null) {
+            SysDeptVo sysDeptVo = sysDeptService.selectDeptById(bo.getInvoicingUnit());
+            while (sysDeptVo != null && sysDeptVo.getParentId() != 100){
+                sysDeptVo = sysDeptService.selectDeptById(sysDeptVo.getParentId());
+            }
+            if (sysDeptVo != null) {
+                add.setInvoicingUnit(sysDeptVo.getDeptId());
+            }
+        }
+
         boolean flag = baseMapper.insert(add) > 0;
         if (!flag) {
             return false;
@@ -565,6 +576,11 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
                 info.setContractAmount(changeVo.getPostChangeTotalCost());
             }
 
+            //获取开票单位(部门公司)
+            SysDeptVo sysDeptVo = sysDeptService.selectDeptById(info.getInvoicingUnit());
+            if (sysDeptVo != null){
+                info.setInvoicingUnitName(sysDeptVo.getDeptName());
+            }
         }
     }