1、报工查询界面改为分页 2、查询工程添加工程名称

ZengTao

2025-10-23 57fca4f8e41c2504246459656cb3791621a039f0

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

@@ -1,5 +1,6 @@
package com.mes.pp.service.impl;

import cn.smallbun.screw.core.util.CollectionUtils;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,7 +19,6 @@
import org.springframework.transaction.annotation.Transactional;

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

/**
@@ -42,7 +42,7 @@
        // 计算二个月前的时间
        LocalDateTime twoMonthAgo = LocalDateTime.now().minusMonths(2);
        LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
        wrapper.select(OptimizeProject::getProjectNo)
        wrapper.select(OptimizeProject::getProjectNo, OptimizeProject::getProjectName)
                .eq(OptimizeProject::getState, optimizeRequest.getState())
                .ge(OptimizeProject::getCreateTime, twoMonthAgo);
        List<OptimizeProject> glass = this.list(wrapper);
@@ -54,6 +54,7 @@
            Engineering engineering = engineerings.get(i);
            OptimizeProject newProject = new OptimizeProject();
            newProject.setProjectNo(engineering.getEngineerId());
            newProject.setProjectName(engineering.getEngineerName());
            // 将新创建的 OptimizeProject 对象添加到 glass 列表中
            glass.add(newProject);
        }
@@ -104,7 +105,7 @@

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

@@ -114,10 +115,16 @@
            project.setState(100);
            project.setId(null); // 清除ID
        });

        // 3. 批量插入新数据
        baseMapper.batchInsert(projectList);
        if (CollectionUtils.isNotEmpty(projectList)) {
            // 3. 批量插入新数据
            baseMapper.batchInsert(projectList);
        }

        return projectList;
    }

    @Override
    public void deleteengineerSchedulingByid(String engineerId, List<Integer> types) {
        baseMapper.deleteByScheduling(engineerId, types);
    }
}