czh 2 лет назад
Родитель
Сommit
08bae03d53

+ 1 - 1
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -149,7 +149,7 @@ public class KwcContractTradeService {
             queryListResVo.setSigningWayName(DictEnum.getLabel(DictTypeEnum.SIGNING_TYPE.getType(), queryListResDto.getSigningWay()));
             queryListResVo.setSigningWay(queryListResDto.getSigningWay());
             queryListResVo.setAmount(queryListResDto.getAmount());
-            queryListResVo.setPerformedAmount(new BigDecimal("0"));
+            queryListResVo.setPerformedAmount(queryListResDto.getPerformedAmount());
             list.add(queryListResVo);
         }
         return list;

+ 2 - 1
sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -59,7 +59,8 @@
                b.firm_name entName,
                e.ent_id targetEntId,
                e.firm_name targetEntName,
-               a.contract_pid contractPid
+               a.contract_pid contractPid,
+               a.performed_amount performedAmount
           from kwc_contract_trade a
           left join kwc_contract_trade_unit b
             on a.id = b.contract_id