Merge remote-tracking branch 'origin/master'

jiangping

2025-03-27 7b51c9e1abc198a501f7858599da9c116130fd6f

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -111,6 +111,8 @@
    private ErpTool erpTool;

    @Autowired
    private VisitParkMapper visitParkMapper;
    @Autowired
    private WxPlatNotice wxPlatNotice;

    @Autowired
@@ -1571,31 +1573,42 @@
                .eq(Retention::getMemberId,visits.getMemberId()));
    }

    @Autowired
    private VisitParkMapper visitParkMapper;


    /**
     * 处理待审核、审核中、已审核的数据取消业务
     * 2025年3月25日14:10:10
     */
    @Override
    public void  visitsCancel(Integer visitId,LoginUserInfo loginUserInfo){
    public void  visitsSelfCancel(Integer visitId,Integer memberId){
        Visits visits = visitsMapper.selectById(visitId);
        if(Objects.isNull(visits)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(loginUserInfo.getMemberId(),visits.getMemberId()) ||
                Constants.equalsInteger(loginUserInfo.getMemberId(),visits.getCreateMemberId()) ||
                ( CollectionUtils.isNotEmpty(loginUserInfo.getPermissions()) &&
            loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")).collect(Collectors.toList()).size()>0))){
        if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无此操作权限");
        }
        this.visitsCancelBiz(visits);
    }

    @Override
    public void  visitsCancel(Integer visitId,LoginUserInfo loginUserInfo) {
        Visits visits = visitsMapper.selectById(visitId);
        if (Objects.isNull(visits)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(
                 CollectionUtils.isNotEmpty(loginUserInfo.getPermissions()) &&
                        loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")).collect(Collectors.toList()).size()>0)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无此操作权限");
        }
        this.visitsCancelBiz(visits);
    }
    /**
     * 处理待审核、审核中、已审核的数据取消业务
     * 2025年3月25日14:10:10
     */
    public void  visitsCancelBiz(Visits visits){ 
        UpdateWrapper<Visits> updateWrapper = new UpdateWrapper();
        updateWrapper.lambda().set(Visits::getStatus,Constants.VisitStatus.cancel)
                .set(Visits::getEditDate,DateUtil.getCurrDateTime())
                .set(Visits::getEditor,loginUserInfo.getId())
                .eq(Visits::getId,visitId);
                .set(Visits::getEditor,visits.getEditor())
                .eq(Visits::getId,visits.getId());
        //访客报备
        if(Constants.equalsInteger(visits.getType(),Constants.TWO)){
            if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)
@@ -1650,6 +1663,33 @@
                updateWrapper.lambda().set(Visits::getHkStatus,Constants.ZERO).set(Visits::getHkDate,DateUtil.getCurrDateTime());
            }
        }

        if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)||Constants.equalsInteger(visits.getStatus(),Constants.ONE)){
            //更新审批中的记录为取消
            approveMapper.update(null,
                    new UpdateWrapper<Approve>().lambda()
                            .set(Approve::getEditDate,new Date())
                            .set(Approve::getStatus,Constants.approveStatus.cancel)
                            .set(Approve::getStatusInfo,"手动取消")
                            .set(Approve::getCheckInfo,"手动取消")
                            .eq(Approve::getIsdeleted,Constants.ZERO)
                            .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
                            .eq(Approve::getObjId,visits.getId())
                            .eq(Approve::getObjType,visits.getType()));
            //更新待办消息状态
            noticesJoinMapper.update(null,
                    new UpdateWrapper<Notices>().lambda()
                            .set(Notices::getEditDate,new Date())
                            .set(Notices::getInfo,"手动取消")
//                        .set(Notices::getStatus,Constants.ONE)
                            .set(Notices::getParam2,Constants.FOUR)//已取消
                            .eq(Notices::getStatus,Constants.ZERO)
                            .eq(Notices::getParam2,Constants.ZERO)//待处理
                            .eq(Notices::getObjId,visits.getId())
                            .eq(Notices::getObjType,Constants.equalsInteger(visits.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
            );
        }

        visitsMapper.update(null,updateWrapper);
    }

@@ -1995,29 +2035,67 @@
                .set(Visits::getEditDate,date)
                .set(Visits::getRemark,"预约截止时间已过未审批，系统自动取消")
                .eq(Visits::getId,s.getId()));
        //更新审批中的记录为取消
        approveMapper.update(null,
                new UpdateWrapper<Approve>().lambda()
                        .set(Approve::getEditDate,date)
                        .set(Approve::getStatus,Constants.approveStatus.cancel)
                        .set(Approve::getStatusInfo,"系统已取消")
                        .set(Approve::getCheckInfo,"访问时间已过，系统自动取消")
                        .eq(Approve::getIsdeleted,Constants.ZERO)
                        .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
                        .eq(Approve::getObjId,s.getId())
                        .eq(Approve::getObjType,s.getType()));
        //更新待办消息状态
        noticesJoinMapper.update(null,
                new UpdateWrapper<Notices>().lambda()
                        .set(Notices::getEditDate,date)
                        .set(Notices::getInfo,"已取消")
//                      .set(Notices::getStatus,Constants.ONE)
                        .set(Notices::getParam2,Constants.FOUR)//已取消
                        .eq(Notices::getIsdeleted,Constants.ZERO)
                        .eq(Notices::getStatus,Constants.ZERO)
                        .eq(Notices::getParam2,Constants.ZERO)//待处理
                        .eq(Notices::getObjId,s.getId())
                        .eq(Notices::getObjType,Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)

        VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"系统取消",s.getId(),
                s.getType(),Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting
        );


//        //更新审批中的记录为取消
//        approveMapper.update(null,
//                new UpdateWrapper<Approve>().lambda()
//                        .set(Approve::getEditDate,date)
//                        .set(Approve::getStatus,Constants.approveStatus.cancel)
//                        .set(Approve::getStatusInfo,"系统已取消")
//                        .set(Approve::getCheckInfo,"访问时间已过，系统自动取消")
//                        .eq(Approve::getIsdeleted,Constants.ZERO)
//                        .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
//                        .eq(Approve::getObjId,s.getId())
//                        .eq(Approve::getObjType,s.getType()));
//        //更新待办消息状态
//        noticesJoinMapper.update(null,
//                new UpdateWrapper<Notices>().lambda()
//                        .set(Notices::getEditDate,date)
//                        .set(Notices::getInfo,"已取消")
////                        .set(Notices::getStatus,Constants.ONE)
//                        .set(Notices::getParam2,Constants.FOUR)//已取消
//                        .eq(Notices::getIsdeleted,Constants.ZERO)
//                        .eq(Notices::getStatus,Constants.ZERO)
//                        .eq(Notices::getParam2,Constants.ZERO)//待处理
//                        .eq(Notices::getObjId,s.getId())
//                        .eq(Notices::getObjType,Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
//        );
    }


    public static void  dealCancelNoticesData(NoticesJoinMapper noticesJoinMapper,ApproveMapper approveMapper,String info,Integer objId,Integer approveObjectType,Integer noticesType){
        if(Objects.nonNull(approveObjectType)){
            approveMapper.update(null,
                    new UpdateWrapper<Approve>().lambda()
                            .set(Approve::getEditDate,new Date())
                            .set(Approve::getStatus,Constants.approveStatus.cancel)
                            .set(Approve::getStatusInfo,info)
                            .set(Approve::getCheckInfo,info)
                            .eq(Approve::getIsdeleted,Constants.ZERO)
                            .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
                            .eq(Approve::getObjId,objId)
                            .eq(Approve::getObjType,approveObjectType));
        }
        if(Objects.nonNull(noticesType)){
            //更新待办消息状态
            noticesJoinMapper.update(null,
                    new UpdateWrapper<Notices>().lambda()
                            .set(Notices::getEditDate,new Date())
                            .set(Notices::getInfo,info)
                            .set(Notices::getParam2,Constants.FOUR)//已取消
                            .eq(Notices::getStatus,Constants.ZERO)
                            .eq(Notices::getParam2,Constants.ZERO)//待处理
                            .eq(Notices::getObjId,objId)
                            .eq(Notices::getObjType,noticesType)
            );
        }
    }



}