Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-10-14 9c8dee1390f9c88f449f1a7f0d8b65a737ed696a

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

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

@@ -128,6 +128,9 @@
        if (pageWrap.getModel().getOutVisitorNum() != null) {
            queryWrapper.lambda().eq(InoutDayCount::getOutVisitorNum, pageWrap.getModel().getOutVisitorNum());
        }
        if (pageWrap.getModel().getLeaveVisitorNum() != null) {
            queryWrapper.lambda().eq(InoutDayCount::getLeaveVisitorNum, pageWrap.getModel().getLeaveVisitorNum());
        }

        if (pageWrap.getModel().getInSelfMemberNum() != null) {
            queryWrapper.lambda().eq(InoutDayCount::getInSelfMemberNum, pageWrap.getModel().getInSelfMemberNum());

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

@@ -147,6 +147,7 @@
                .eq(InoutDayCount::getTimeInfo,param.getTimeInfo())
                .eq(InoutDayCount::getIsdeleted,Constants.ZERO)
                .last("limit 1"));
        log.error("============================inoutDayCountMapper:"+JSONObject.toJSONString(param));
        if(model == null){
            param.setIsdeleted(Constants.ZERO);
            param.setCreateDate(new Date());