Merge branch '2.0.2' into 2.0.1

k94314517

2025-05-19 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c

Merge branch '2.0.2' into 2.0.1

 server/platform/src/main/java/com/doumee/api/business/UnionChangeController.java

@@ -120,6 +120,7 @@
        return ApiResponse.success(unionChangeService.getSignLink(smsCheckDTO));
    }


    @ApiOperation("上传保险单")
    @PostMapping("/uploadBXD")
    @RequiresPermissions("business:unionchange:uploadBXD")

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

@@ -1200,6 +1200,14 @@
        List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
        //加保数据
        List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
        //换厂业务
        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
        
        if(CollectionUtils.isEmpty(delDetailList)
        && CollectionUtils.isEmpty(addDetailList)
                && CollectionUtils.isEmpty(changeDetailList)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未添加人员数据无法进行提交");
        }

        if (CollectionUtils.isNotEmpty(addDetailList)) {
            if(Objects.isNull(solutions.getCanAdd()) || solutions.getCanAdd().equals(Constants.ZERO)){
@@ -1238,7 +1246,6 @@
        }

        //换厂业务
        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
        if (CollectionUtils.isNotEmpty(changeDetailList)) {
            if(Objects.isNull(solutions.getCanChangeUnit()) || solutions.getCanChangeUnit().equals(Constants.ZERO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该保险方案无法进行换厂操作");
@@ -1358,6 +1365,7 @@
            }
            //查询员工是在主单下 是否存在生效中的数据
            List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
                            .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
//                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
@@ -1616,6 +1624,7 @@
            }
            //查询员工是在主单下 是否存在生效中的数据
            List<ApplyDetail>  applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
                    .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))

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

@@ -217,6 +217,7 @@
        queryWrapper.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId);
        queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
        queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
        queryWrapper.eq(ApplyDetail::getIsdeleted,Constants.ZERO);

        ApplyDetailPageDTO applyDetailPageDTO = pageWrap.getModel();


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

@@ -32,12 +32,14 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
@@ -694,215 +696,187 @@
    }


    @Autowired
    private RedisTemplate redisTemplate;// Redis操作类，对这个使用不熟悉的，可以参考前面的博客

    private static final String KEY_PREFIX = "unionchange:upload:";
    
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void uploadBXD(UnionChangeBXDDTO unionChangeBXDDTO){
        if(Objects.isNull(unionChangeBXDDTO)
            || Objects.isNull(unionChangeBXDDTO.getId())
                || Objects.isNull(unionChangeBXDDTO.getApplyDate())
//                || StringUtils.isBlank(unionChangeBXDDTO.getName())
//                || StringUtils.isBlank(unionChangeBXDDTO.getFileurl())
                || StringUtils.isBlank(unionChangeBXDDTO.getCode())
                || CollectionUtils.isEmpty(unionChangeBXDDTO.getPidanFileList())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        UnionChange unionChange = unionChangeMapper.selectById(unionChangeBXDDTO.getId());
        if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(unionChange.getType(),Constants.ONE)&&
                unionChangeBXDDTO.getDelValidTime() == null ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        unionChangeBXDDTO.setApplyId(unionChange.getUnionApplyId());
        unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
        unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
        if(Constants.equalsInteger(user.getType(),Constants.TWO) && !unionChange.getShopId().equals(user.getCompanyId())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起非您的合并单，您无法进行操作！");
        }
        if(unionChange.getStatus().equals(Constants.UnionChangeStatus.FINISH.getKey())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单业务已完结，您无法进行该操作！");
        }
        if(unionChange.getStatus().equals(Constants.UnionChangeStatus.CLOSE.getKey())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单业务已关闭");
        }
        if(!unionChange.getStatus().equals(Constants.UnionChangeStatus.UPLOAD_INSURANCE_POLICY.getKey())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单状态已流转");
        }
        UnionApply unionApply = unionApplyMapper.selectById(unionChange.getUnionApplyId());
        if(Objects.isNull(unionApply)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到合并保单信息");
        }
        Solutions solutions = solutionsMapper.selectById(unionApply.getSolutionId());
        if(Objects.isNull(solutions)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保险方案");
        }
        if(unionChange.getType().equals(Constants.ZERO)){
            //判断批单日期 合并单的批单生效期在为 保单起期的次日 到保单止期
            //获取开始日期次日
            if(unionChangeBXDDTO.getApplyDate().getTime()<unionApply.getStartTime().getTime()
                    || unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单加保生效期错误");
        try{
            if(Objects.nonNull(redisTemplate.opsForValue().get(KEY_PREFIX+unionChangeBXDDTO.getId()))){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"请勿重复提交");
            };
            redisTemplate.opsForValue().set(KEY_PREFIX+unionChangeBXDDTO.getId(), unionChangeBXDDTO.getId(), 30000, TimeUnit.SECONDS);
            if(Objects.isNull(unionChangeBXDDTO)
                || Objects.isNull(unionChangeBXDDTO.getId())
                    || Objects.isNull(unionChangeBXDDTO.getApplyDate())
    //                || StringUtils.isBlank(unionChangeBXDDTO.getName())
    //                || StringUtils.isBlank(unionChangeBXDDTO.getFileurl())
                    || StringUtils.isBlank(unionChangeBXDDTO.getCode())
                    || CollectionUtils.isEmpty(unionChangeBXDDTO.getPidanFileList())
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            if(unionChangeBXDDTO.getDelValidTime().getTime()<unionApply.getStartTime().getTime()
                    || unionChangeBXDDTO.getDelValidTime().getTime()> unionApply.getEndTime().getTime()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单减保生效期错误");
            LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
            UnionChange unionChange = unionChangeMapper.selectById(unionChangeBXDDTO.getId());
            if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY);
            }
        }else{
            if(unionChangeBXDDTO.getApplyDate().getTime()<unionChange.getApplyStartTime().getTime()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单日期必须大于申请日期");
            if(!Constants.equalsInteger(unionChange.getType(),Constants.ONE)&&
                    unionChangeBXDDTO.getDelValidTime() == null ){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST);
            }
        }

        List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
                new MPJLambdaWrapper<ApplyChange>()
                        .selectAll(ApplyChange.class)
                        .selectAs(InsuranceApply::getSolutionId,ApplyChange::getSolutionsId)
                        .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
                        .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                        .eq(ApplyChange::getUnionChangeId,unionChange.getId()));

        List<Multifile> pidanFileList = unionChangeBXDDTO.getPidanFileList();
        for (Multifile pidanFile:pidanFileList) {
            if(StringUtils.isBlank( pidanFile.getFileurl())
                    ||StringUtils.isBlank( pidanFile .getName())) {
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"批单文件参数错误");
            unionChangeBXDDTO.setApplyId(unionChange.getUnionApplyId());
            unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
            unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
            if(Constants.equalsInteger(user.getType(),Constants.TWO) && !unionChange.getShopId().equals(user.getCompanyId())){
                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起非您的合并单，您无法进行操作！");
            }
            pidanFile.setIsdeleted(Constants.ZERO);
            pidanFile.setCreator(user.getId());
            pidanFile.setObjId(unionChange.getId());
            pidanFile.setCreateDate(new Date());
            pidanFile.setObjType(Constants.MultiFile.WTB_CA_DONE_PDF.getKey());
            pidanFile.setType(Constants.TWO);
        }
        multifileMapper.insertBatchSomeColumn(pidanFileList);

        for (ApplyChange applyChange:applyChangeList) {
            for (Multifile pidanFile:pidanFileList) {
                Multifile m = new Multifile();
                m.setId(null);
                m.setIsdeleted(Constants.ZERO);
                m.setCreator(user.getId());
                m.setCreateDate(new Date());
                m.setObjId(applyChange.getId());
                m.setFileurl(pidanFile.getFileurl());
                m.setName(pidanFile.getName());
                m.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
                m.setType(Constants.TWO);
                multifileMapper.insert(m);
            if(unionChange.getStatus().equals(Constants.UnionChangeStatus.FINISH.getKey())){
                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单业务已完结，您无法进行该操作！");
            }
            
        }

        //存储合并单保险单
       /* Multifile multifile = new Multifile();
        multifile.setIsdeleted(Constants.ZERO);
        multifile.setCreator(user.getId());
        multifile.setCreateDate(new Date());
        multifile.setObjId(unionChangeBXDDTO.getId());
        multifile.setCreateDate(new Date());
        multifile.setObjType(Constants.MultiFile.WTB_CA_DONE_PDF.getKey());
        multifile.setType(Constants.TWO);
        multifile.setFileurl(unionChangeBXDDTO.getFileurl());
        multifile.setName(unionChangeBXDDTO.getName());
        multifileMapper.insert(multifile);*/
 
//        if(CollectionUtils.isNotEmpty(unionChangeBXDDTO.getApplyChangeBXDList())){
//            //查询是否不存在当前合并单的数据
//            if(applyChangeJoinMapper.selectCount(new QueryWrapper<ApplyChange>()
//                    .lambda().ne(ApplyChange::getUnionChangeId,unionChangeBXDDTO.getId())
//                    .in(ApplyChange::getId,
//                            unionChangeBXDDTO.getApplyChangeBXDList().stream().map(m->m.getObjId()).collect(Collectors.toList())
//                    )
//            )>Constants.ZERO){
//                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单明细记录存在非本合并单数据");
//            };
//            for (Multifile m:unionChangeBXDDTO.getApplyChangeBXDList()) {
//                if(StringUtils.isBlank(m.getName())
//                        || StringUtils.isBlank(m.getFileurl()) ){
//                    continue;
//                }
//                if(Objects.isNull(m.getObjId())
//                        ||StringUtils.isBlank(m.getFileurl())
//                        ||StringUtils.isBlank(m.getName())
//                ){
//                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单文件信息缺失");
//                }
//                m.setId(null);
//                m.setIsdeleted(Constants.ZERO);
//                m.setCreator(user.getId());
//                m.setCreateDate(new Date());
//                m.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
//                m.setType(Constants.TWO);
//                multifileMapper.insert(m);
//            }
//        }
        if(CollectionUtils.isNotEmpty(applyChangeList)){
            for (ApplyChange applyChange:applyChangeList) {
                ApplyChange oldModel = applyChange;
                applyChange.setApplyStartTime(unionChangeBXDDTO.getApplyDate());
                applyChange.setDelValidTime(unionChangeBXDDTO.getDelValidTime());
//                applyChange.setValidTime(unionChangeBXDDTO.getApplyDate());
                applyChange.setEditDate(new Date());
                applyChange.setEditor(user.getId());
                applyChange.setStatus(Constants.ApplyChangeStatus.APPROVE.getKey());
                applyChange.setCode(unionChangeBXDDTO.getCode());
                applyChange.setValidCode(unionChangeBXDDTO.getCode());
                applyChange.setCheckUserId(user.getId());
                List<ApplyChagneDetail> allList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
                        new MPJLambdaWrapper<ApplyChagneDetail>()
                                .selectAll(ApplyChagneDetail.class)
                                .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
                                .selectAs(Solutions::getTimeUnit, ApplyChagneDetail::getSolutionTimeUnit)
                                .selectAs(Solutions::getPrice, ApplyChagneDetail::getSolutionPrice)
                                .selectAs(Worktype::getName, ApplyChagneDetail::getWorkTypeName)
                                .selectAs(DispatchUnit::getName, ApplyChagneDetail::getDuName)
                                .selectAs(Member::getName, ApplyChagneDetail::getMemberName)
                                .selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
                                .selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
                                .selectAs(InsuranceApply::getServerCost,ApplyChagneDetail::getServerCost)
                                .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
                                .leftJoin(Member.class, Member::getId, ApplyChagneDetail::getMemberId)
                                .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
                                .leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
                                .leftJoin(Worktype.class, Worktype::getId, ApplyChagneDetail::getWorktypeId)
                                .leftJoin(DispatchUnit.class, DispatchUnit::getId, ApplyChagneDetail::getDuId)
                                .eq(ApplyChagneDetail::getApplyChangeId,applyChange.getId()));
                this.dealApplyChangeDetail(applyChange,allList,solutions);
                applyChangeJoinMapper.updateById(applyChange);
                //存储批单完成信息
                Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_APPROVE;
                String info = "";
                if(applyChange.getValidTime()!=null && applyChange.getValidTime().getTime()/1000!= applyChange.getApplyStartTime().getTime()/1000){
                    info =applyLogType.getInfo();
                    info = info.replace("${param1}",DateUtil.getPlusTime2(applyChange.getValidTime()));
                    info = info.replace("${param2}",DateUtil.getPlusTime2(applyChange.getApplyStartTime()));
            if(unionChange.getStatus().equals(Constants.UnionChangeStatus.CLOSE.getKey())){
                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单业务已关闭");
            }
            if(!unionChange.getStatus().equals(Constants.UnionChangeStatus.UPLOAD_INSURANCE_POLICY.getKey())){
                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单状态已流转");
            }
            UnionApply unionApply = unionApplyMapper.selectById(unionChange.getUnionApplyId());
            if(Objects.isNull(unionApply)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到合并保单信息");
            }
            Solutions solutions = solutionsMapper.selectById(unionApply.getSolutionId());
            if(Objects.isNull(solutions)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保险方案");
            }
            if(unionChange.getType().equals(Constants.ZERO)){
                //判断批单日期 合并单的批单生效期在为 保单起期的次日 到保单止期
                //获取开始日期次日
                if(unionChangeBXDDTO.getApplyDate().getTime()<unionApply.getStartTime().getTime()
                        || unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单加保生效期错误");
                }
                ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(), info,applyChange.getId(),applyLogType.getKey(),JSONObject.toJSONString(oldModel), JSONObject.toJSONString(applyChange));
                applyLogMapper.insert(log);
                if(unionChangeBXDDTO.getDelValidTime().getTime()<unionApply.getStartTime().getTime()
                        || unionChangeBXDDTO.getDelValidTime().getTime()> unionApply.getEndTime().getTime()){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单减保生效期错误");
                }
            }else{
                if(unionChangeBXDDTO.getApplyDate().getTime()<unionChange.getApplyStartTime().getTime()){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单日期必须大于申请日期");
                }
            }

            List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
                    new MPJLambdaWrapper<ApplyChange>()
                            .selectAll(ApplyChange.class)
                            .selectAs(InsuranceApply::getSolutionId,ApplyChange::getSolutionsId)
                            .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
                            .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                            .eq(ApplyChange::getUnionChangeId,unionChange.getId()));

            List<Multifile> pidanFileList = unionChangeBXDDTO.getPidanFileList();
            for (Multifile pidanFile:pidanFileList) {
                if(StringUtils.isBlank( pidanFile.getFileurl())
                        ||StringUtils.isBlank( pidanFile .getName())) {
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"批单文件参数错误");
                }
                pidanFile.setIsdeleted(Constants.ZERO);
                pidanFile.setCreator(user.getId());
                pidanFile.setObjId(unionChange.getId());
                pidanFile.setCreateDate(new Date());
                pidanFile.setObjType(Constants.MultiFile.WTB_CA_DONE_PDF.getKey());
                pidanFile.setType(Constants.TWO);
            }
            multifileMapper.insertBatchSomeColumn(pidanFileList);

            for (ApplyChange applyChange:applyChangeList) {
                for (Multifile pidanFile:pidanFileList) {
                    Multifile m = new Multifile();
                    m.setId(null);
                    m.setIsdeleted(Constants.ZERO);
                    m.setCreator(user.getId());
                    m.setCreateDate(new Date());
                    m.setObjId(applyChange.getId());
                    m.setFileurl(pidanFile.getFileurl());
                    m.setName(pidanFile.getName());
                    m.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
                    m.setType(Constants.TWO);
                    multifileMapper.insert(m);
                }

            }


            if(CollectionUtils.isNotEmpty(applyChangeList)){
                for (ApplyChange applyChange:applyChangeList) {
                    ApplyChange oldModel = applyChange;
                    applyChange.setApplyStartTime(unionChangeBXDDTO.getApplyDate());
                    applyChange.setDelValidTime(unionChangeBXDDTO.getDelValidTime());
    //                applyChange.setValidTime(unionChangeBXDDTO.getApplyDate());
                    applyChange.setEditDate(new Date());
                    applyChange.setEditor(user.getId());
                    applyChange.setStatus(Constants.ApplyChangeStatus.APPROVE.getKey());
                    applyChange.setCode(unionChangeBXDDTO.getCode());
                    applyChange.setValidCode(unionChangeBXDDTO.getCode());
                    applyChange.setCheckUserId(user.getId());
                    List<ApplyChagneDetail> allList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
                            new MPJLambdaWrapper<ApplyChagneDetail>()
                                    .selectAll(ApplyChagneDetail.class)
                                    .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
                                    .selectAs(Solutions::getTimeUnit, ApplyChagneDetail::getSolutionTimeUnit)
                                    .selectAs(Solutions::getPrice, ApplyChagneDetail::getSolutionPrice)
                                    .selectAs(Worktype::getName, ApplyChagneDetail::getWorkTypeName)
                                    .selectAs(DispatchUnit::getName, ApplyChagneDetail::getDuName)
                                    .selectAs(Member::getName, ApplyChagneDetail::getMemberName)
                                    .selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
                                    .selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
                                    .selectAs(InsuranceApply::getServerCost,ApplyChagneDetail::getServerCost)
                                    .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
                                    .leftJoin(Member.class, Member::getId, ApplyChagneDetail::getMemberId)
                                    .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
                                    .leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
                                    .leftJoin(Worktype.class, Worktype::getId, ApplyChagneDetail::getWorktypeId)
                                    .leftJoin(DispatchUnit.class, DispatchUnit::getId, ApplyChagneDetail::getDuId)
                                    .eq(ApplyChagneDetail::getApplyChangeId,applyChange.getId()));
                    this.dealApplyChangeDetail(applyChange,allList,solutions);
                    applyChangeJoinMapper.updateById(applyChange);
                    //存储批单完成信息
                    Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_APPROVE;
                    String info = "";
                    if(applyChange.getValidTime()!=null && applyChange.getValidTime().getTime()/1000!= applyChange.getApplyStartTime().getTime()/1000){
                        info =applyLogType.getInfo();
                        info = info.replace("${param1}",DateUtil.getPlusTime2(applyChange.getValidTime()));
                        info = info.replace("${param2}",DateUtil.getPlusTime2(applyChange.getApplyStartTime()));
                    }
                    ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(), info,applyChange.getId(),applyLogType.getKey(),JSONObject.toJSONString(oldModel), JSONObject.toJSONString(applyChange));
                    applyLogMapper.insert(log);

                }
            }
            unionChangeMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
                    .set(UnionChange::getStatus,Constants.UnionChangeStatus.FINISH.getKey())
                    .set(UnionChange::getEditDate,new Date())
                    .set(UnionChange::getEditor,user.getId())
                    .set(UnionChange::getValidTime,unionChangeBXDDTO.getApplyDate())
                    .set(UnionChange::getDelValidTime,unionChangeBXDDTO.getDelValidTime())
                    .set(UnionChange::getApplyStartTime,unionChangeBXDDTO.getApplyDate())
                    .set(UnionChange::getCode,unionChangeBXDDTO.getCode())
                    .eq(UnionChange::getId,unionChangeBXDDTO.getId())
            );


            Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_UPLOAD_INSURANCE;
            ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), null
                    ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange));
            applyLogMapper.insert(log);

        }catch (Exception e){
            e.printStackTrace();
        }finally {
            redisTemplate.delete(KEY_PREFIX + unionChangeBXDDTO.getId());
        }
        unionChangeMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
                .set(UnionChange::getStatus,Constants.UnionChangeStatus.FINISH.getKey())
                .set(UnionChange::getEditDate,new Date())
                .set(UnionChange::getEditor,user.getId())
                .set(UnionChange::getValidTime,unionChangeBXDDTO.getApplyDate())
                .set(UnionChange::getDelValidTime,unionChangeBXDDTO.getDelValidTime())
                .set(UnionChange::getApplyStartTime,unionChangeBXDDTO.getApplyDate())
                .set(UnionChange::getCode,unionChangeBXDDTO.getCode())
                .eq(UnionChange::getId,unionChangeBXDDTO.getId())
        );


        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_UPLOAD_INSURANCE;
        ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), null
                ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange));
        applyLogMapper.insert(log);

    }