From 967d97312e8015cd4de89377170101cd074a41cc Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Fri, 22 Aug 2025 22:58:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FacBoxTransformerServiceImpl.java   |  4 ++--
 .../service/impl/FacInverterServiceImpl.java         |  4 ++--
 .../impl/FacPhotovoltaicPanelColumnServiceImpl.java  |  2 +-
 .../impl/FacPhotovoltaicPanelPartsServiceImpl.java   |  2 +-
 .../impl/FacPhotovoltaicPanelPointServiceImpl.java   |  2 +-
 .../impl/FacPhotovoltaicPanelServiceImpl.java        |  4 ++--
 .../impl/FacPhotovoltaicPanelSupportServiceImpl.java |  2 +-
 .../dromara/progress/domain/PgsProgressCategory.java |  9 +++++++--
 .../vo/progresscategory/PgsProgressCategoryVo.java   | 12 +++++++++---
 .../service/impl/PgsProgressCategoryServiceImpl.java |  4 ++--
 10 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java
index 33e3a541..7f27eee5 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java
@@ -248,7 +248,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
             progressCategory.setTotal(BigDecimal.valueOf(total));
             // 如果单价不为 0 则计算产值
             if (unitPrice.compareTo(BigDecimal.ZERO) != 0) {
-                progressCategory.setOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
+                progressCategory.setOwnerOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
             }
         }
         boolean result = progressCategoryService.updateBatchById(progressCategoryList);
@@ -307,7 +307,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
             Optional.ofNullable(progressCategory.getUnitPrice())
                 .orElse(BigDecimal.ZERO)
         ));*/
-        progressCategory.setOutputValue(total.multiply(
+        progressCategory.setOwnerOutputValue(total.multiply(
             Optional.ofNullable(progressCategory.getOwnerPrice())
                 .orElse(BigDecimal.ZERO)
         ));
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java
index e063e869..b8d8e9de 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java
@@ -248,7 +248,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
             progressCategory.setTotal(BigDecimal.valueOf(total));
             // 如果单价不为 0 则计算产值
             if (unitPrice.compareTo(BigDecimal.ZERO) != 0) {
-                progressCategory.setOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
+                progressCategory.setOwnerOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
             }
         }
         boolean result = progressCategoryService.updateBatchById(progressCategoryList);
@@ -303,7 +303,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
         }
         BigDecimal total = BigDecimal.valueOf(newInverterList.size());
         progressCategory.setTotal(total);
-        progressCategory.setOutputValue(total.multiply(
+        progressCategory.setOwnerOutputValue(total.multiply(
             Optional.ofNullable(progressCategory.getOwnerPrice())
                 .orElse(BigDecimal.ZERO)
         ));
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java
index 7201808e..8dda14ca 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java
@@ -175,7 +175,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
         }
         BigDecimal total = BigDecimal.valueOf(newColumnList.size());
         progressCategory.setTotal(total);
-        progressCategory.setOutputValue(total.multiply(
+        progressCategory.setOwnerOutputValue(total.multiply(
             Optional.ofNullable(progressCategory.getOwnerPrice())
                 .orElse(BigDecimal.ZERO)
         ));
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java
index 12d117cb..92d55081 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java
@@ -482,7 +482,7 @@ public class FacPhotovoltaicPanelPartsServiceImpl implements IFacPhotovoltaicPan
                 progressCategory.setTotal(BigDecimal.valueOf(total));
                 // 如果单价不为 0 则计算产值
                 if (unitPrice != null && unitPrice.compareTo(BigDecimal.ZERO) != 0) {
-                    progressCategory.setOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
+                    progressCategory.setOwnerOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
                 }
             }
             boolean result = progressCategoryService.updateBatchById(progressCategoryList);
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java
index a81cc5f7..e37510d4 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java
@@ -175,7 +175,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
         }
         BigDecimal total = BigDecimal.valueOf(newPointList.size());
         progressCategory.setTotal(total);
-        progressCategory.setOutputValue(total.multiply(
+        progressCategory.setOwnerOutputValue(total.multiply(
             Optional.ofNullable(progressCategory.getOwnerPrice())
                 .orElse(BigDecimal.ZERO)
         ));
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
index 3e3ecd1b..6bb21f12 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
@@ -378,7 +378,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
                         progressCategory.setTotal(BigDecimal.valueOf(total));
                         // 如果单价不为 0 则计算产值
                         if (unitPrice.compareTo(BigDecimal.ZERO) != 0) {
-                            progressCategory.setOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
+                            progressCategory.setOwnerOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
                         }
                     }
                     boolean result = progressCategoryService.updateBatchById(progressCategoryList);
@@ -512,7 +512,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
             Optional.ofNullable(progressCategory.getUnitPrice())
                 .orElse(BigDecimal.ZERO)
         ));   */
-        progressCategory.setOutputValue(total.multiply(
+        progressCategory.setOwnerOutputValue(total.multiply(
             Optional.ofNullable(progressCategory.getOwnerPrice())
                 .orElse(BigDecimal.ZERO)
         ));
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java
index 8bc4c184..593c007e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java
@@ -175,7 +175,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
         }
         BigDecimal total = BigDecimal.valueOf(newSupportList.size());
         progressCategory.setTotal(total);
-        progressCategory.setOutputValue(total.multiply(
+        progressCategory.setOwnerOutputValue(total.multiply(
             Optional.ofNullable(progressCategory.getOwnerPrice())
                 .orElse(BigDecimal.ZERO)
         ));
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressCategory.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressCategory.java
index b8107450..a9b6c40d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressCategory.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressCategory.java
@@ -75,9 +75,14 @@ public class PgsProgressCategory extends BaseEntity {
     private BigDecimal constructionPrice;
 
     /**
-     * 产值金额
+     * 产值金额(业主)
      */
-    private BigDecimal outputValue;
+    private BigDecimal ownerOutputValue;
+
+    /**
+     * 产值金额(分包)
+     */
+    private BigDecimal constructionOutputValue;
 
     /**
      * 总数量
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/vo/progresscategory/PgsProgressCategoryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/vo/progresscategory/PgsProgressCategoryVo.java
index 2f7f01da..dcb272f8 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/vo/progresscategory/PgsProgressCategoryVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/vo/progresscategory/PgsProgressCategoryVo.java
@@ -137,10 +137,16 @@ public class PgsProgressCategoryVo implements Serializable {
     private BigDecimal constructionPrice;
 
     /**
-     * 产值金额
+     * 产值金额(业主)
      */
-    @ExcelProperty(value = "产值金额")
-    private BigDecimal outputValue;
+    @ExcelProperty(value = "产值金额(业主)")
+    private BigDecimal ownerOutputValue;
+
+    /**
+     * 产值金额(分包)
+     */
+    @ExcelProperty(value = "产值金额(分包)")
+    private BigDecimal constructionOutputValue;
 
     /**
      * 工作类型
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
index 5769e194..55a0a87b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
@@ -201,7 +201,7 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
         }
         // 计算产值
         if (unitPrice != null && total != null && unitPrice.compareTo(BigDecimal.ZERO) >= 0 && total.compareTo(BigDecimal.ZERO) >= 0) {
-            progressCategory.setOutputValue(unitPrice.multiply(total));
+            progressCategory.setOwnerOutputValue(unitPrice.multiply(total));
         }
         if (StringUtils.isNotBlank(workType) && PgsProgressCategoryConstant.WORK_TYPE_LIST.contains(workType)) {
             List<PgsProgressCategory> progressCategoryList = this.lambdaQuery()
@@ -286,7 +286,7 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
         progressCategory.setUnit(req.getUnit());
         progressCategory.setOwnerPrice(unitPrice);
 //  todo      progressCategory.setUnitPrice(unitPrice);
-        progressCategory.setOutputValue(outputValue);
+        progressCategory.setOwnerOutputValue(outputValue);
         // 写入数据库
         return this.updateById(progressCategory);
     }