zjh 2024/02/6--1

zjh

2024-02-06 991d785c3401821a9c50c75dd6b33c70dd454151

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

@@ -89,17 +89,17 @@
        //上面的换sql
        final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);

        if (tjProjects != null) {
            for (TjProject project : tjProjects) {
                List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
                project.setTjProjectList(projectList);
                SysDept sysDept = deptService.selectDeptById(project.getDeptId());
                if (sysDept != null) {
                    project.setDeptName(sysDept.getDeptName());
                }

            }
        }
//        if (tjProjects != null) {
//            for (TjProject project : tjProjects) {
//                List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
//                project.setTjProjectList(projectList);
//                SysDept sysDept = deptService.selectDeptById(project.getDeptId());
//                if (sysDept != null) {
//                    project.setDeptName(sysDept.getDeptName());
//                }
//
//            }
//        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String, Object> map = new HashMap<>();
        map.put("list", tjProjects);
@@ -113,8 +113,21 @@
     */
    @GetMapping("/getAllChildListById")
    @ApiOperation(value = "查询项目子项")
    public AjaxResult getAllChildListById(String proId) {
        List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
    public AjaxResult getAllChildListById(@RequestParam(required = false)String proId,
                                          @RequestParam(required = false) String proName,
                                          @RequestParam(required = false) String checkType) {
        LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
        if (proId!=null){
            wq.eq(TjProject::getProParentId,proId);
        }
        if (proName!=null){
            wq.like(TjProject::getProName,proName);
        }
        if (checkType!=null){
            wq.eq(TjProject::getProCheckType,checkType);
        }
        List<TjProject> tjProjects = tjProjectService.list(wq);
//        List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
        if (tjProjects != null) {
            for (TjProject project : tjProjects) {
                SysDept sysDept = deptService.selectDeptById(project.getDeptId());
@@ -471,7 +484,7 @@
     */
    @GetMapping(value = "/getInfoByProId")
    @ApiOperation(value = "获取体检项目详细信息")
    public AjaxResult getInfoByProId(Long proId) {
    public AjaxResult getInfoByProId(@RequestParam Long proId) {
        TjProject tjProject = tjProjectService.getById(proId);
        return AjaxResult.success(tjProject);
    }