From 23e187554324e1bdff896d7d18634711a7372755 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 12 十二月 2024 17:56:58 +0800 Subject: [PATCH] 项目库上传后端逻辑 --- business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java | 77 ++++++++++++++++++++++++++++---------- 1 files changed, 57 insertions(+), 20 deletions(-) diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java index ae2e7e6..a8f7e24 100644 --- a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.ycl.common.base.Result; import com.ycl.common.enums.business.FileTypeEnum; +import com.ycl.common.utils.SecurityUtils; import com.ycl.domain.entity.File; import com.ycl.domain.entity.ProjectPlanExamineRecord; import com.ycl.domain.entity.ProjectPlanInfo; @@ -58,17 +59,25 @@ @Transactional(rollbackFor = Exception.class) @Override public Result add(ProgressReportResponseVO form) { - ProjectPlanProgressReport projectPlanProgressReport = new ProjectPlanProgressReport(); - projectPlanProgressReport.setProjectPlanInfoId(form.getId().longValue()); - projectPlanProgressReport.setStartTime(form.getActualStartTime()); - projectPlanProgressReport.setEndTime(form.getActualEndTime()); - projectPlanProgressReport.setProgressStatus(form.getProgressStatus()); - projectPlanProgressReport.setActualInvest(form.getActualInvest()); - if (form.getProgressReportId() == null) { - baseMapper.insertOne(projectPlanProgressReport); - }else { - projectPlanProgressReport.setId(form.getProgressReportId()); -// baseMapper.updateOne(projectPlanProgressReport); + + // 鍒ゆ柇涓婃姤鐘舵�� + if (form.getProgressStatusInt() == 0) { // 鏈紑濮� 涓婃姤杩涘害 + ProjectPlanProgressReport projectPlanProgressReport = new ProjectPlanProgressReport(); + projectPlanProgressReport.setProjectPlanInfoId(form.getId().longValue()); + projectPlanProgressReport.setStartTime(form.getActualStartTime()); + projectPlanProgressReport.setEndTime(form.getActualEndTime()); + projectPlanProgressReport.setProgressStatus(form.getProgressStatusStr()); + projectPlanProgressReport.setActualInvest(form.getActualInvest()); + // 鏂板杩涘害涓婃姤鍐呭 + baseMapper.insert(projectPlanProgressReport); + }else if (form.getProgressStatusInt() == 2) { // 宸查┏鍥� 閲嶆柊涓婃姤 + ProjectPlanProgressReport projectPlanProgressReport = baseMapper.selectById(form.getProgressReportId()); + projectPlanProgressReport.setProjectPlanInfoId(form.getId().longValue()); + projectPlanProgressReport.setStartTime(form.getActualStartTime()); + projectPlanProgressReport.setEndTime(form.getActualEndTime()); + projectPlanProgressReport.setProgressStatus(form.getProgressStatusStr()); + projectPlanProgressReport.setActualInvest(form.getActualInvest()); + // 鏇存柊杩涘害涓婃姤鍐呭 baseMapper.updateById(projectPlanProgressReport); } @@ -90,15 +99,7 @@ fileMapper.insert(file); }); } - - // 鏇存柊涓婄骇鎵瑰 - new LambdaUpdateChainWrapper<>(projectPlanExamineRecordMapper) - .eq(ProjectPlanExamineRecord::getId, form.getExamineRecordId()) - .set(ProjectPlanExamineRecord::getDepartmentApprovalReply, form.getDepartmentApprovalReply()) - .set(ProjectPlanExamineRecord::getManageApprovalReply, form.getManageApprovalReply()) - .update(); - - // 鏇存柊涓婃姤鐘舵�� + // 鏇存柊璁″垝椤圭殑杩涘害鐘舵�佷负鏈鏍� new LambdaUpdateChainWrapper<>(projectPlanInfoMapper) .eq(ProjectPlanInfo::getId, form.getId()) .set(ProjectPlanInfo::getProgressStatus, 1) @@ -182,4 +183,40 @@ .collect(Collectors.toList()); return Result.ok().data(vos); } + + @Override + public Result examine(ProgressReportResponseVO form) { + // 鑾峰緱瀹℃壒璁板綍鍓湰 + ProjectPlanExamineRecord record = projectPlanExamineRecordMapper.selectById(form.getExamineRecordId()); + + // 鏂板涓�鏉″鎵硅褰� + ProjectPlanExamineRecord newRecord = new ProjectPlanExamineRecord();; + newRecord.setProjectPlanRecordId(record.getProjectPlanRecordId()); + newRecord.setProjectPlanInfoId(record.getProjectPlanInfoId()); + newRecord.setDepartmentUserId(SecurityUtils.getUserId()); + newRecord.setDepartmentExamine(form.getDepartmentExamine()); + newRecord.setDepartmentApproval(form.getDepartmentApproval()); + newRecord.setManagerUserId(SecurityUtils.getUserId()); + newRecord.setManageExamine(form.getManageExamine()); + newRecord.setManageApproval(form.getManageApproval()); + newRecord.setEventType(2); + newRecord.setDeleted(0); + projectPlanExamineRecordMapper.insert(newRecord); + + // 鍒ゆ柇瀹℃壒缁撴灉 + if (form.getDepartmentExamine() == 0 && form.getManageExamine() == 0) { // 瀹℃壒閫氳繃 + // 璁″垝椤硅繘搴︾姸鎬佹洿鏂颁负宸插畬鎴� + new LambdaUpdateChainWrapper<>(projectPlanInfoMapper) + .eq(ProjectPlanInfo::getId, form.getId()) + .set(ProjectPlanInfo::getProgressStatus, 3) + .update(); + }else { // 瀹℃壒涓嶉�氳繃 + // 璁″垝椤硅繘搴︾姸鎬佹洿鏂颁负宸查┏鍥� + new LambdaUpdateChainWrapper<>(projectPlanInfoMapper) + .eq(ProjectPlanInfo::getId, form.getId()) + .set(ProjectPlanInfo::getProgressStatus, 2) + .update(); + } + return Result.ok("瀹℃壒鎴愬姛"); + } } -- Gitblit v1.8.0