git ch

k94314517

2024-04-02 11927cefa1347d192105c9b0bc08d1b91badf18c

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

@@ -1470,6 +1470,7 @@
                .eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
                .eq(!Objects.isNull(model.getApplyId()),ApplyChange::getApplyId,model.getApplyId())
                .eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
                .like(StringUtils.isNotBlank(model.getSolutionsName()),Solutions::getName,model.getSolutionsName())
                .ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
                .le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" )
                .ge(StringUtils.isNotBlank(model.getApplyStartS()),ApplyChange::getApplyStartTime, model.getApplyStartS()+" 00:00:00" )
@@ -1565,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;
@@ -2078,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;

    }