diff --git a/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/dto/request/TrainingSettleSaveRequest.java b/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/dto/request/TrainingSettleSaveRequest.java index 970e1337c4d5104a33b03fba6015a662a456c9ed..326a873a6c1d7c22c6ea9f4b0b7a90f52ae1c039 100644 --- a/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/dto/request/TrainingSettleSaveRequest.java +++ b/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/dto/request/TrainingSettleSaveRequest.java @@ -22,6 +22,10 @@ public class TrainingSettleSaveRequest { @ApiModelProperty(value = "鍩硅璇剧▼id") private Long trainingCourseId; @NotNull(message = "娓呭崟鏄庣粏涓嶈兘涓虹┖") - @ApiModelProperty(value = "娓呭崟鏄庣粏") - List<TrainingSettleDetailRequest> detailRequestList; + @ApiModelProperty(value = "娓呭崟鏄庣粏浼欓") + List<TrainingSettleDetailRequest> detailFoodRequestList; + + @NotNull(message = "娓呭崟鏄庣粏涓嶈兘涓虹┖") + @ApiModelProperty(value = "娓呭崟鏄庣粏浣忓") + List<TrainingSettleDetailRequest> detailStayRequestList; } diff --git a/ServiceSiteCommon/src/main/java/com/seasky/template/business/service/TrainingSettleServiceImpl.java b/ServiceSiteCommon/src/main/java/com/seasky/template/business/service/TrainingSettleServiceImpl.java index b988cc37fe7636f5332bf1967cda5d83bd2fef3d..23161eb381b49a2f92a8e221ef33fe1975e17393 100644 --- a/ServiceSiteCommon/src/main/java/com/seasky/template/business/service/TrainingSettleServiceImpl.java +++ b/ServiceSiteCommon/src/main/java/com/seasky/template/business/service/TrainingSettleServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -43,7 +44,15 @@ public class TrainingSettleServiceImpl extends AbstractService<TrainingSettle, T @Transactional @Override public void saveOrUpdateTrainingSettle(TrainingSettleSaveRequest request) { - List<TrainingSettleDetailRequest> detailRequestList = request.getDetailRequestList(); + List<TrainingSettleDetailRequest> detailRequestList = new ArrayList<>(); + List<TrainingSettleDetailRequest> detailFoodRequestList = request.getDetailFoodRequestList(); + List<TrainingSettleDetailRequest> detailStayRequestList = request.getDetailStayRequestList(); + if(detailFoodRequestList!=null){ + detailRequestList.addAll(detailFoodRequestList); + } + if(detailStayRequestList!=null){ + detailRequestList.addAll(detailStayRequestList); + } Map<String, BigDecimal> bigDecimalMap = calculateTotalAmountByTrainingTypeDynamic(detailRequestList); if(bigDecimalMap.isEmpty()){ return;