Merge remote-tracking branch 'origin/master'

luohairen

2024-12-10 b24e024f386e7f25a071b58e9267a2c19f20ba1e

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

@@ -129,6 +129,8 @@
                    progressPlanInfoFlag.setPlanInfoList(
                            new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
                                    .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
                                    .eq(ProjectPlanInfo::getDeleted, 0) // 未删除
                                    .eq(ProjectPlanInfo::getPlanStatus, 2) // 计划项审批通过
                                    .list()
                    );
                    monthProgress.add(progressPlanInfoFlag);
@@ -146,6 +148,8 @@
                    progressPlanInfoFlag.setPlanInfoList(
                            new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
                                    .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
                                    .eq(ProjectPlanInfo::getDeleted, 0) // 未删除
                                    .eq(ProjectPlanInfo::getPlanStatus, 2) // 计划项审批通过
                                    .list()
                    );
                    seasonProgress.add(progressPlanInfoFlag);
@@ -163,6 +167,8 @@
                    progressPlanInfoFlag.setPlanInfoList(
                            new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
                                    .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
                                    .eq(ProjectPlanInfo::getDeleted, 0) // 未删除
                                    .eq(ProjectPlanInfo::getPlanStatus, 2) // 计划项审批通过
                                    .list()
                    );
                    yearProgress.add(progressPlanInfoFlag);
@@ -194,41 +200,56 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result saveProjectProgressFileLists(ProjectProgressFileListsRequest request) {
        // 判断是否存在附件
        if(request.getSituationDescriptionFileList() != null && !request.getSituationDescriptionFileList().isEmpty()){
            new LambdaUpdateChainWrapper<>(fileMapper)
                    .eq(File::getBusId, request.getProjectInfoId())
                    .eq(File::getBusId, request.getProjectReportId())
                    .eq(File::getType, FileTypeEnum.PROJECT_SITUATION_DESCRIPTION.getType())
                    .set(File::getDeleted,1)
                    .update();

            request.getSituationDescriptionFileList().stream()
                    .forEach(file -> {
                        file.setBusId(request.getProjectInfoId().longValue());
                        file.setId(null);
                        file.setBusId(request.getProjectReportId().longValue());
                        file.setType(FileTypeEnum.PROJECT_SITUATION_DESCRIPTION);
                        file.setGmtCreate(new Date());
                        file.setGmtUpdate(new Date());
                        file.setDeleted(0);
                        fileMapper.insert(file);
                    });
        }
        if(request.getCompletedReportFileList() != null && !request.getCompletedReportFileList().isEmpty()){

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

            request.getCompletedReportFileList().stream()
                    .forEach(file -> {
                        file.setBusId(request.getProjectInfoId().longValue());
                        file.setId(null);
                        file.setBusId(request.getProjectReportId().longValue());
                        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();
        result.setProjectReportId(id);
        result.setCompletedReportFileList(new LambdaQueryChainWrapper<>(fileMapper)
                .eq(File::getBusId, id)
                .eq(File::getType, FileTypeEnum.PROJECT_COMPLETE_REPORT)
                .eq(File::getDeleted, 0)
                .list());
        result.setSituationDescriptionFileList(new LambdaQueryChainWrapper<>(fileMapper)
                .eq(File::getBusId, id)
                .eq(File::getType, FileTypeEnum.PROJECT_SITUATION_DESCRIPTION)
                .eq(File::getDeleted, 0)
                .list());
        return Result.ok().data(result);
    }
}