提交一把

jiangping

2024-06-07 30dd40452030bfdee30ad165b97a823dbc593264

 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;