合同添加已收款金额

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -132,7 +132,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         if (!Objects.equals(companyId, 100L)) {
             wrapper.eq("arw.company_id", companyId);
         } else {
-            wrapper.eq("arw.company_id", dto.getCompanyId());
+            wrapper.eq(ObjectUtil.isNotEmpty(dto.getCompanyId()), "arw.company_id", dto.getCompanyId());
         }
 
         return wrapper;
@@ -221,6 +221,10 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
             throw new ServiceException("币种不能为空");
         }
 
+        //赋值归属公司
+        dto.setCompanyId(SecurityUtils.getCompanyId());
+
+
 //        dto.setRate(ExchangeRateUtil.getCnyToCodeRate(dto.getCurrency()));
 
         //计算汇率如果有填转人民币金额则反推

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -16,10 +16,8 @@
                            c.name                            customerName,
                            us.nick_name                      salesmanName,
                            us.user_id                        salesmanId,
-                           (SELECT IFNULL(SUM(IFNULL(cc.money_cny, IFNULL(cc.money, 0) * IFNULL(arw.rate, 1))), 0)
+                           (SELECT IFNULL(SUM(cc.contract_money), 0)
                             FROM claim_contract cc
-                                     left join claim c on cc.claim_id = c.id
-                                     LEFT JOIN account_running_water arw on c.business_id = arw.id
                             WHERE cc.contract_id = t1.id) AS sumClaimMoney
                     FROM contract t1
                              left join customer c on t1.buy_corporation_id = c.id