Merge branch 'dev'

zxl

2025-03-14 23b688e436a89845e92d861adb5875e625e90d9f

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

@@ -3,26 +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;
@@ -49,28 +48,27 @@

    /**
     * 添加
     * @param request
     * @param form
     * @return
     */
    @Override
    public Result add(ProjectPlanRecordAddRequest request) {
    public Result add(ProjectPlanRecordAddRequestForm form) {
        ProjectPlanRecord item = new ProjectPlanRecord();
        Plan one = new LambdaQueryChainWrapper<>(planMapper).eq(Plan::getProjectInfoId, request.getProjectInfoId()).one();
        // 查询项目计划id
        item.setPlanId(new LambdaQueryChainWrapper<>(planMapper).eq(Plan::getProjectInfoId, request.getProjectInfoId()).one().getId());
        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);
@@ -78,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());
@@ -98,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());
@@ -152,7 +150,7 @@
     * @return
     */
    @Override
    public Result removeById(String id) {
    public Result removeById(Long id) {
        // 删除计划记录
        baseMapper.deleteById(id);
        // 删除计划项
@@ -180,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));