Administrator
2023-08-18 ac2ab42d45dd7fba0fcc3506c40cea34039f6e9a
巡检计划打卡前
已添加1个文件
已修改3个文件
42 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/param/RecordBeforeParam.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointRecordService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -306,4 +306,14 @@
        return recordService.executeSolo(recordSoloExParam);
    }
    /**
     * å•兵端--打卡前
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordBefore')")
    @ApiOperation("单兵端--打卡前")
    @PostMapping("recordBefore")
    public Results recordBefore(@RequestBody RecordBeforeParam recordBeforeParam) throws ParseException {
        return recordService.recordBefore(recordBeforeParam);
    }
}
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/param/RecordBeforeParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
package com.ruoyi.app.patrolplan.domain.param;
import lombok.Data;
@Data
public class RecordBeforeParam {
    private String planId;
    private String wellId;
}
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointRecordService.java
@@ -32,4 +32,6 @@
    Results executeDetails(RecordDetailsExParam recordDetailsExParam) throws ParseException;
    Results executeSolo(RecordSoloExParam recordSoloExParam);
    Results recordBefore(RecordBeforeParam recordBeforeParam);
}
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
@@ -729,4 +729,24 @@
        }
        return Results.succeed(jsonArray);
    }
    @Override
    public Results recordBefore(RecordBeforeParam recordBeforeParam) {
        String planId = recordBeforeParam.getPlanId();
        String wellId = recordBeforeParam.getWellId();
        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);
        ArdAppPatrolpointRecord record = ardAppPatrolpointRecordMapper.selectOne(queryWrapper);
        //根据姓名ID查询计划制定人的姓名
        String planUserId = plan.getUserId();
        SysUser sysUser = sysUserMapper.selectById(planUserId);
        String nikeName = sysUser.getNickName();
        record.setPlanUserName(nikeName);
        jsonArray.add(record);
        return Results.succeed(jsonArray);
    }
}