Administrator
2023-08-19 56e8e3d9616813874a5c83c1770ba9fc761dd3d0
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
@@ -299,10 +299,20 @@
        String userId = recordSoloParam.getUserId();
        String planName = recordSoloParam.getPlanName();
        String userName = recordSoloParam.getUserName();
        //根据计划ID获取制定人ID
        ArdAppPatrolplan ardAppPatrolplan = patrolplanMapper.selectById(planId);
        //根据姓名ID查询计划制定人的姓名
        String planUserId = ardAppPatrolplan.getUserId();
        SysUser sysUser = sysUserMapper.selectById(planUserId);
        String nikeName = sysUser.getNickName();
        QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("plan_id", planId).eq("user_id",userId).like("record_time", toDay);
        //当前计划选中时间里此用户的打卡记录
        List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
        for (int i = 0; i < list.size(); i++) {
            ArdAppPatrolpointRecord ardAppPatrolpointRecord = list.get(i);
            ardAppPatrolpointRecord.setPlanUserName(nikeName);
        }
        //查询该计划的所有兴趣点
        List<ArdAlarmpointsWell> wellList = wellMapper.wellByPlanId(planId);
        if(list.size()==0){
@@ -316,6 +326,7 @@
                ardAppPatrolpointRecord.setUserName(userName);
                ardAppPatrolpointRecord.setLatitude(String.valueOf(ardAlarmpointsWell.getLatitude()));
                ardAppPatrolpointRecord.setLongitude(String.valueOf(ardAlarmpointsWell.getLongitude().toString()));
                ardAppPatrolpointRecord.setPlanUserName(nikeName);
                list.add(ardAppPatrolpointRecord);
            }
            return Results.succeed(list);
@@ -349,6 +360,7 @@
                ardAppPatrolpointRecord.setUserName(userName);
                ardAppPatrolpointRecord.setLatitude(String.valueOf(ardAlarmpointsWell.getLatitude()));
                ardAppPatrolpointRecord.setLongitude(String.valueOf(ardAlarmpointsWell.getLongitude().toString()));
                ardAppPatrolpointRecord.setPlanUserName(nikeName);
                list.add(ardAppPatrolpointRecord);
            }
        }
@@ -717,4 +729,44 @@
        }
        return Results.succeed(jsonArray);
    }
    @Override
    public Results recordBefore(RecordBeforeParam recordBeforeParam) {
        String planId = recordBeforeParam.getPlanId();
        String wellId = recordBeforeParam.getWellId();
        String toDay = recordBeforeParam.getToDay();
        String userId = SecurityUtils.getUserId();
        JSONArray jsonArray = new JSONArray();
        ArdAppPatrolplan plan = patrolplanMapper.selectById(planId);
        jsonArray.add(plan);
        QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("plan_id",planId).eq("app_patrolpoints_id",wellId).eq("user_id",userId).like("record_time",toDay);
        ArdAppPatrolpointRecord record = ardAppPatrolpointRecordMapper.selectOne(queryWrapper);
        //根据姓名ID查询计划制定人的姓名
        String planUserId = plan.getUserId();
        SysUser sysUser = sysUserMapper.selectById(planUserId);
        String nikeName = sysUser.getNickName();
        if(record==null){
            //根据姓名ID查询执行人姓名
            SysUser user = sysUserMapper.selectById(userId);
            String userName = user.getNickName();
            //查询该计划的所有兴趣点
            ArdAlarmpointsWell ardAlarmpointsWell = wellMapper.selectById(wellId);
            //没打卡的数据
            ArdAppPatrolpointRecord record1 = new ArdAppPatrolpointRecord();
            record1.setAppPatrolpointsId(ardAlarmpointsWell.getId());
            record1.setAppPatrolpointsName(ardAlarmpointsWell.getWellId());
            record1.setPlanId(planId);
            record1.setPlanName(plan.getPlanName());
            record1.setUserId(userId);
            record1.setUserName(userName);
            record1.setLatitude(String.valueOf(ardAlarmpointsWell.getLatitude()));
            record1.setLongitude(String.valueOf(ardAlarmpointsWell.getLongitude().toString()));
            record1.setPlanUserName(nikeName);
            jsonArray.add(record1);
        }else {
            jsonArray.add(record);
        }
        return Results.succeed(jsonArray);
    }
}