Merge remote-tracking branch 'origin/master'

fuliqi

2024-12-12 43591a0f6820bb7bfa1501b7cc4af6729686dd19

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

@@ -12,7 +12,7 @@
import com.ycl.domain.vo.ProgressPlanInfoFlag;
import com.ycl.domain.vo.ProgressPlanInfoResponseVO;
import com.ycl.domain.vo.ProgressPlanVO;
import com.ycl.domain.vo.ProjectProgressFileListsRequest;
import com.ycl.domain.form.ProjectProgressFileListsForm;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.*;
import com.ycl.service.ProgressPlanService;
@@ -111,7 +111,7 @@
     * @return
     */
    @Override
    public Result detail(Integer id) {
    public Result detail(Long id) {
        ProgressPlanInfoResponseVO vo = new ProgressPlanInfoResponseVO();
        List<ProgressPlanInfoFlag> monthProgress = new ArrayList<>();
        List<ProgressPlanInfoFlag> seasonProgress = new ArrayList<>();
@@ -181,10 +181,6 @@
    }

    /**
     *
     */

    /**
     * 列表
     * @return
     */
@@ -199,46 +195,38 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result saveProjectProgressFileLists(ProjectProgressFileListsRequest request) {
    public Result saveProjectProgressFileLists(ProjectProgressFileListsForm form) {
            new LambdaUpdateChainWrapper<>(fileMapper)
                    .eq(File::getBusId, request.getProjectReportId())
                    .eq(File::getBusId, form.getProjectReportId())
                    .eq(File::getType, FileTypeEnum.PROJECT_SITUATION_DESCRIPTION.getType())
                    .set(File::getDeleted,1)
                    .update();
                    .remove();

            request.getSituationDescriptionFileList().stream()
        form.getSituationDescriptionFileList().stream()
                    .forEach(file -> {
                        file.setId(null);
                        file.setBusId(request.getProjectReportId().longValue());
                        file.setBusId(form.getProjectReportId());
                        file.setType(FileTypeEnum.PROJECT_SITUATION_DESCRIPTION);
                        file.setGmtCreate(new Date());
                        file.setGmtUpdate(new Date());
                        file.setDeleted(0);
                        fileMapper.insert(file);
                    });

            new LambdaUpdateChainWrapper<>(fileMapper)
                    .eq(File::getBusId, request.getProjectReportId())
                    .eq(File::getBusId, form.getProjectReportId())
                    .eq(File::getType, FileTypeEnum.PROJECT_COMPLETE_REPORT.getType())
                    .set(File::getDeleted,1)
                    .update();
                    .remove();

            request.getCompletedReportFileList().stream()
        form.getCompletedReportFileList().stream()
                    .forEach(file -> {
                        file.setId(null);
                        file.setBusId(request.getProjectReportId().longValue());
                        file.setBusId(form.getProjectReportId());
                        file.setType(FileTypeEnum.PROJECT_COMPLETE_REPORT);
                        file.setGmtCreate(new Date());
                        file.setGmtUpdate(new Date());
                        file.setDeleted(0);
                        fileMapper.insert(file);
                    });
        return Result.ok("保存成功");
    }

    @Override
    public Result getProjectProgressForm(Integer id) {
        ProjectProgressFileListsRequest result = new ProjectProgressFileListsRequest();
    public Result getProjectProgressForm(Long id) {
        ProjectProgressFileListsForm result = new ProjectProgressFileListsForm();
        result.setProjectReportId(id);
        result.setCompletedReportFileList(new LambdaQueryChainWrapper<>(fileMapper)
                .eq(File::getBusId, id)