调整

luohairen

2024-12-24 7b0c58ee03a3f2ab497fc6407e91e88474c0b58a

调整

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

@@ -8,6 +8,7 @@
import com.ycl.common.utils.excel.OutputExcelUtils;
import com.ycl.domain.excel.ProjectExcelTemplate;
import com.ycl.domain.form.DocumentInfoForm;
import com.ycl.domain.form.ProjectForm;
import com.ycl.domain.form.ProjectInfoForm;
import com.ycl.domain.query.ProjectExportQuery;
import com.ycl.domain.query.ProjectInfoQuery;
@@ -163,4 +164,9 @@
        projectInfoService.importProject(file);
        return Result.ok();
    }

    @PostMapping("/editProject")
    public Result editProject(@RequestBody ProjectForm form) {
        return projectInfoService.editProject(form);
    }
}

 business/src/main/java/com/ycl/domain/form/ProjectForm.java

New file
@@ -0,0 +1,17 @@
package com.ycl.domain.form;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProjectForm {
    private ProjectInfoForm projectInfoForm;
    private ProjectInvestmentInfoForm projectInvestmentInfoForm;
    private ProjectInvestmentFundingForm projectInvestmentFundingForm;
    private ProjectInvestmentPolicyComplianceForm projectInvestmentPolicyComplianceForm;
    private ProjectUnitRegistrationInfoForm projectUnitRegistrationInfoForm;
    private DocumentInfoForm documentInfoForm;
}

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

@@ -4,6 +4,7 @@
import com.ycl.common.base.Result;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.domain.form.DocumentInfoForm;
import com.ycl.domain.form.ProjectForm;
import com.ycl.domain.form.ProjectInfoForm;
import com.ycl.domain.query.ProjectExportQuery;
import com.ycl.domain.query.ProjectInfoQuery;
@@ -87,4 +88,6 @@
    Result updateUsedStatus(Integer id, Integer usedStatus);

    void importProject(MultipartFile file);

    Result editProject(ProjectForm form);
}

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

@@ -28,11 +28,10 @@
import com.ycl.common.utils.file.FileUploadUtils;
import com.ycl.common.utils.file.FileUtils;
import com.ycl.common.utils.poi.ExcelUtil;
import com.ycl.controller.ProjectInfoController;
import com.ycl.domain.entity.*;
import com.ycl.domain.excel.ProjectExcelTemplate;
import com.ycl.domain.form.DocumentInfoForm;
import com.ycl.domain.form.PlanForm;
import com.ycl.domain.form.ProjectInfoForm;
import com.ycl.domain.form.*;
import com.ycl.domain.query.ProjectExportQuery;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.domain.vo.*;
@@ -85,6 +84,10 @@
    private final FileService fileService;
    private final FileMapper fileMapper;
    private final PlanMapper planMapper;
    private final ProjectInvestmentInfoServiceImpl projectInvestmentInfoServiceImpl;
    private final ProjectInvestmentFundingServiceImpl projectInvestmentFundingServiceImpl;
    private final ProjectInvestmentPolicyComplianceServiceImpl projectInvestmentPolicyComplianceServiceImpl;
    private final ProjectUnitRegistrationInfoServiceImpl projectUnitRegistrationInfoServiceImpl;

    /**
     * 添加
@@ -658,6 +661,56 @@
        }
    }

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

        return Result.ok("提交成功");
    }

    private static void deleteDirectoryOrFile(java.io.File file) {
        if (ObjectUtil.isNull(file)) {
            return;