git ch

k94314517

2024-04-09 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c

 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java

@@ -105,6 +105,8 @@
    private UnionApplyJoinMapper unionApplyJoinMapper;
    @Autowired
    private UnionChangeJoinMapper unionChangeJoinMapper;
    @Autowired
    private CompanySolutionMapper companySolutionMapper;

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -113,24 +115,31 @@
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());

        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
        }

        Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
        if(Objects.isNull(solutions)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询方案信息");
        }

        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        InsuranceApply update = new InsuranceApply();
        if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
            if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
            }
            update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey());
        }else{
            if( !(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())
            || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
            || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()))){
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
            }
            update.setStatus(Constants.InsuranceApplyStatus.WTB_RETURN.getKey());
        }

        update.setEditDate(new Date());
        update.setEditor(user.getId());
        update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey());
        update.setCheckDate(update.getEditDate());
        update.setCheckInfo(insuranceApply.getCheckInfo());
        update.setCheckUserId(user.getId());
@@ -517,8 +526,22 @@
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
                .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
                .eq(Notices::getObjId,model.getId()));
        //平台待办
        Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),model.getSolutionsName(),model.getCompanyId(),Constants.NoticeType.TWO);
        noticesMapper.insert(notices);

        CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
                .eq(CompanySolution::getIsdeleted,Constants.ZERO)
                .eq(CompanySolution::getSolutionId,model.getSolutionId())
                .eq(CompanySolution::getCompanyId,model.getCompanyId())
                .last("limit 1")
        );
        //商户待办
        if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
            Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
                    model.getId(),model.getSolutionsName(),companySolution.getShopId(),Constants.NoticeType.ZERO);
            noticesMapper.insert(shopNotices);
        }

        Multifile f = new Multifile();
        f.setIsdeleted(Constants.ZERO);
@@ -601,7 +624,7 @@
        f.setCreator(model.getCreator());
        f.setObjId(update.getId());
        f.setCreateDate(update.getEditDate());
        f.setObjType(Constants.MultiFile.COMPANY_TBD_SIGNED_PDF.getKey());
        f.setObjType(Constants.MultiFile.BD_SIGNED_PDF.getKey());
        f.setType(Constants.TWO);
        f.setFileurl(fileurl);
        f.setFileurlFull(fullUrl);
@@ -648,10 +671,24 @@
        multifileMapper.insert(f);



        //数据日志
        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_MEMBER_LIST;
        ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
                ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        applyLogMapper.insert(log);

        Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
        //待办通知
        if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
            Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
            Notices notices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),
                    solutions.getShopId(), Constants.NoticeType.SEVEN);
            notices.setParam1(model.getId().toString());
            noticesMapper.insert(notices);
        }


        return  f;
    }
    
@@ -682,6 +719,15 @@
        notices.setParam1(model.getApplyId().toString());
        noticesMapper.insert(notices);

        Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
        //商户待办
        if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
            Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
                    model.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.TWO);
            notices.setParam1(model.getApplyId().toString());
            noticesMapper.insert(shopNotices);
        }

        Multifile f = new Multifile();
        f.setIsdeleted(Constants.ZERO);
        f.setCreator(model.getCreator());
@@ -708,7 +754,7 @@
        ApplyChange update = new ApplyChange();
        update.setEditDate(new Date());
        update.setEditor(model.getCreator());
        update.setStatus(Constants.ApplyChangeStatus.COMPANY_SIGN.getKey());
        update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
        update.setCheckDate(update.getEditDate());
        update.setCheckInfo("企业完成签署人员名单");
        update.setCheckUserId(model.getCreator());
@@ -720,7 +766,11 @@
        f.setCreator(model.getCreator());
        f.setObjId(update.getId());
        f.setCreateDate(update.getEditDate());
        f.setObjType(Constants.MultiFile.CHANGE_MEMBER_LIST_LATTER.getKey());
        if(model.getType().equals(Constants.ZERO)){
            f.setObjType(Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey());
        }else{
            f.setObjType(Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey());
        }
        f.setType(Constants.TWO);
        f.setFileurl(fileurl);
        f.setFileurlFull(fullurl);
@@ -732,6 +782,19 @@
        ApplyLog log = new ApplyLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        applyLogMapper.insert(log);


        Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
        //待办通知
        if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
            Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
            if(model.getType().equals(Constants.ONE)){
                noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
            }
            Notices notices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),
                    solutions.getShopId(), Constants.NoticeType.SEVEN);
            notices.setParam1(model.getApplyId().toString());
            noticesMapper.insert(notices);
        }
        return f;
    }

@@ -758,7 +821,7 @@
        f.setCreator(model.getCreator());
        f.setObjId(update.getId());
        f.setCreateDate(update.getEditDate());
        f.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey());
        f.setObjType(Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey());
        f.setType(Constants.TWO);
        f.setFileurl(fileurl);
        f.setFileurlFull(fullUrl);
@@ -799,8 +862,8 @@
        f.setType(Constants.TWO);
        f.setFileurl(fileurl);
        f.setFileurlFull(fullUrl);
        f.setInfo("委托加减保/换厂业务 -投保单");
        f.setName("委托加减保/换厂业务 -投保单.pdf");
        f.setInfo("投保申请单 -申请单");
        f.setName("投保申请单.pdf");
        multifileMapper.insert(f);

        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_SIGNATURE_TBD;
@@ -958,6 +1021,7 @@
                .selectAll(ApplyChange.class)
                .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
                .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
                .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
                .selectAs(Company::getName,InsuranceApply::getCompanyName)
                .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -983,11 +1047,13 @@
            }
        }

        //委托保 加减保/换厂 签署人员名单
        chagneList = applyChangeMapper.selectJoinList(ApplyChange.class,
                new MPJLambdaWrapper<ApplyChange>()
                        .selectAll(ApplyChange.class)
                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
                        .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
                        .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
                        .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -1179,6 +1245,7 @@
                            .selectAll(ApplyChange.class)
                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
                            .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
                            .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
                            .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -1202,6 +1269,7 @@
                            .selectAll(ApplyChange.class)
                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
                            .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
                            .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
                            .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -1407,16 +1475,28 @@
            applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
            if(Constants.equalsObject(solutions.getType(),Constants.ONE)){
                update.setStatus(Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey());
            }else{
                update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
            }
        }
        insuranceApplyMapper.updateById(update);

        //存储待办信息
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
        //删除其他待办
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
                .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
                .eq(Notices::getObjId,model.getId())); 
        if(Constants.equalsObject(solutions.getType(),Constants.ZERO)) {
            //删除其他待办
            noticesMapper.delete(new QueryWrapper<Notices>().lambda()
                    .eq(Notices::getObjType, noticeObjectType.getKey())
                    .ne(Notices::getType, Constants.NoticeType.SIX.getStatus())
                    .eq(Notices::getObjId, model.getId()));
        }else{
            //删除全部待办
            noticesMapper.delete(new QueryWrapper<Notices>().lambda()
                    .eq(Notices::getObjType, noticeObjectType.getKey())
                    .eq(Notices::getObjId, model.getId()));
        }


        String info =applyLogType.getInfo();
        if(StringUtils.isNotBlank(update.getCheckInfo())){
            info = info.replace("${param}", update.getCheckInfo());
@@ -1452,6 +1532,17 @@
        if(!(solutions.getIsdeleted().equals(Constants.ZERO)||solutions.getStatus().equals(Constants.ZERO))){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"方案信息已被禁用");
        }
        if(solutions.getValidType().equals(Constants.ZERO)){
            if(DateUtil.getMontageDate(
                    DateUtil.addDaysToDate(new Date(),solutions.getValidType()),0).getTime()>insuranceApply.getApplyStartTime().getTime()){
                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"保单生效起期错误");
            }
        }else{
            if(DateUtil.getNextMonthFirst(new Date()).getTime()>insuranceApply.getApplyStartTime().getTime()){
                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"保单生效起期错误");
            }
        }

        List<ApplyDetail> applyDetailList = insuranceApply.getApplyDetailList();
        //判断是否存在重复信息
        List<String> idCardList = applyDetailList.stream().map(i->i.getIdcardNo()).collect(Collectors.toList());
@@ -1475,6 +1566,7 @@
        insuranceApply.setCurrentFee(BigDecimal.ZERO);
        insuranceApply.setCheckUserId(loginUserInfo.getId());
        insuranceApply.setStatus(insuranceApplyStatus.getKey());
        insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);

        CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
        countCyclePriceDTO.setSolutionsId(insuranceApply.getSolutionId());
@@ -1497,17 +1589,31 @@
//        info = info.replace("${param}", update.getCheckInfo());
        ApplyLog log = new ApplyLog(insuranceApply,applyLogType.getName(),info,insuranceApply.getId(),applyLogType.getKey(),null, null);
        applyLogMapper.insert(log);


        //发送待办业务
        //存储待办信息
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
        //删除其他待办
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
                .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
                .eq(Notices::getObjId,insuranceApply.getId()));
        Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
        noticesMapper.insert(notices);
        
        //直保业务发送待办
        if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
            //存储待办信息
            Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
            //删除其他待办
            noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
                    .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
                    .eq(Notices::getObjId,insuranceApply.getId()));
            //存储平台待办
            Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
            noticesMapper.insert(notices);
            CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
                    .eq(CompanySolution::getIsdeleted,Constants.ZERO)
                    .eq(CompanySolution::getSolutionId,solutions.getId())
                    .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
                    .last("limit 1")
            );
            //商户待办
            if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
                Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
                        insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.ZERO);
                noticesMapper.insert(shopNotices);
            }
        }

        return insuranceApply.getId();
    }
@@ -1777,17 +1883,17 @@
            return  new ArrayList<>();
        }
        List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus);
        if(collectStatus.equals(Constants.ApplyCollectStatus.DCD)){
        if(collectStatus.equals(Constants.ApplyCollectStatus.DCD.getKey())){
            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey()));
        }else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP)){
        }else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP.getKey())){
            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDSH.getKey()));
        }else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ)){
        }else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ.getKey())){
            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
        }else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH)){
        }else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH.getKey())){
            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYTH.getKey()));
        }else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB)){
        }else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB.getKey())){
            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYGB.getKey()));
        }else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ)){
        }else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ.getKey())){
            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDQS.getKey()));
        }

@@ -1821,9 +1927,15 @@
        queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId,pageWrap.getModel().getBaseSolutionId());
        queryWrapper.in(statusList.size()>0,InsuranceApply::getStatus,statusList);
        if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.THREE) ){
            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getSolutionName()),Solutions::getName,pageWrap.getModel().getSolutionName());
        if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.YGQ.getKey()) ){
            //如果是已過期
//            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
            queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
        }else if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.BZZ.getKey()) ){
            //如果是保障中
//            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
            queryWrapper.gt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

@@ -1921,20 +2033,27 @@
    @Override
    public List<InsuranceApply> findListByDTO(InsuranceApplyQueryDTO model) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(InsuranceApply.class);
        queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
        queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
        queryWrapper.selectAs(Solutions::getType,InsuranceApply::getSolutionType);
        queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad  where ad.apply_id = t.id ) as insureNum");
        queryWrapper.select(" ( select max(ac.APPLY_START_TIME) from apply_change ac  where ac.apply_id = t.id and ac.status = 2 ) as lastChangeDate");
        queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney ");
        queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on td.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
        queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
        queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
        queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(model.getUnionApplyId()!=null,InsuranceApply::getUnionApplyId, model.getUnionApplyId());
        queryWrapper.eq(model.getBaseSolutionId()!=null,Solutions::getBaseId,model.getBaseSolutionId());
        //企业人员查看本企业数据
        if(loginUserInfo.getType().equals(Constants.ONE)){
            queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
        }else if(loginUserInfo.getType().equals(Constants.TWO)){
            //如果是商家查看
            queryWrapper.eq(Solutions::getShopId, loginUserInfo.getCompanyId());
        }else{
            if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
                queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
@@ -1985,7 +2104,62 @@
            queryWrapper.ge(InsuranceApply::getEndTime,DateUtil.DateToStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
        }
        List<InsuranceApply> list = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class, queryWrapper);
        if(Constants.equalsObject(model.getGetFiles(),Constants.ONE)){
            //如果是合并单,需要查询附件信息
            initFileForList(list);
        }
        return list;
    }

    private void initFileForList(List<InsuranceApply> list) {
        List<Integer> objList =  new ArrayList<>();
        if(list!=null && list.size()>0){
            for(InsuranceApply param : list){
                objList.add(param.getId());
            }
        }else{
            return;
        }
        List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
                .in(Multifile::getObjId,objList)
                .in(Multifile::getObjType,Arrays.asList(new Integer[]{Constants.MultiFile.BD_APPLY_PDF.getKey()
                        ,Constants.MultiFile.BD_SIGNED_PDF.getKey()
                        ,Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey()
                        ,Constants.MultiFile.MEMBER_LIST_LATTER.getKey()
                        ,Constants.MultiFile.BD_DONE_PDF.getKey()}))
                .eq(Multifile::getIsdeleted,Constants.ZERO)
                .orderByAsc(Multifile::getId));
        if(multifiles!=null && multifiles.size()>0){
            String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
            for(InsuranceApply model : list){
                for(Multifile f : multifiles) {
                    if (StringUtils.isBlank(f.getFileurl())) {
                        continue;
                    }
                    f.setFileurlFull(path+f.getFileurl());
                    if(Constants.equalsInteger(f.getObjId(), model.getId()) ){
                        if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_APPLY_PDF.getKey())) {
                            //签署前的投保单
                            model.setToubaodanFile(f);
                        } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_SIGNED_PDF.getKey())) {
                            //签署后的投保单
                            model.setToubaodanSignedFile(f);
                        } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_DONE_PDF.getKey())) {
                            //最終保险单
                            model.setBaoxiandanFile(f);
                        } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.MEMBER_LIST_LATTER.getKey())) {
                            //申请单
                            model.setShenqingdanFile(f);
                        } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey())) {
                            //签署后确认书
                            model.setFanganFile(f);
                        }
                    }
                }
            }
        }

    }


@@ -2131,6 +2305,7 @@
        MPJLambdaWrapper wrapper=  new MPJLambdaWrapper<InsuranceApply>()
                .selectAll(InsuranceApply.class)
                .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
                .selectAs(Solutions::getType,InsuranceApply::getSolutionType)
                .selectAs(Company::getName,InsuranceApply::getCompanyName)
                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
@@ -2190,7 +2365,10 @@
            if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())
                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())
                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))){
                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))
                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
                    || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
                    || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"数据状态非可申请退回!");
            }
            if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())){
@@ -2203,14 +2381,40 @@
                insuranceApplyStatus =  Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS;
            }

            else  if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
            || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
            || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())){
                insuranceApplyStatus =  Constants.InsuranceApplyStatus.WTB_RETURN;
            }

            //存储待办信息
            //删除其他待办
            noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
                            .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
                    .eq(Notices::getObjId,insuranceApply.getId()));
            Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
                    insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
            noticesMapper.insert(notices);
            if(!loginUserInfo.getCompanyId().equals(insuranceApply.getCompanyId())){
                Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
                        insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
                noticesMapper.insert(notices);
            }


//            CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
//                    .eq(CompanySolution::getIsdeleted,Constants.ZERO)
//                    .eq(CompanySolution::getSolutionId,solutions.getId())
//                    .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
//                    .last("limit 1")
//            );
//            //商户待办
//            if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
//                Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
//                        insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.THREE);
//                noticesMapper.insert(shopNotices);
//            }






        }else if(insuranceApplyOptDTO.getOptType().equals(Constants.TWO)){
@@ -2221,7 +2425,10 @@
            if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey())
                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey())
                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()))){
                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())
                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_RETURN.getKey())
            )
            ){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"数据状态无法进行关闭!");
            }
            //删除其他待办
@@ -2256,7 +2463,8 @@
        MPJLambdaWrapper<ApplyDetail> lambdaWrapper = new MPJLambdaWrapper<ApplyDetail>();
        lambdaWrapper.select(ApplyDetail::getId)
                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
                .and(i->i.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()).or().eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey()))
                .and(i->i.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
                        .or().eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey()))
                .eq(InsuranceApply::getCompanyId,loginUserInfo.getCompanyId())
                .apply(" now() between t.START_TIME and t.END_TIME ");

@@ -2271,11 +2479,12 @@
     * 更新保单实际金额
     */
    @Override
    @Transactional(rollbackFor = {Exception.class})
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void updateApplyCurrentFee(Integer id){
        List<InsuranceApply> insuranceApplyList = insuranceApplyMapper.selectList(new QueryWrapper<InsuranceApply>().lambda()
        List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,new MPJLambdaWrapper<InsuranceApply>()
                .selectAll(InsuranceApply.class)
                .eq(InsuranceApply::getIsdeleted,Constants.ZERO)
                .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
                .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())
                .eq(!Objects.isNull(id),InsuranceApply::getId,id)
                .le(InsuranceApply::getStartTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 00:00:00")
                .ge(InsuranceApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 23:59:59")
@@ -2283,20 +2492,23 @@

        if(CollectionUtils.isNotEmpty(insuranceApplyList)){
            for (InsuranceApply insuranceApply:insuranceApplyList) {
                Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
                if(Objects.isNull(solutions)){
                    continue;
                }
//                Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
//                if(Objects.isNull(solutions)){
//                    continue;
//                }
                BigDecimal sumAmount = BigDecimal.ZERO;
                List<ApplyDetail> applyDetailList = applyDetailMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId()));
                List<ApplyDetail> applyDetailList = applyDetailMapper
                        .selectList(new QueryWrapper<ApplyDetail>().lambda()
                                .eq(ApplyDetail::getApplyId,insuranceApply.getId()));
                if(CollectionUtils.isNotEmpty(applyDetailList)){
                    for (ApplyDetail applyDetail: applyDetailList) {
                        //2024-1-30 10:04:24 修改 根据实际天数进行计算 当前费用  总金额/总天数*实际天数
                        Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
//                        Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
                        BigDecimal fee = applyDetail.getFee();
                        if(applyDetail.getStartTime().compareTo(new Date()) <= 0 && applyDetail.getEndTime().compareTo(new Date()) >= 0 ){
                            Integer days =  DateUtil.calculateBetween(applyDetail.getStartTime(),new Date(),0);
                            applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
                            applyDetail.setCurrentFee(new BigDecimal(days).multiply(applyDetail.getPrice()));
                            //applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
                            applyDetailMapper.updateById(applyDetail);
                        }else if(applyDetail.getStartTime().compareTo(new Date()) <= 0&&applyDetail.getEndTime().compareTo(new Date()) <= 0){
                            applyDetail.setCurrentFee(fee);
@@ -2309,10 +2521,6 @@
                insuranceApplyMapper.updateById(insuranceApply);
            }
        }
//        if(1==1){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED);
//        }

    }


@@ -2447,7 +2655,7 @@
                .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
                .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
                .isNull(ApplyDetail::getFromId)
                .eq(ApplyDetail::getId,model.getId())
                .eq(ApplyDetail::getApplyId,model.getId())
        );
        model.setApplyDetailList(applyDetailList);
        return model;
@@ -2558,7 +2766,7 @@
        Constants.ApplyLogType applyLogType = null;
        String info = "";
        //如果是驳回,只能可驳回已签章状态下的退回申请状态进行操作
        if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
        if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~");
        }
        Company company = user.getCompany();
@@ -2570,7 +2778,7 @@
        }
        Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
                .eq(Multifile::getObjId,model.getId())
                .eq(Multifile::getObjType,Constants.MultiFile.COMPANY_TBD_SIGNED.getKey())
                .eq(Multifile::getObjType,Constants.MultiFile.BD_APPLY_PDF.getKey())
                .eq(Multifile::getIsdeleted,Constants.ZERO).last("limit 1"));
        if(f == null || StringUtils.isBlank(f.getFileurl())){
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，获取确认书文件失败，请联系商户确认投保申请书是否正确！");