diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index e4240dd3ea..187c45a9f3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1190,7 +1190,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName()); List records = collectionConfirmList.getRecords(); for (AppFinUncollectedReceivablesDetailedVo record : records) { - record.setReceivable(record.getConfirmMoney()); +// record.setReceivable(record.getConfirmMoney()); record.setConfirmDate(dateFormat.format(new Date())); String busVinSid = record.getBusVinSid(); ResultBean resultBean = busSalesOrderVehicleFeign.details(busVinSid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java index a6dbf40158..ca35fa6ce9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java @@ -15,8 +15,8 @@ import java.util.List; @Data public class OrderDetailsVo implements Vo { private static final long serialVersionUID = 3824138856793171263L; - // @ApiModelProperty(value = "合同编号") -// private String contractId; + @ApiModelProperty(value = "合同编号") + private String contractId; @ApiModelProperty(value = "制单日期") private String orderDate; @ApiModelProperty(value = "客户sid")