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;
@@ -236,7 +237,7 @@
            if ("101".equals(ancestor)) { // 业主
                query.setCreateBy(userId);
                query.setRole(0);
            }else if ("102".equals(ancestor)){ // 审批
            } else if ("102".equals(ancestor)) { // 审批
                query.setUsedStatus(1);
                query.setRole(1);
            }
@@ -434,7 +435,7 @@
        ProjectInfo projectInfo = baseMapper.selectById(recordId);
        // 判断当前用户id是否在主管列表中
        String competentDepartment = projectInfo.getCompetentDepartment();
        if (StringUtils.isEmpty(competentDepartment)){
        if (StringUtils.isEmpty(competentDepartment)) {
            return Result.ok().data(false);
        }
        List<String> list = Arrays.asList(competentDepartment.split(","));
@@ -584,7 +585,7 @@
        java.io.File tempDir = null;
        try {
            tempZip = java.io.File.createTempFile("temp", ".zip");
            try(InputStream inputStream = file.getInputStream()) {
            try (InputStream inputStream = file.getInputStream()) {
                Files.copy(inputStream, tempZip.toPath(), StandardCopyOption.REPLACE_EXISTING);
            }

@@ -592,9 +593,9 @@

            try {
                ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_UTF_8);
            }catch (IORuntimeException e){
                    log.error("解压失败，尝试使用GBK编码解压...");
                    ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_GBK);
            } catch (IORuntimeException e) {
                log.error("解压失败，尝试使用GBK编码解压...");
                ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_GBK);
            }

            Path path = tempDir.toPath();
@@ -677,11 +678,11 @@

    @Override
    public Result editProject(ProjectForm form) {
        if (ObjectUtil.isNotNull(form.getProjectInfoForm())){
        if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
            if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
                //新增
                add(form.getProjectInfoForm());
            }else {
            } else {
                //更新
                update(form.getProjectInfoForm());
            }
@@ -689,40 +690,50 @@
        if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
            if (ObjectUtil.isNull(form.getProjectInvestmentInfoForm().getId())) {
                projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
            }else {
            } else {
                projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
            }
        }
        if (ObjectUtil.isNotNull(form.getProjectInvestmentFundingForm())) {
            if (ObjectUtil.isNull(form.getProjectInvestmentFundingForm().getId())) {
                projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
            }else {
            } else {
                projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm());
            }
        }
        if (ObjectUtil.isNotNull(form.getProjectInvestmentPolicyComplianceForm())) {
            if (ObjectUtil.isNull(form.getProjectInvestmentPolicyComplianceForm().getId())) {
                projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
            }else {
            } else {
                projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
            }
        }
        if (ObjectUtil.isNotNull(form.getProjectUnitRegistrationInfoForm())) {
            if (ObjectUtil.isNull(form.getProjectUnitRegistrationInfoForm().getId())) {
                projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
            }else {
            } else {
                projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
            }
        }
        if (ObjectUtil.isNotNull(form.getDocumentInfoForm())) {
            if (ObjectUtil.isNull(form.getDocumentInfoForm().getProjectId())){
            if (ObjectUtil.isNull(form.getDocumentInfoForm().getProjectId())) {
                return Result.error("请先保存投资管理基本信息");
            }else {
            } else {
                addDoc(form.getDocumentInfoForm());
            }
        }

        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) {
@@ -740,8 +751,10 @@
        }
        file.delete();
    }

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