小计

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

@@ -52,9 +52,6 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
 
         QcsMainCostDo qcsMainCostDo = qcsMainCostService.getById(costId);
         Map<String, Object> detailMap = qcsMainCostDao.getAmountSum(costId);
-        if (detailMap != null) {
-            qcsMainCostDo.setCosttotal((BigDecimal) detailMap.get("AMOUNTSUM"));
-        }
         if (qcsMainCostDo.getStatus().equals("已提交")) {
             qualitycosttotal = qualitycosttotal.add(qcsMainCostDo.getCosttotal());
         }
@@ -71,6 +68,10 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
             if (!qcsMainCostDo1.getId().equals(costId) && qcsMainCostDo1.getStatus().equals("已提交")) {
                 qualitycosttotal = qualitycosttotal.add(qcsMainCostDo1.getCosttotal());
             }
+
+            if (qcsMainCostDo1.getId().equals(costId) && detailMap != null) {
+                qcsMainCostDo1.setCosttotal((BigDecimal) detailMap.get("AMOUNTSUM"));
+            }
         } else {
             //创建同一单位相同年月的预防成本数据
             String mainId1 = SecurityUtil.getUUID();
@@ -100,6 +101,10 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
             if (!qcsMainCostDo2.getId().equals(costId) && qcsMainCostDo2.getStatus().equals("已提交")) {
                 qualitycosttotal = qualitycosttotal.add(qcsMainCostDo2.getCosttotal());
             }
+
+            if (qcsMainCostDo2.getId().equals(costId) && detailMap != null) {
+                qcsMainCostDo2.setCosttotal((BigDecimal) detailMap.get("AMOUNTSUM"));
+            }
         } else {
             //创建同一单位相同年月的鉴定成本数据
             String mainId2 = SecurityUtil.getUUID();