ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
@@ -183,7 +183,7 @@ } @ApiOperation(value = "获取设备详情检查列表",response = DeviceDetailCheckListVo.class) @ApiOperation(value = "获取检查计划列表",response = DeviceDetailCheckListVo.class) @PostMapping("/getDeviceDetailCheckList") public R<Page<DeviceDetailCheckListVo>> getDeviceDetailCheckList(@RequestBody DeviceDetailCheckListQuery query) { Page<DeviceDetailCheckListVo> page = new Page<>(query.getPageNum(), query.getPageSize()); @@ -193,14 +193,14 @@ } @ApiOperation(value = "获取设备详情检查资料列表") @ApiOperation(value = "获取检查资料列表") @GetMapping("/getDeviceDetailCheckPlanList") public R<List<Check>> getDeviceDetailCheckPlanList(@RequestParam Integer planId) { List<Check> list = checkService.list(new LambdaQueryWrapper<Check>().eq(Check::getPlanId,planId).orderByDesc(Check::getTime)); return R.ok(list); } @ApiOperation(value = "获取设备详情检查资料详情") @ApiOperation(value = "获取检查资料详情") @GetMapping("/getDeviceDetailCheckPlanDetail") public R<Check> getDeviceDetailCheckPlanDetail(@RequestParam Integer id) { Check check = checkService.getDeviceDetailCheckPlanDetail(id); ruoyi-system/src/main/java/com/ruoyi/system/mapper/ProjectMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.system.model.Project; import com.ruoyi.system.query.DeviceDetailCheckListQuery; import com.ruoyi.system.vo.DeviceDetailCheckListVo; import org.apache.ibatis.annotations.Param; @@ -19,7 +20,7 @@ */ public interface ProjectMapper extends BaseMapper<Project> { List<DeviceDetailCheckListVo> getDeviceDetailCheckList(@Param("page") Page<DeviceDetailCheckListVo> page, @Param("projectId") Integer projectId); List<DeviceDetailCheckListVo> getDeviceDetailCheckList(@Param("page") Page<DeviceDetailCheckListVo> page, @Param("query") DeviceDetailCheckListQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/query/DeviceDetailCheckListQuery.java
@@ -5,10 +5,27 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; @Data @ApiModel("设备详情检查列表查询query") public class DeviceDetailCheckListQuery extends BasePage { @ApiModelProperty("项目id") @NotNull(message = "项目id不能为空") private Integer projectId; @ApiModelProperty("计划id") private Integer planId; @ApiModelProperty("开始时间") private String startTime; @ApiModelProperty("结束时间") private String endTime; @ApiModelProperty("计划名称") private String planName; } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectServiceImpl.java
@@ -37,7 +37,7 @@ public List<DeviceDetailCheckListVo> getDeviceDetailCheckList(Page<DeviceDetailCheckListVo> page, DeviceDetailCheckListQuery query) { Project project = this.getById(query.getProjectId()); Integer clientId = project.getClientId(); List<DeviceDetailCheckListVo> deviceDetailCheckList = this.baseMapper.getDeviceDetailCheckList(page, query.getProjectId()); List<DeviceDetailCheckListVo> deviceDetailCheckList = this.baseMapper.getDeviceDetailCheckList(page, query); ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, clientId)); if(param!=null){ deviceDetailCheckList.forEach(item -> { ruoyi-system/src/main/resources/mapper/system/ProjectMapper.xml
@@ -30,7 +30,20 @@ from task t1 left join plan t2 on t1.plan_id = t2.id left join eval_result t3 on t1.id = t3.check_task_id where t1.project_id = #{projectId} where t1.project_id = #{query.projectId} <if test="query.planName != null and query.planName != ''"> and t2.name like concat('%',#{query.planName},'%') </if> <if test="query.planId != null"> and t2.id = #{query.planId} </if> <if test="query.startTime != null and query.startTime != ''"> and t1.date >= #{query.startTime} </if> <if test="query.endTime != null and query.endTime != ''"> and #{query.endTime} >=t1.date </if> order by t1.date desc