zjh 本地 2023/12/27 -1

zjh

2023-12-27 7077fa8ff7f18b2991deafaba9f9dc65d1d27f51

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java

@@ -66,27 +66,34 @@
    public AjaxResult getlist(@RequestParam(required = false) @ApiParam(value = "项目名称") String proName,
                              @RequestParam(required = false) @ApiParam(value = "检查类别") String checkType,
                              @RequestParam(required = false) @ApiParam(value = "部门id") String deptId) {
        LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
        wq0.eq(TjProject::getProParentId, 0);
        if(null !=proName){
            wq0.like(TjProject::getProName,proName);
        }
        if(null !=checkType){
            wq0.like(TjProject::getProCheckType,checkType);
        }
        if(null !=deptId){
            wq0.like(TjProject::getDeptId,deptId);
        }
//        LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
//        wq0.eq(TjProject::getProParentId, 0);
//        if(null !=proName){
//            wq0.like(TjProject::getProName,proName);
//        }
//        if(null !=checkType){
//            wq0.like(TjProject::getProCheckType,checkType);
//        }
//        if(null !=deptId){
//            wq0.like(TjProject::getDeptId,deptId);
//        }
//
//        List<TjProject> tjProjects = tjProjectService.list(wq0);

        List<TjProject> tjProjects = tjProjectService.list(wq0);
        //上面的换sql
        final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);

        if (tjProjects != null) {
            for (TjProject project : tjProjects) {
                LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjProject::getProParentId, project.getProId());
                if(null !=proName) {
                    wq1.like(TjProject::getProName, proName);
                }
                List<TjProject> projectList = tjProjectService.list(wq1);
                project.setTjProjectList(projectList);

                //根据每个项目的deptId拿到name  2023/2/7

                SysDept sysDept = deptService.selectDeptById(project.getDeptId());
                if (sysDept!=null){
                    project.setDeptName(sysDept.getDeptName());
@@ -125,7 +132,7 @@
    /**
     * 导出体检项目列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:project:export')")
    //@PreAuthorize("@ss.hasPermi('hosp:project:export')")
    @Log(title = "体检项目", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation(value = "导出体检项目列表")
@@ -138,7 +145,7 @@
    /**
     * 获取体检项目详细信息
     */
    @PreAuthorize("@ss.hasPermi('hosp:project:query')")
    //@PreAuthorize("@ss.hasPermi('hosp:project:query')")
    @GetMapping(value = "/{proId}")
    @ApiOperation(value = "获取体检项目详细信息")
    public AjaxResult getInfo(@PathVariable("proId") @ApiParam(value = "体检项目id") Long proId) {
@@ -174,7 +181,7 @@
    /**
     * 新增体检项目
     */
    @PreAuthorize("@ss.hasPermi('hosp:project:add')")
    //@PreAuthorize("@ss.hasPermi('hosp:project:add')")
    @ApiOperation(value = "新增体检项目")
    @Log(title = "体检项目", businessType = BusinessType.INSERT)
    @PostMapping
@@ -245,7 +252,7 @@
    /**
     * 修改体检项目
     */
    @PreAuthorize("@ss.hasPermi('hosp:project:edit')")
    //@PreAuthorize("@ss.hasPermi('hosp:project:edit')")
    @Log(title = "体检项目", businessType = BusinessType.UPDATE)
    @PutMapping
    @ApiOperation(value = "修改体检项目")
@@ -344,7 +351,7 @@
    /**
     * 删除体检项目
     */
    @PreAuthorize("@ss.hasPermi('hosp:project:remove')")
    // @PreAuthorize("@ss.hasPermi('hosp:project:remove')")
    @Log(title = "体检项目", businessType = BusinessType.DELETE)
    @DeleteMapping("/{proIds}")
    @ApiOperation(value = "删除体检项目(可删除父项目和子项目)")