Merge remote-tracking branch 'origin/master'

fuliqi

2024-11-26 a272c80f565aa5ace23820558fdb7cde636d15f0

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

@@ -1,9 +1,17 @@
package com.ycl.service.impl;

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.ycl.common.base.Result;
import com.ycl.common.utils.DateUtils;
import com.ycl.domain.entity.Plan;
import com.ycl.domain.entity.ProjectPlanRecord;
import com.ycl.domain.vo.ProjectPlanRecordAddRequest;
import com.ycl.domain.vo.ProjectPlanRecordResponseVO;
import com.ycl.domain.vo.ProjetPlanRecordItem;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.PlanMapper;
import com.ycl.mapper.ProjectPlanRecordMapper;
import com.ycl.service.ProjectPlanRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +23,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;

import java.time.LocalDate;
import java.util.List;
import java.util.stream.Collectors;

@@ -28,17 +37,81 @@
@RequiredArgsConstructor
public class ProjectPlanRecordServiceImpl extends ServiceImpl<ProjectPlanRecordMapper, ProjectPlanRecord> implements ProjectPlanRecordService {

    private static final Integer MONTH_FLAG = 0;
    private static final Integer SEASON_FLAG = 1;
    private static final Integer YEAR_FLAG = 2;

    private final ProjectPlanRecordMapper projectPlanRecordMapper;
    private final PlanMapper planMapper;

    /**
     * 添加
     * @param form
     * @param request
     * @return
     */
    @Override
    public Result add(ProjectPlanRecordForm form) {
        ProjectPlanRecord entity = ProjectPlanRecordForm.getEntityByForm(form, null);
        baseMapper.insert(entity);
    public Result add(ProjectPlanRecordAddRequest request) {
        ProjectPlanRecord item = new ProjectPlanRecord();
        // 查询项目计划id
        item.setPlanId(new LambdaQueryChainWrapper<>(planMapper).eq(Plan::getProjectInfoId, request.getProjectInfoId()).one().getId().longValue());
        // 判断标志位是否为0，如果为0，则为月度计划，1为季度计划，2为年度计划
        if (request.getPlanTimeFlag() == MONTH_FLAG) {
            // 判断id是否为0
            if (request.getId() == 0) {
                // 新增月度计划
                item.setProjectInfoId(request.getProjectInfoId());
                item.setPlanTime(LocalDate.now().getMonthValue());
                item.setPlanTimeFlag(MONTH_FLAG);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
            } else {
                // 新增月度计划
                item = baseMapper.selectById(request.getId());
                item.setId(null);
                Integer planTime = item.getPlanTime();
                item.setPlanTime(planTime == 12 ? 1 : planTime + 1);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
                item.setActualInvest(null);
            }
        } else if (request.getPlanTimeFlag() == SEASON_FLAG) {
            // 判断id是否为0
            if (request.getId() == 0) {
                // 新增季度计划
                item.setProjectInfoId(request.getProjectInfoId());
                item.setPlanTime(1);
                item.setPlanTimeFlag(SEASON_FLAG);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
            } else {
                // 新增季度计划
                item = baseMapper.selectById(request.getId());
                item.setId(null);
                item.setPlanTime(item.getPlanTime() + 1);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
                item.setActualInvest(null);
            }
        }else {
            // 判断id是否为0
            if (request.getId() == 0) {
                // 新增年度计划
                item.setProjectInfoId(request.getProjectInfoId());
                item.setPlanTime(LocalDate.now().getYear());
                item.setPlanTimeFlag(YEAR_FLAG);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
            } else {
                // 新增年计划
                item = baseMapper.selectById(request.getId());
                item.setId(null);
                item.setPlanTime(item.getPlanTime() + 1);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
                item.setActualInvest(null);
            }
        }
        baseMapper.insertItem(item);
        return Result.ok("添加成功");
    }

@@ -99,8 +172,13 @@
     */
    @Override
    public Result detail(Integer id) {
        ProjectPlanRecordVO vo = baseMapper.getById(id);
        Assert.notNull(vo, "记录不存在");
        ProjectPlanRecordResponseVO vo = new ProjectPlanRecordResponseVO();
        // 获取月度计划
        vo.setMonthRecords(baseMapper.selectPlanList(id, MONTH_FLAG));
        // 获取季度计划
        vo.setSeasonRecords(baseMapper.selectPlanList(id, SEASON_FLAG));
        // 获取年度计划
        vo.setYearRecords(baseMapper.selectPlanList(id, YEAR_FLAG));
        return Result.ok().data(vo);
    }