sfd
2025-05-15 a8a2ea850139b9cccb756989fc70201f6a2a0550
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanManagementServiceImpl.java
@@ -1,14 +1,18 @@
package com.aps.core.service.impl;
import java.util.List;
import java.util.Objects;
import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.ApsPlanCycle;
import com.aps.core.domain.ApsPlanManagement;
import com.aps.core.mapper.ApsPlanCycleMapper;
import com.aps.core.mapper.ApsPlanManagementMapper;
import com.aps.core.service.IApsPlanManagementService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.simpleframework.xml.core.Resolve;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -47,7 +51,17 @@
     */
    @Override
    public List<ApsPlanManagement> selectApsPlanManagementList(ApsPlanManagement apsPlanManagement) {
        return apsPlanManagementMapper.selectApsPlanManagementList(apsPlanManagement);
        List<ApsPlanManagement> items = apsPlanManagementMapper.selectApsPlanManagementList(apsPlanManagement);
        List<ApsPlanCycle> cycles = apsPlanCycleMapper.selectByPlanIds(items.stream().map(ApsPlanManagement::getId).toList());
        cycles.forEach(cycle -> {
            for (ApsPlanManagement item : items) {
                if (Objects.equals(item.getId(), cycle.getPlanId())) {
                    item.setCycle(cycle);
                    break;
                }
            }
        });
        return items;
    }
    /**
@@ -59,6 +73,8 @@
    @Override
    public int insertApsPlanManagement(ApsPlanManagement apsPlanManagement) {
        apsPlanManagement.setCreateTime(DateUtils.getNowDate());
        apsPlanManagement.setCreateBy(SecurityUtils.getUsername());
        apsPlanManagement.setId(IdUtil.getSnowflakeNextId());
        return apsPlanManagementMapper.insertApsPlanManagement(apsPlanManagement);
    }
@@ -71,6 +87,7 @@
    @Override
    public int updateApsPlanManagement(ApsPlanManagement apsPlanManagement) {
        apsPlanManagement.setUpdateTime(DateUtils.getNowDate());
        apsPlanManagement.setUpdateBy(SecurityUtils.getUsername());
        return apsPlanManagementMapper.updateApsPlanManagement(apsPlanManagement);
    }
@@ -101,9 +118,14 @@
    public void updateApsPlanCycle(ApsPlanCycle apsPlanCycle) {
        ApsPlanCycle planCycle = apsPlanCycleMapper.selectByPlanId(apsPlanCycle.getPlanId());
        if (planCycle == null) {
            apsPlanCycle.setCreateBy(SecurityUtils.getUsername());
            apsPlanCycle.setCreateTime(DateUtils.getNowDate());
            apsPlanCycle.setId(IdUtil.getSnowflakeNextId());
            apsPlanCycleMapper.insert(apsPlanCycle);
        } else {
            BeanUtils.copyProperties(apsPlanCycle, planCycle, "id", "planId");
            planCycle.setUpdateBy(SecurityUtils.getUsername());
            planCycle.setUpdateTime(DateUtils.getNowDate());
            apsPlanCycleMapper.updateById(planCycle);
        }
    }