From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
index d09f0a9..964898a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -1,11 +1,22 @@
package com.mes.pp.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.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.List;
/**
* <p>
@@ -17,6 +28,63 @@
*/
@Service
@DS("pp")
-public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
+@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.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 glass;
+ }
+
+
+ @Override
+ public void changeTask(String engineeringId, int state) {
+ UpdateWrapper<OptimizeProject> wrapper = new UpdateWrapper<>();
+ wrapper.eq("project_no",engineeringId)
+ .set("state",state);
+ boolean updateSuccess = this.update(wrapper);
+ 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);
+ boolean updateSuccess = this.update(wrapper);
+ log.info("宸ョ▼瀹屾垚鏇存柊鐘舵�亄}",updateSuccess);
+ }
+ return false;
+ }
+
+ @Override
+ public List<OptimizeProject> getDoingTask() {
+ QueryWrapper<OptimizeProject> wrapper = new QueryWrapper<>();
+ wrapper.select("project_no,project_name")
+ .eq("state",200);
+ return this.list(wrapper);
+ }
+
}
--
Gitblit v1.8.0