Administrator
2023-08-18 b9f8999d477f90fb8b0dd509e8252c0704b1f8b2
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);
            }
        }