YiWuProject.git

			@@ -4,17 +4,19 @@
			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.time.LocalDateTime;
			import java.util.List;

			/**
			@@ -29,39 +31,53 @@
			@DS("pp")
			@Slf4j
			public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
			@Autowired
			private EngineeringService engineeringService;

			@Override
			public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
			//将参数传入到查询类里,工程号做非空判断模糊查询
			//PP表未开始的工程号
			// 计算二个月前的时间
			LocalDateTime twoMonthAgo = LocalDateTime.now().minusMonths(2);
			LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())
			.or(qw -> qw.eq(OptimizeProject::getState, 200))
			.like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())
			//.groupBy(OptimizeProject::getProjectNo)
			;
			wrapper.select(OptimizeProject::getProjectNo)
			.eq(OptimizeProject::getState, optimizeRequest.getState())
			.ge(OptimizeProject::getCreateTime, twoMonthAgo);
			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;
			}


			@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;
			}
			@@ -70,7 +86,7 @@
			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);
			}