费控没有总金额问题处理

hx-form/src/main/java/com/fjhx/form/service/cost/impl/CostControlServiceImpl.java

@@ -51,6 +51,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -224,7 +225,6 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
     @Override
     @DSTransactional
     public void addOrEdit(CostControlDto costControlDto) {
-        this.saveOrUpdate(costControlDto);
 
         //保存明细信息
         List<CostControlDetailDto> costControlDetailList = costControlDto.getCostControlDetailList();
@@ -232,6 +232,15 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
             costControlDetailList = new ArrayList<>();
         }
 
+        //计算总金额
+        BigDecimal sumMoney = costControlDetailList.stream()
+                .map(CostControlDetail::getMoney)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        costControlDto.setAmount(sumMoney);
+
+        this.saveOrUpdate(costControlDto);
+
+
         //删除无效数据
         List<Long> idList = costControlDetailList.stream().map(BaseIdPo::getId).filter(Objects::nonNull).collect(Collectors.toList());
         List<CostControlDetail> delList = costControlDetailService.list(q -> q.eq(CostControlDetail::getCostControlId, costControlDto.getId()).notIn(ObjectUtil.isNotEmpty(idList), BaseIdPo::getId, idList));

hx-sale/src/main/java/com/fjhx/sale/service/arrival/impl/ArrivalDetailServiceImpl.java

@@ -77,14 +77,14 @@ public class ArrivalDetailServiceImpl extends ServiceImpl<ArrivalDetailMapper, A
         this.updateById(dto);
         //更新待入库账期
         stockWaitDetailsService.update(q -> q
-                .eq(StockWaitDetails::getArrivalId, dto.getId())
+                .eq(StockWaitDetails::getArrivalDetailId, dto.getId())
                 .set(StockWaitDetails::getAccountPeriod, dto.getAccountPeriod())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );
         //更新流水账期
         stockJournalDetailsService.update(q -> q
-                .eq(StockJournalDetails::getArrivalId, dto.getId())
+                .eq(StockJournalDetails::getArrivalDetailId, dto.getId())
                 .set(StockJournalDetails::getAccountPeriod, dto.getAccountPeriod())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())