Merge remote-tracking branch 'origin/master'

xiangpei

2025-01-17 2cf8f4dff8667d54037ab91ded0b1edea9a26d05

Merge remote-tracking branch 'origin/master'

 business/src/main/java/com/ycl/controller/ProjectInfoController.java

@@ -114,7 +114,10 @@
        return Result.ok().data(ProjectCodeGenerator.generateProjectCode());
    }

    ;
    @GetMapping("/searchByKey")
    public Result searchByKey(@RequestParam(required = false) String wordKey) {
        return projectInfoService.searchByKey(wordKey);
    }

    @GetMapping("/getManagerFlag/{recordId}")
    public Result getManagerFlag(@PathVariable("recordId") Integer recordId) {
@@ -169,4 +172,7 @@
    public Result editProject(@RequestBody ProjectForm form) {
        return projectInfoService.editProject(form);
    }



}

 business/src/main/java/com/ycl/service/ProjectInfoService.java

@@ -90,4 +90,6 @@
    void importProject(MultipartFile file);

    Result editProject(ProjectForm form);

    Result searchByKey(String wordKey);
}

 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java

@@ -7,6 +7,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ZipUtil;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -725,6 +726,16 @@
        return Result.ok("提交成功");
    }

    @Override
    public Result searchByKey(String wordKey) {
        Wrapper wrapper = null;
        if (!StringUtils.isEmpty(wordKey)) {
            wrapper = Wrappers.<ProjectInfo>lambdaQuery().like(ProjectInfo::getProjectName, wordKey).or().like(ProjectInfo::getProjectCode, wordKey);
        }
        List<ProjectInfo> list = baseMapper.selectList(wrapper);
        return Result.ok().data(list);
    }

    private static void deleteDirectoryOrFile(java.io.File file) {
        if (ObjectUtil.isNull(file)) {
            return;
@@ -740,8 +751,10 @@
        }
        file.delete();
    }

    /**
     * 项目名称校验重复
     *
     * @return
     */
    public void checkProjectNameUnique(ProjectInfo projectInfo) {