From 30dd40452030bfdee30ad165b97a823dbc593264 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 六月 2024 17:36:24 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index acc71d5..fbbaaf7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.constants.ResponseStatus;
@@ -1173,7 +1174,7 @@
}
@Override
- public void dealSignResult(NotifyDataReq data){
+ public String dealSignResult(NotifyDataReq data){
if(data.getApplyNo() == null ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -1301,6 +1302,7 @@
return;
}
uploadChangeSignedFileDo(applyChange,fileUrl,path+fileUrl);
+ return;
}
//濮旀墭淇� 鍔犲噺淇濅紒涓氱缃�
@@ -1325,6 +1327,7 @@
return;
}
uploadChangeMemberListSignedFileDo(applyChangeMemberList,fileUrl,path+fileUrl);
+ return;
}
@@ -1339,6 +1342,7 @@
return;
}
uploadUnionApplySignedFileDo(unionApply,fileUrl,path+fileUrl);
+ return;
}
@@ -1358,6 +1362,7 @@
return;
}
uploadUnionChangeSignedFileDo(unionChange,fileUrl,path+fileUrl);
+ return;
}
@@ -1785,7 +1790,7 @@
List<Member> addMemberList = new ArrayList<>();
for (int i = 0; i < applyDetailList.size(); i++) {
ApplyDetail applyDetail = applyDetailList.get(i);
- Member member = new Member();
+ Member member = null;
if(CollectionUtils.isNotEmpty(memberList)){
Optional<Member> optional = memberList.stream().filter(m->m.getIdcardNo().equals(applyDetail.getIdcardNo())).findFirst();
if(optional.isPresent()){
@@ -1833,7 +1838,7 @@
applyDetail.setEndTime(insuranceApply.getApplyEndTime());
applyDetail.setSortnum(i);
applyDetail.setApplyId(insuranceApply.getId());
- Member member = new Member();
+ Member member = null;
if(Objects.isNull(applyDetail.getMemberId())){
if(CollectionUtils.isNotEmpty(memberList)){
Optional<Member> optional = memberList.stream().filter(m->m.getIdcardNo().equals(applyDetail.getIdcardNo())).findFirst();
@@ -2736,6 +2741,7 @@
.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
.isNull(ApplyDetail::getFromId)
.eq(ApplyDetail::getApplyId,model.getId())
+ .orderByAsc(ApplyDetail::getId)
);
model.setApplyDetailList(applyDetailList);
return model;
--
Gitblit v1.9.3