Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-10-11 d3df1630ad3e1c71b61d177ee818d5c5c94e97c0

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java

@@ -15,7 +15,10 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;

/**
@@ -36,9 +39,12 @@
    @Override
    public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
        //PP表未开始的工程号
        // 计算二个月前的时间
        LocalDateTime twoMonthAgo = LocalDateTime.now().minusMonths(2);
        LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
        wrapper.select(OptimizeProject::getProjectNo)
                .eq(OptimizeProject::getState, optimizeRequest.getState());
                .eq(OptimizeProject::getState, optimizeRequest.getState())
                .ge(OptimizeProject::getCreateTime, twoMonthAgo);
        List<OptimizeProject> glass = this.list(wrapper);
        //暂停的工程号
        List<Engineering> engineerings = engineeringService.selectTask();
@@ -59,21 +65,21 @@
    @Override
    public void changeTask(String engineeringId, int state) {
        UpdateWrapper<OptimizeProject> wrapper = new UpdateWrapper<>();
        wrapper.eq("project_no",engineeringId)
                .set("state",state);
        wrapper.eq("project_no", engineeringId)
                .set("state", state);
        boolean updateSuccess = this.update(wrapper);
        log.info("工程表更新状态{}",updateSuccess);
        log.info("工程表更新状态{}", updateSuccess);

    }

    @Override
    public boolean overTask(UpPattenUsage sequence, int state) {
        if(sequence.getState()==100){
            UpdateWrapper<OptimizeProject> wrapper=new  UpdateWrapper<>();
            wrapper.eq("project_no",sequence.getEngineeringId())
                    .set("state",state);
        if (sequence.getState() == 100) {
            UpdateWrapper<OptimizeProject> wrapper = new UpdateWrapper<>();
            wrapper.eq("project_no", sequence.getEngineeringId())
                    .set("state", state);
            boolean updateSuccess = this.update(wrapper);
            log.info("工程完成更新状态{}",updateSuccess);
            log.info("工程完成更新状态{}", updateSuccess);
        }
        return false;
    }
@@ -82,9 +88,36 @@
    public List<OptimizeProject> getDoingTask() {
        QueryWrapper<OptimizeProject> wrapper = new QueryWrapper<>();
        wrapper.select("project_no,project_name")
        .eq("state",200);
                .eq("state", 200);
        return this.list(wrapper);
    }

    @Override
    public List<OptimizeProject> queryEngineer() {
        return this.baseMapper.queryEngineer();
    }

    @Override
    public List<OptimizeProject> engineerScheduling(OptimizeProject optimizeProject) {
        return this.baseMapper.engineerScheduling(optimizeProject);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public List<OptimizeProject> updateEngineerScheduling(Integer type , List<OptimizeProject> projectList) {
        // 1. 删除对应类型的数据
        baseMapper.deleteByType(type);

        // 2. 设置值
        projectList.forEach(project -> {
            project.setType(type);
            project.setState(100);
            project.setId(null); // 清除ID
        });

        // 3. 批量插入新数据
        baseMapper.batchInsert(projectList);

        return projectList;
    }
}