义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
wu
2025-01-17 4d3286b758594acab704d92159b4e4df3deaf7bb 
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java


@@ -4,17 +4,18 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;


import com.baomidou.mybatisplus.core.toolkit.StringUtils;


import com.github.yulichang.base.MPJBaseServiceImpl;


import com.mes.engineering.entity.Engineering;


import com.mes.engineering.service.EngineeringService;


import com.mes.pp.entity.OptimizeProject;


import com.mes.pp.entity.request.OptimizeRequest;


import com.mes.pp.mapper.OptimizeProjectMapper;


import com.mes.pp.service.OptimizeProjectService;


import com.mes.uppattenusage.entity.UpPattenUsage;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;




import java.util.Collections;


import java.util.List;




/**


@@ -29,17 +30,29 @@


@DS("pp")


@Slf4j


public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {


    @Autowired


    private EngineeringService engineeringService;




    @Override


    public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {


        //将参数传入到查询类里,工程号做非空判断模糊查询


        //PP表未开始的工程号


        LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();


        wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())


                .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())


                //.groupBy(OptimizeProject::getProjectNo)


        ;


        wrapper.select(OptimizeProject::getProjectNo)


                .eq(OptimizeProject::getState, optimizeRequest.getState());


        List<OptimizeProject> glass = this.list(wrapper);


        //暂停的工程号


        List<Engineering> engineerings = engineeringService.selectTask();






        for (int i = 0; i < engineerings.size(); i++) {


            Engineering engineering = engineerings.get(i);


            OptimizeProject newProject = new OptimizeProject();


            newProject.setProjectNo(engineering.getEngineerId());


            // 将新创建的 OptimizeProject 对象添加到 glass 列表中


            glass.add(newProject);


        }


        //返回工程信息


        return this.list(wrapper);


        return glass;


    }