k94314517
2025-03-26 e87b711cc267567d8374315dc99ef9780cb25dd8
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,8 +1573,6 @@
                .eq(Retention::getMemberId,visits.getMemberId()));
    }
    @Autowired
    private VisitParkMapper visitParkMapper;
    /**
@@ -1650,6 +1650,34 @@
                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::getIsdeleted,Constants.ZERO)
                            .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 +2023,68 @@
                .set(Visits::getEditDate,date)
                .set(Visits::getRemark,"预约截止时间已过未审批,系统自动取消")
                .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
        );
//        //更新审批中的记录为取消
//        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,date)
                            .set(Approve::getEditDate,new Date())
                        .set(Approve::getStatus,Constants.approveStatus.cancel)
                        .set(Approve::getStatusInfo,"系统已取消")
                        .set(Approve::getCheckInfo,"访问时间已过,系统自动取消")
                            .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,s.getId())
                        .eq(Approve::getObjType,s.getType()));
                            .eq(Approve::getObjId,objId)
                            .eq(Approve::getObjType,approveObjectType));
        }
        if(Objects.nonNull(noticesType)){
        //更新待办消息状态
        noticesJoinMapper.update(null,
                new UpdateWrapper<Notices>().lambda()
                        .set(Notices::getEditDate,date)
                        .set(Notices::getInfo,"已取消")
//                      .set(Notices::getStatus,Constants.ONE)
                            .set(Notices::getEditDate,new Date())
                            .set(Notices::getInfo,info)
                        .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)
                            .eq(Notices::getObjId,objId)
                            .eq(Notices::getObjType,noticesType)
        );
    }
}
}