From 15e0cd26d651510fde1aea51cd536b7ea2f377e2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 二月 2025 11:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java
index 059f563..f563322 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java
@@ -3,24 +3,25 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
import com.ycl.common.utils.DateUtils;
import com.ycl.domain.entity.Plan;
+import com.ycl.domain.entity.ProjectPlanInfo;
import com.ycl.domain.entity.ProjectPlanRecord;
-import com.ycl.domain.vo.ProjectPlanRecordAddRequest;
+import com.ycl.domain.form.ProjectPlanRecordAddRequestForm;
+import com.ycl.domain.form.ProjectPlanRecordForm;
+import com.ycl.domain.query.ProjectPlanRecordQuery;
import com.ycl.domain.vo.ProjectPlanRecordResponseVO;
-import com.ycl.domain.vo.ProjetPlanRecordItem;
+import com.ycl.domain.vo.ProjectPlanRecordVO;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.PlanMapper;
+import com.ycl.mapper.ProjectPlanInfoMapper;
import com.ycl.mapper.ProjectPlanRecordMapper;
import com.ycl.service.ProjectPlanRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.domain.form.ProjectPlanRecordForm;
-import com.ycl.domain.vo.ProjectPlanRecordVO;
-import com.ycl.domain.query.ProjectPlanRecordQuery;
-import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import java.time.LocalDate;
@@ -43,30 +44,31 @@
private final ProjectPlanRecordMapper projectPlanRecordMapper;
private final PlanMapper planMapper;
+ private final ProjectPlanInfoMapper projectPlanInfoMapper;
/**
* 娣诲姞
- * @param request
+ * @param form
* @return
*/
@Override
- public Result add(ProjectPlanRecordAddRequest request) {
+ public Result add(ProjectPlanRecordAddRequestForm form) {
ProjectPlanRecord item = new ProjectPlanRecord();
// 鏌ヨ椤圭洰璁″垝id
- item.setPlanId(new LambdaQueryChainWrapper<>(planMapper).eq(Plan::getProjectInfoId, request.getProjectInfoId()).one().getId().longValue());
+ item.setPlanId(new LambdaQueryChainWrapper<>(planMapper).eq(Plan::getProjectInfoId, form.getProjectInfoId()).one().getId());
// 鍒ゆ柇鏍囧織浣嶆槸鍚︿负0锛屽鏋滀负0锛屽垯涓烘湀搴﹁鍒掞紝1涓哄搴﹁鍒掞紝2涓哄勾搴﹁鍒�
- if (request.getPlanTimeFlag() == MONTH_FLAG) {
+ if (form.getPlanTimeFlag() == MONTH_FLAG) {
// 鍒ゆ柇id鏄惁涓�0
- if (request.getId() == 0) {
+ if (form.getId() == 0) {
// 鏂板鏈堝害璁″垝
- item.setProjectInfoId(request.getProjectInfoId());
+ item.setProjectInfoId(form.getProjectInfoId());
item.setPlanTime(LocalDate.now().getMonthValue());
item.setPlanTimeFlag(MONTH_FLAG);
item.setCreateTime(DateUtils.getNowDate());
item.setReportStatus(1);
} else {
// 鏂板鏈堝害璁″垝
- item = baseMapper.selectById(request.getId());
+ item = baseMapper.selectById(form.getId());
item.setId(null);
Integer planTime = item.getPlanTime();
item.setPlanTime(planTime == 12 ? 1 : planTime + 1);
@@ -74,18 +76,18 @@
item.setReportStatus(1);
item.setActualInvest(null);
}
- } else if (request.getPlanTimeFlag() == SEASON_FLAG) {
+ } else if (form.getPlanTimeFlag() == SEASON_FLAG) {
// 鍒ゆ柇id鏄惁涓�0
- if (request.getId() == 0) {
+ if (form.getId() == 0) {
// 鏂板瀛ｅ害璁″垝
- item.setProjectInfoId(request.getProjectInfoId());
+ item.setProjectInfoId(form.getProjectInfoId());
item.setPlanTime(1);
item.setPlanTimeFlag(SEASON_FLAG);
item.setCreateTime(DateUtils.getNowDate());
item.setReportStatus(1);
} else {
// 鏂板瀛ｅ害璁″垝
- item = baseMapper.selectById(request.getId());
+ item = baseMapper.selectById(form.getId());
item.setId(null);
item.setPlanTime(item.getPlanTime() + 1);
item.setCreateTime(DateUtils.getNowDate());
@@ -94,16 +96,16 @@
}
}else {
// 鍒ゆ柇id鏄惁涓�0
- if (request.getId() == 0) {
+ if (form.getId() == 0) {
// 鏂板骞村害璁″垝
- item.setProjectInfoId(request.getProjectInfoId());
+ item.setProjectInfoId(form.getProjectInfoId());
item.setPlanTime(LocalDate.now().getYear());
item.setPlanTimeFlag(YEAR_FLAG);
item.setCreateTime(DateUtils.getNowDate());
item.setReportStatus(1);
} else {
// 鏂板骞磋鍒�
- item = baseMapper.selectById(request.getId());
+ item = baseMapper.selectById(form.getId());
item.setId(null);
item.setPlanTime(item.getPlanTime() + 1);
item.setCreateTime(DateUtils.getNowDate());
@@ -148,8 +150,13 @@
* @return
*/
@Override
- public Result removeById(String id) {
+ public Result removeById(Long id) {
+ // 鍒犻櫎璁″垝璁板綍
baseMapper.deleteById(id);
+ // 鍒犻櫎璁″垝椤�
+ new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
+ .eq(ProjectPlanInfo::getProjectPlanRecordId, id)
+ .remove();
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -171,7 +178,7 @@
* @return
*/
@Override
- public Result detail(Integer id) {
+ public Result detail(Long id) {
ProjectPlanRecordResponseVO vo = new ProjectPlanRecordResponseVO();
// 鑾峰彇鏈堝害璁″垝
vo.setMonthRecords(baseMapper.selectPlanList(id, MONTH_FLAG));
--
Gitblit v1.8.0