修改bug

huanghongfa

2021-07-09 b7a06b6e93c0df03ed84c40385cbe88d27459d4f

修改bug

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoActivityServiceImpl.java

@@ -159,7 +159,7 @@
        if(!photoActivityDOS.isEmpty()){
            Date nowDate = new Date();
            photoActivityDOS.forEach(photoActivity -> {
                if(photoActivity.getActivityStartAt().getTime() >= nowDate.getTime()){
                if(photoActivity.getActivityStartAt().getTime() <= nowDate.getTime()){
                    photoActivity.setStatus(ComActEasyPhotoActivityDO.status.jxz);
                    this.baseMapper.updateById(photoActivity);
                }

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberWarnLogServiceImpl.java

@@ -179,7 +179,20 @@
                                eventGridMemberGpsLogMapper.updateById(memberGpsLog);
                                //修改用户工作状态
                                this.baseMapper.setUserWorkStatus(memberGpsLog.getGridMemberId(),workStatus);
                                break;
                            }else{
                                memberGpsLog.setPositionStation(EventGridMemberGpsLogDO.positionStation.abnormal);

                                //新增网格员预警信息
                                EventGridMemberWarnLogDO memberWarnLogDO = new EventGridMemberWarnLogDO();
                                BeanUtils.copyProperties(memberGpsLog,memberWarnLogDO);
                                memberWarnLogDO.setId(null);
                                memberWarnLogDO.setContent("工作时间未在网格内预警");
                                memberWarnLogDO.setHappenAt(memberGpsLog.getCreateAt());
                                this.baseMapper.insert(memberWarnLogDO);

                                eventGridMemberGpsLogMapper.updateById(memberGpsLog);
                                //修改用户工作状态
                                this.baseMapper.setUserWorkStatus(memberGpsLog.getGridMemberId(),2);
                            }
                        }
                    }