Merge remote-tracking branch 'origin/master'

“mitao”

2026-01-23 b9a5b68fab3428bb23c05ba3e0cab83afa1a82cb

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java

@@ -12,6 +12,8 @@
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -102,6 +104,8 @@
        if(task!=null){
            projectVo.setCheckTime(task.getUpdateTime());
        }
        List<DeviceCountVo> list = deviceUsageService.getProjectDeviceCount(id);
        projectVo.setDeviceCountVos(list);
        return R.ok(projectVo);
    }

@@ -208,13 +212,13 @@
        return R.ok(list);
    }


    @ApiOperation(value = "获取检查资料详情")
    @GetMapping("/getDeviceDetailCheckPlanDetail")
    public R<Check> getDeviceDetailCheckPlanDetail(@RequestParam Integer id) {
        Check check = checkService.getDeviceDetailCheckPlanDetail(id);
        return R.ok(check);
    }



    @ApiOperation(value = "获取大屏人员在岗信息")
@@ -255,6 +259,7 @@
        List<Plan> list = planService.list(new LambdaQueryWrapper<Plan>().eq(Plan::getDeleted, false));
        return R.ok(list);
    }


    @ApiOperation(value = "获取人员在岗列表",response = ProjectPersonOnDutyListVo.class)
    @PostMapping("/getProjectOnDutyList")
@@ -352,4 +357,22 @@
        return R.ok(list);
    }

    @ApiOperation(value = "获取项目列表")
    @GetMapping("/list")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "clientId", value = "委托方ID", dataType = "int", paramType = "query"),
            @ApiImplicitParam(name = "projectName", value = "项目名称", dataType = "string", paramType = "query")
    })
    public R<List<Project>> getList(Integer clientId, String projectName) {
        LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<Project>().eq(Project::getDeleted, false);
        if(clientId!=null){
            wrapper.eq(Project::getClientId, clientId);
        }
        if(projectName!=null && !projectName.isEmpty()){
            wrapper.like(Project::getName, projectName);
        }
        List<Project> list = projectService.list(wrapper);
        return R.ok(list);

    }
}