From 60acccaebef503315c852f31677b44eb3fd40a4f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 六月 2025 10:29:29 +0800
Subject: [PATCH] 提交一把订单
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index 997b409..c6f2cf7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -406,20 +406,22 @@
settleClaims.setOrigin(Constants.ONE);
if(Objects.isNull(settleClaims)
|| Objects.isNull(settleClaims.getExtData())
+ || Objects.isNull(settleClaims.getExtData().getBxName())
|| Objects.isNull(settleClaims.getExtData().getMemberName())
|| Objects.isNull(settleClaims.getExtData().getMemberIdcardType())
- || Objects.isNull(settleClaims.getExtData().getMemberIdcard())){
+ || Objects.isNull(settleClaims.getExtData().getMemberIdcard())
+ || Objects.isNull(settleClaims.getStatus())
+ ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(!Constants.equalsObject(settleClaims.getStatus(),Constants.ZERO)
- &&( Objects.isNull(settleClaims.getExtData().getBxName())
- || Objects.isNull(settleClaims.getExtData().getReportDate())
- || Objects.isNull(settleClaims.getExtData().getBxCode())
- || Objects.isNull(settleClaims.getExtData().getBxEnddate())
- || Objects.isNull(settleClaims.getExtData().getBxOrg())
- || Objects.isNull(settleClaims.getInformantPhone()) )){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
+// if(!Constants.equalsObject(settleClaims.getStatus(),Constants.ZERO)
+// &&( Objects.isNull(settleClaims.getExtData().getReportDate())
+// || Objects.isNull(settleClaims.getExtData().getBxCode())
+// || Objects.isNull(settleClaims.getExtData().getBxEnddate())
+// || Objects.isNull(settleClaims.getExtData().getBxOrg())
+// || Objects.isNull(settleClaims.getInformantPhone()) )){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST);
+// }
if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲钩鍙扮鐞嗗憳鏃犳硶杩涜璇ユ搷浣�");
}
@@ -1364,9 +1366,9 @@
||Objects.isNull(settleClaimsDTO.getMedicalInsurance())
||StringUtils.isBlank(settleClaimsDTO.getInformantName())
||StringUtils.isBlank(settleClaimsDTO.getInformantPhone())
- ||StringUtils.isBlank(settleClaimsDTO.getReceiveUserName())
- ||StringUtils.isBlank(settleClaimsDTO.getReceiveBank())
- ||StringUtils.isBlank(settleClaimsDTO.getReceiveAccount())
+// ||StringUtils.isBlank(settleClaimsDTO.getReceiveUserName())
+// ||StringUtils.isBlank(settleClaimsDTO.getReceiveBank())
+// ||StringUtils.isBlank(settleClaimsDTO.getReceiveAccount())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -2992,10 +2994,13 @@
settleClaimsDataVO.setSettleClaimsTotal(settleClaimsList.size());
//骞冲潎鐞嗚禂澶勭悊鏃堕暱澶╂暟 鎬昏澶勭悊鏃堕暱锛堝崟浣嶅皬鏃讹級闄や互 璁板綍鏁� 鎹㈢畻鍒板ぉ
- settleClaimsDataVO.setAverageSettleClaimsTime(
- new BigDecimal(closeCaseList.stream().map(i->i.getTotalHours()).reduce(Constants.ZERO,Integer::sum).toString())
- .divide(new BigDecimal((closeCaseList.size()*24)+"") ,2,BigDecimal.ROUND_HALF_UP)
- );
+ if(CollectionUtils.isNotEmpty(closeCaseList)){
+ settleClaimsDataVO.setAverageSettleClaimsTime(
+ new BigDecimal(closeCaseList.stream().map(i->i.getTotalHours()).reduce(Constants.ZERO,Integer::sum).toString())
+ .divide(new BigDecimal((closeCaseList.size()*24)+"") ,2,BigDecimal.ROUND_HALF_UP)
+ );
+ }
+
String monthDate = DateUtil.getFomartDate(new Date(),"yyyy-MM");
Calendar calendar = Calendar.getInstance();
--
Gitblit v1.9.3