From e567a81f9dd15c15981c25576cc83df6331ea2b5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 11:19:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 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 268b6b1..a8a4c2b 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
@@ -19,6 +19,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.CompensationVO;
import com.doumee.dao.business.vo.RiskConfigVO;
+import com.doumee.dao.business.vo.SettleClaimsMoneyVO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SettleClaimsLogService;
import com.doumee.service.business.SettleClaimsService;
@@ -61,6 +62,8 @@
@Autowired
private SettleClaimsMapper settleClaimsMapper;
+ @Autowired
+ private SettleClaimsExtMapper settleClaimsExtMapper;
@Autowired
private SettleClaimsLogMapper settleClaimsLogMapper;
@@ -381,39 +384,41 @@
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
settleClaims.setOrigin(Constants.ONE);
if(Objects.isNull(settleClaims)
- || Objects.isNull(settleClaims.getMemberName())
- || Objects.isNull(settleClaims.getSolutionName())
- || Objects.isNull(settleClaims.getDuId())
- || Objects.isNull(settleClaims.getWorktypeId())
- || Objects.isNull(settleClaims.getHappenTime())
- || Objects.isNull(settleClaims.getType())
- || Objects.isNull(settleClaims.getInHospital())
- || Objects.isNull(settleClaims.getMedicalInsurance())
- || Objects.isNull(settleClaims.getContent())
- || Objects.isNull(settleClaims.getInformantName())
- || Objects.isNull(settleClaims.getInformantPhone())){
+ || Objects.isNull(settleClaims.getExtData())
+ || Objects.isNull(settleClaims.getExtData().getMemberName())
+ || Objects.isNull(settleClaims.getExtData().getMemberIdcardType())
+ || Objects.isNull(settleClaims.getExtData().getMemberIdcard())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(!loginUserInfo.getType().equals(Constants.ONE)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氬憳宸ユ棤娉曡繘琛岃鎿嶄綔");
+ if(!Constants.equalsObject(settleClaims.getStatus(),Constants.ZERO)
+ &&( Objects.isNull(settleClaims.getExtData().getBxName())
+ || 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(settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda()
- .eq(SettleClaims::getSolutionId,settleClaims.getSolutionId())
- .eq(SettleClaims::getMemberId,loginUserInfo.getId())
- .in(SettleClaims::getStatus,Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey(),
- Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())
- )>Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鎻愭姤涓殑鎶ユ鏁版嵁!");
+ if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲钩鍙扮鐞嗗憳鏃犳硶杩涜璇ユ搷浣�");
}
- settleClaims.setCreateDate(new Date());
+ Date date =new Date();
+ settleClaims.setCreateDate(date);
+ settleClaims.setEditDate(date);
settleClaims.setIsdeleted(Constants.ZERO);
- settleClaims.setCompanyId(loginUserInfo.getCompanyId());
- settleClaims.setStatus(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey());
settleClaims.setCreator(loginUserInfo.getId());
- settleClaims.setCheckUserId(loginUserInfo.getId());
+ //
+ List<SettleClaimsMoneyVO> feeList = settleClaims.getAccountList();
settleClaimsMapper.insert(settleClaims);
+
+ settleClaims.getExtData().setCreator(settleClaims.getCreator());
+ settleClaims.getExtData().setCreateDate(date);
+ settleClaims.getExtData().setEditor(settleClaims.getCreator());
+ settleClaims.getExtData().setEditDate(date);
+ settleClaims.getExtData().setSettileClaimsId(settleClaims.getId());
+ settleClaimsExtMapper.insert(settleClaims.getExtData());
+
+ //--------------澶勭悊闄勪欢寮�濮�----------------
List<Multifile> reportVideo = settleClaims.getReportFileList();
if(CollectionUtils.isNotEmpty(reportVideo)){
for (int i = 0; i < reportVideo.size(); i++) {
@@ -433,6 +438,7 @@
multifileJoinMapper.insert(multifile);
}
}
+ //--------------澶勭悊闄勪欢缁撴潫----------------
return settleClaims.getId();
}
--
Gitblit v1.9.3