From 4d3286b758594acab704d92159b4e4df3deaf7bb Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 17 一月 2025 11:32:14 +0800
Subject: [PATCH] 增加暂停的工程号到选择工程的数据列里，更变engineering表的实现层到公共里
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java | 1 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java | 0
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 4 +++-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 29 +++++++++++++++++++++--------
4 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
similarity index 100%
rename from hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
similarity index 98%
rename from hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
index 5e13d71..32b1480 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -26,6 +26,7 @@
*/
@Service
@Slf4j
+
public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engineering> implements EngineeringService {
@Autowired
@@ -118,10 +119,11 @@
}
@Override
+ @DS("hangzhoumes")
public List<Engineering> selectTask() {
//鏌ヨ鍙紑濮嬩换鍔＄殑宸ョ▼
QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
- wrapper.eq("state", 0);
+// wrapper.eq("state", 0);
return engineeringMapper.selectList(wrapper);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
index 0e5e8cf..1a5f29e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
@@ -36,6 +36,7 @@
public Result<List<OptimizeProject>> listByState(@RequestBody OptimizeRequest optimizeRequest) {
log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
List<OptimizeProject> glass = optimizeProjectService.listByState(optimizeRequest);
+
log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅:{}", glass);
return Result.build(200, "", glass);
}
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 b886aa9..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
@@ -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;
}
--
Gitblit v1.8.0