git ch

k94314517

2024-04-02 d5d7a8461c6fd350806fbfbd738917b14f70c9e9

git ch

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -1237,7 +1237,12 @@
        THREE(3, "申请退回","申请退回","申请退回","","",""),
        FOUR(4, "已退回","已退回","已退回","","","已撤销"),
        FIVE(5, "申请驳回","申请驳回","申请驳回","","",""),
        SIX(6, "","","","","","")
        //续保通知
        SIX(6, "","","","","",""),
        //商户端 委托保 - 投保待审核 加减保 换厂 待审核
        SEVEN(7, "待审核","待审核","待审核","","",""),
        EIGHT(8, "","","","","",""),
        NINE(9, "","","","","",""),
        ;

        // 成员变量

 server/service/src/main/java/com/doumee/dao/business/model/Notices.java

@@ -141,7 +141,7 @@
    /**
     *
     * @param noticeType 消息类型
     * @param palt 数据平台 0平台消息 1企业消息
     * @param palt 数据平台 0平台消息 1企业消息 2商户消息
     * @param objId 关联对象主键
     * @param content   方案名称/单位名称/开票金额/报案人
     * @param companyId 企业主键

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

@@ -1566,7 +1566,12 @@
            Notices notices = new Notices(noticeObjectType,Constants.ZERO,applyChange.getId(),solutions.getName(),
                    insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
            noticesMapper.insert(notices);

            //商户待办
            if(Objects.nonNull(solutions.getShopId())){
                Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
                        applyChange.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.THREE);
                noticesMapper.insert(shopNotices);
            }

        }else if(applyChangeOptDTO.getOptType().equals(4)){
            applyLogType = Constants.ApplyLogType.CA_PLATFORM_AGREE_BACK_APPLY;
@@ -2079,7 +2084,14 @@
            update.setStatus(Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS.getKey());
        }
        applyChangeJoinMapper.updateById(update);

        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
        if(Constants.equalsInteger(applyChange.getType(),Constants.ONE)){
            noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
        }
        //删除全部待办
        noticesMapper.delete(new QueryWrapper<Notices>().lambda()
                .eq(Notices::getObjType, noticeObjectType.getKey())
                .eq(Notices::getObjId, model.getId()));
        return  1;

    }

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

@@ -519,6 +519,13 @@
                .eq(Notices::getObjId,model.getId()));
        Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),model.getSolutionsName(),model.getCompanyId(),Constants.NoticeType.TWO);
        noticesMapper.insert(notices);
        Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
        if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
            Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),solutions.getShopId(),Constants.NoticeType.TWO);
            noticesMapper.insert(shopNotices);
        }



        Multifile f = new Multifile();
        f.setIsdeleted(Constants.ZERO);
@@ -648,10 +655,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;
    }
    
@@ -681,6 +702,15 @@
                companyId, Constants.NoticeType.TWO);
        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);
@@ -732,6 +762,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;
    }

@@ -958,6 +1001,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 +1027,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 +1225,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 +1249,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)
@@ -1413,10 +1461,20 @@

        //存储待办信息
        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());
@@ -1497,17 +1555,25 @@
//        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);
            //商户待办
            if(Objects.nonNull(solutions.getShopId())){
                Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
                        insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.ZERO);
                noticesMapper.insert(shopNotices);
            }
        }

        return insuranceApply.getId();
    }
@@ -2270,8 +2336,12 @@
            Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
                    insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
            noticesMapper.insert(notices);


            //商户待办
            if(Objects.nonNull(solutions.getShopId())){
                Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
                        insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.THREE);
                noticesMapper.insert(shopNotices);
            }
        }else if(insuranceApplyOptDTO.getOptType().equals(Constants.TWO)){
            insuranceApplyStatus =  Constants.InsuranceApplyStatus.CLOSE;
            if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.CLOSE.getKey())){