代码初始化

k94314517

2025-04-02 bb48c066cc11f571be02eb0dc7f9ef26dd3151ca

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

@@ -569,7 +569,7 @@
                .eq(ApproveParam::getLevel,Constants.ONE)
                .eq(ApproveParam::getMemberType,Constants.ZERO)
                .last("limit 1"));
         return  Objects.isNull(approveParam)?null:approveParam.getId();
        return  Objects.isNull(approveParam)?null:approveParam.getId();
    }


@@ -1617,7 +1617,7 @@
            }
            if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass)
                    && Constants.equalsInteger(visits.getHkStatus(),Constants.ONE)
                    &&StringUtils.isNotBlank(visits.getHkId())){
                    &&StringUtils.isNotBlank(visits.getCarNos())){
                //取消停车场预约
                List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()
                        .eq(VisitPark::getCarCode,visits.getCarNos())
@@ -1653,9 +1653,9 @@
            }
            if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)
                    && Constants.equalsInteger(visits.getHkStatus(),Constants.ONE)
                    &&StringUtils.isNotBlank(visits.getHkId())){
                    &&StringUtils.isNotBlank(visits.getHkRecordId())){
                VisitAppointmentCancelRequest request = new VisitAppointmentCancelRequest();
                request.setAppointRecordIds(new String[]{visits.getHkId()});
                request.setAppointRecordIds(new String[]{visits.getHkRecordId()});
                BaseResponse response =  HKService.iccmCancelAppointment(request);
                if(response==null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null){
                    throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMsg());
@@ -1681,13 +1681,32 @@
                    new UpdateWrapper<Notices>().lambda()
                            .set(Notices::getEditDate,new Date())
                            .set(Notices::getInfo,"手动取消")
//                        .set(Notices::getStatus,Constants.ONE)
                            .set(Notices::getParam2,Constants.FOUR)//已取消
                            .setSql(" param4 = user_id ")
                            .set(Notices::getStatus,Constants.ONE)
                            .set(Notices::getParam2,Constants.ONE)//标记已处理
                            .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)
            );

            Approve approve = new Approve();
            approve.setCreateDate(new Date());
            approve.setIsdeleted(Constants.ZERO);
            approve.setRemark("手动取消");
            approve.setChekorId(visits.getEditor());
            approve.setTitle("取消预约");
            approve.setStatus(Constants.THREE);
            approve.setStatusInfo("手动取消");
            approve.setObjId(visits.getId());
            approve.setLevel(9999);
            approve.setApproveType(2);
            approve.setDriverParam(Constants.ZERO);
            approve.setAddrParam(Constants.ZERO);
            approve.setObjType(visits.getType());
            approve.setType(Constants.ZERO);
            approve.setCheckDate(new Date());
            approveMapper.insert(approve);
        }

        visitsMapper.update(null,updateWrapper);
@@ -2037,9 +2056,26 @@
                .eq(Visits::getId,s.getId()));

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

        Approve approve = new Approve();
        approve.setCreateDate(new Date());
        approve.setIsdeleted(Constants.ZERO);
        approve.setRemark("系统自动取消");
        approve.setTitle("取消预约");
        approve.setStatus(Constants.THREE);
        approve.setStatusInfo("超时自动取消");
        approve.setObjId(s.getId());
        approve.setLevel(9999);
        approve.setApproveType(2);
        approve.setDriverParam(Constants.ZERO);
        approve.setAddrParam(Constants.ZERO);
        approve.setObjType(s.getType());
        approve.setType(Constants.ZERO);
        approve.setCheckDate(new Date());
        approveMapper.insert(approve);

//        //更新审批中的记录为取消
//        approveMapper.update(null,
@@ -2086,8 +2122,10 @@
            noticesJoinMapper.update(null,
                    new UpdateWrapper<Notices>().lambda()
                            .set(Notices::getEditDate,new Date())
                            .set(Notices::getInfo,info)
                            .set(Notices::getParam2,Constants.FOUR)//已取消
                            .set(Notices::getInfo,"自动取消")
                            .setSql(" param4 = user_id ")
                            .set(Notices::getStatus,Constants.ONE)
                            .set(Notices::getParam2,Constants.ONE)//已取消
                            .eq(Notices::getStatus,Constants.ZERO)
                            .eq(Notices::getParam2,Constants.ZERO)//待处理
                            .eq(Notices::getObjId,objId)