合同样品单分页添加币种

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -102,9 +102,9 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
             claimContractService.saveBatch(claimContractList);
         }
         //更新流水数据已认领金额
-        if(water.getClaimAmount().add(claim.getAmount()).compareTo(water.getAmount())==0){//如果认领金额=流水金额
+        if (water.getClaimAmount().add(claim.getAmount()).compareTo(water.getAmount()) >= 0) {//如果认领金额=流水金额
             water.setIsClaim(1);//已认领状态
-        }else{
+        } else {
             water.setIsClaim(2);//部分认领
         }
         water.setClaimAmount(water.getClaimAmount().add(claim.getAmount()));

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

@@ -396,7 +396,8 @@
              FROM claim_contract cc
                       LEFT JOIN claim c ON cc.claim_id = c.id
                       LEFT JOIN bytesailing_account.account_running_water arw ON c.business_id = arw.id
-             WHERE cc.contract_id = t1.id) AS sumContractClaimMoney
+             WHERE cc.contract_id = t1.id) AS sumContractClaimMoney,
+            t1.currency
         FROM contract t1
         WHERE t1.`status` >= 30
           AND t1.`status` < 88
@@ -404,10 +405,7 @@
         AND t1.is_change = 0
         UNION
         SELECT
-            t1.id,
-        t1.sell_corporation_id,
-        3 AS contract_type, 2 AS dataType, t1.`code`, t1.buy_corporation_id, t1.versions AS version, t1.amount, t1.create_user, t1.create_time, IF
-            ( sumClaimMoney >= t1.amount, 20, IF ( sumClaimMoney != 0, 10, 0 ) ) AS refund_status, t1.`status`, t1.sumClaimMoney, t1.sumContractClaimMoney
+            t1.id, t1.sell_corporation_id, 3 AS contract_type, 2 AS dataType, t1.`code`, t1.buy_corporation_id, t1.versions AS version, t1.amount, t1.create_user, t1.create_time, IF( sumClaimMoney >= t1.amount, 20, IF ( sumClaimMoney != 0, 10, 0 ) ) AS refund_status, t1.`status`, t1.sumClaimMoney, t1.sumContractClaimMoney, t1.currency
         FROM
             (
             SELECT