Browse Source

内外损失提交

DLC 2 months ago
parent
commit
1d5ff96f9b

+ 8 - 0
qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMainCostServiceImpl.java

@@ -159,6 +159,10 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                     qcsMainCostDo3.setCosttotal(allCostTotal);
                 }
             }
+
+            if (!qcsMainCostDo3.getId().equals(costId) && qcsMainCostDo3.getStatus().equals("已提交")) {
+                qualitycosttotal = qualitycosttotal.add(qcsMainCostDo3.getCosttotal());
+            }
         } else {
             //创建同一单位相同年月的内部损失数据
             String mainId3 = SecurityUtil.getUUID();
@@ -204,6 +208,10 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                     qcsMainCostDo4.setCosttotal(allCostTotal);
                 }
             }
+
+            if (!qcsMainCostDo4.getId().equals(costId) && qcsMainCostDo4.getStatus().equals("已提交")) {
+                qualitycosttotal = qualitycosttotal.add(qcsMainCostDo4.getCosttotal());
+            }
         } else {
             //创建同一单位相同年月的外部损失数据
             String mainId4 = SecurityUtil.getUUID();

+ 5 - 0
qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsLossDetailDo.java

@@ -176,6 +176,11 @@ public class QcsLossDetailDo extends BaseDo implements Serializable {
      */
     private BigDecimal totalcost;
 
+    /**
+     * 实际金额(元)
+     */
+    private BigDecimal actamount;
+
     /**
      * 提交时间
      */

+ 5 - 0
qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMainDetailDo.java

@@ -44,4 +44,9 @@ public class QcsMainDetailDo extends BaseDo implements Serializable {
      * 金额(元)
      */
     private BigDecimal amount;
+
+    /**
+     * 实际金额(元)
+     */
+    private BigDecimal actamount;
 }